diff options
| -rw-r--r-- | doc/filters.texi | 9 | ||||
| -rw-r--r-- | libavfilter/framesync2.c | 6 | ||||
| -rw-r--r-- | libavfilter/framesync2.h | 6 | ||||
| -rw-r--r-- | libavfilter/vf_overlay.c | 8 |
4 files changed, 23 insertions, 6 deletions
diff --git a/doc/filters.texi b/doc/filters.texi index 9ca24b3c8e..7790367593 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -10956,6 +10956,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. @@ -10971,6 +10974,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. @@ -10996,6 +11002,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 } }; |