Signed-off-by: Nicolas George <geo...@nsup.org>
---
libavfilter/avfilter.c | 6 +++++-
libavfilter/avfilter.h | 14 ++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
Change: more documentation.
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 2b2df67ae1..f3a78d4f14 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -1479,8 +1479,12 @@ int ff_filter_activate(AVFilterContext *filter)
{
int ret;
+ /* Generic timeline support is not yet implemented but should be easy */
+ av_assert1(!(filter->filter->flags &
AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC &&
+ filter->filter->activate));
filter->ready = 0;
- ret = ff_filter_activate_default(filter);
+ ret = filter->filter->activate ? filter->filter->activate(filter) :
+ ff_filter_activate_default(filter);
if (ret == FFERROR_NOT_READY)
ret = 0;
return ret;
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index a3472547ea..8874b5efaa 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -294,6 +294,20 @@ typedef struct AVFilter {
* used for providing binary data.
*/
int (*init_opaque)(AVFilterContext *ctx, void *opaque);
+
+ /**
+ * Filter activation function.
+ *
+ * Called when any processing is needed from the filter, instead of any
+ * filter_frame and request_frame on pads.
+ *
+ * The function must examine inlinks and outlinks and perform a single
+ * step of processing. If there is nothing to do, the function must do
+ * nothing and not return an error. If more steps are or may be
+ * possible, it must use ff_filter_set_ready() to schedule another
+ * activation.
+ */
+ int (*activate)(AVFilterContext *ctx);
} AVFilter;
/**
--
2.11.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
