diff mbox

[FFmpeg-devel] avfilter/vf_overlay: Restore shorthand option order

Message ID 20170905132652.6315-1-michael@niedermayer.cc
State Accepted
Commit d8bc198d0979aa417469ddaac8c80146b1df9e4e
Headers show

Commit Message

Michael Niedermayer Sept. 5, 2017, 1:26 p.m. UTC 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 doc/filters.texi         | 9 +++++++++
 libavfilter/framesync2.c | 6 ------
 libavfilter/framesync2.h | 6 ++++++
 libavfilter/vf_overlay.c | 8 ++++++++
 4 files changed, 23 insertions(+), 6 deletions(-)

Comments

Marton Balint Sept. 5, 2017, 9:11 p.m. UTC | #1 
On Tue, 5 Sep 2017, Michael Niedermayer wrote:

> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
> doc/filters.texi         | 9 +++++++++
> libavfilter/framesync2.c | 6 ------
> libavfilter/framesync2.h | 6 ++++++
> libavfilter/vf_overlay.c | 8 ++++++++
> 4 files changed, 23 insertions(+), 6 deletions(-)

No more comments from me, thanks. Do you plan to do a similar fix for 
blend/tblend as well?

Thanks,
Marton
Paul B Mahol Sept. 5, 2017, 9:20 p.m. UTC | #2 
On 9/5/17, Marton Balint <cus@passwd.hu> wrote:
>
> On Tue, 5 Sep 2017, Michael Niedermayer wrote:
>
>> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
>> ---
>> doc/filters.texi         | 9 +++++++++
>> libavfilter/framesync2.c | 6 ------
>> libavfilter/framesync2.h | 6 ++++++
>> libavfilter/vf_overlay.c | 8 ++++++++
>> 4 files changed, 23 insertions(+), 6 deletions(-)
>
> No more comments from me, thanks. Do you plan to do a similar fix for
> blend/tblend as well?

Please NO leave blend from this mess. tblend does not use framesync.
Michael Niedermayer Sept. 5, 2017, 9:54 p.m. UTC | #3 
On Tue, Sep 05, 2017 at 11:11:00PM +0200, Marton Balint wrote:
> 
> On Tue, 5 Sep 2017, Michael Niedermayer wrote:
> 
> >Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> >---
> >doc/filters.texi         | 9 +++++++++
> >libavfilter/framesync2.c | 6 ------
> >libavfilter/framesync2.h | 6 ++++++
> >libavfilter/vf_overlay.c | 8 ++++++++
> >4 files changed, 23 insertions(+), 6 deletions(-)
> 
> No more comments from me, thanks.

will apply


> Do you plan to do a similar fix
> for blend/tblend as well?

I did run into the issue in overlay so thats the one i wanted
to fix primarely.
I can change the others too but only if the people maintaining them
want this. 

Thanks

[...]
diff mbox

Patch

diff --git a/doc/filters.texi b/doc/filters.texi
index afcb99d876..3641fe18de 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -10895,6 +10895,9 @@  on the main video. Default value is "0" for both expressions. In case
 the expression is invalid, it is set to a huge value (meaning that the
 overlay will not be displayed within the output visible area).
 
+@item eof_action
+See @ref{framesync}.
+
 @item eval
 Set when the expressions for @option{x}, and @option{y} are evaluated.
 
@@ -10910,6 +10913,9 @@  evaluate expressions for each incoming frame
 
 Default value is @samp{frame}.
 
+@item shortest
+See @ref{framesync}.
+
 @item format
 Set the format for the output video.
 
@@ -10935,6 +10941,9 @@  automatically pick format
 @end table
 
 Default value is @samp{yuv420}.
+
+@item repeatlast
+See @ref{framesync}.
 @end table
 
 The @option{x}, and @option{y} expressions can contain the following
diff --git a/libavfilter/framesync2.c b/libavfilter/framesync2.c
index fae06aa1f5..aea9937ce9 100644
--- a/libavfilter/framesync2.c
+++ b/libavfilter/framesync2.c
@@ -28,12 +28,6 @@ 
 #define OFFSET(member) offsetof(FFFrameSync, member)
 #define FLAGS AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM
 
-enum EOFAction {
-    EOF_ACTION_REPEAT,
-    EOF_ACTION_ENDALL,
-    EOF_ACTION_PASS
-};
-
 static const char *framesync_name(void *ptr)
 {
     return "framesync";
diff --git a/libavfilter/framesync2.h b/libavfilter/framesync2.h
index 745e896bc8..63a0eabbeb 100644
--- a/libavfilter/framesync2.h
+++ b/libavfilter/framesync2.h
@@ -23,6 +23,12 @@ 
 
 #include "bufferqueue.h"
 
+enum EOFAction {
+    EOF_ACTION_REPEAT,
+    EOF_ACTION_ENDALL,
+    EOF_ACTION_PASS
+};
+
 /*
  * TODO
  * Export convenient options.
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index 4166e7c095..619a5a6354 100644
--- a/libavfilter/vf_overlay.c
+++ b/libavfilter/vf_overlay.c
@@ -817,9 +817,16 @@  static int activate(AVFilterContext *ctx)
 static const AVOption overlay_options[] = {
     { "x", "set the x expression", OFFSET(x_expr), AV_OPT_TYPE_STRING, {.str = "0"}, CHAR_MIN, CHAR_MAX, FLAGS },
     { "y", "set the y expression", OFFSET(y_expr), AV_OPT_TYPE_STRING, {.str = "0"}, CHAR_MIN, CHAR_MAX, FLAGS },
+    { "eof_action", "Action to take when encountering EOF from secondary input ",
+        OFFSET(fs.opt_eof_action), AV_OPT_TYPE_INT, { .i64 = EOF_ACTION_REPEAT },
+        EOF_ACTION_REPEAT, EOF_ACTION_PASS, .flags = FLAGS, "eof_action" },
+        { "repeat", "Repeat the previous frame.",   0, AV_OPT_TYPE_CONST, { .i64 = EOF_ACTION_REPEAT }, .flags = FLAGS, "eof_action" },
+        { "endall", "End both streams.",            0, AV_OPT_TYPE_CONST, { .i64 = EOF_ACTION_ENDALL }, .flags = FLAGS, "eof_action" },
+        { "pass",   "Pass through the main input.", 0, AV_OPT_TYPE_CONST, { .i64 = EOF_ACTION_PASS },   .flags = FLAGS, "eof_action" },
     { "eval", "specify when to evaluate expressions", OFFSET(eval_mode), AV_OPT_TYPE_INT, {.i64 = EVAL_MODE_FRAME}, 0, EVAL_MODE_NB-1, FLAGS, "eval" },
          { "init",  "eval expressions once during initialization", 0, AV_OPT_TYPE_CONST, {.i64=EVAL_MODE_INIT},  .flags = FLAGS, .unit = "eval" },
          { "frame", "eval expressions per-frame",                  0, AV_OPT_TYPE_CONST, {.i64=EVAL_MODE_FRAME}, .flags = FLAGS, .unit = "eval" },
+    { "shortest", "force termination when the shortest input terminates", OFFSET(fs.opt_shortest), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS },
     { "format", "set output format", OFFSET(format), AV_OPT_TYPE_INT, {.i64=OVERLAY_FORMAT_YUV420}, 0, OVERLAY_FORMAT_NB-1, FLAGS, "format" },
         { "yuv420", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_YUV420}, .flags = FLAGS, .unit = "format" },
         { "yuv422", "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_YUV422}, .flags = FLAGS, .unit = "format" },
@@ -827,6 +834,7 @@  static const AVOption overlay_options[] = {
         { "rgb",    "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_RGB},    .flags = FLAGS, .unit = "format" },
         { "gbrp",   "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_GBRP},   .flags = FLAGS, .unit = "format" },
         { "auto",   "", 0, AV_OPT_TYPE_CONST, {.i64=OVERLAY_FORMAT_AUTO},   .flags = FLAGS, .unit = "format" },
+    { "repeatlast", "repeat overlay of the last overlay frame", OFFSET(fs.opt_repeatlast), AV_OPT_TYPE_BOOL, {.i64=1}, 0, 1, FLAGS },
     { NULL }
 };