Signed-off-by: Nicolas George <geo...@nsup.org> --- libavfilter/avfilter.c | 24 +++++++++++++++--------- libavfilter/filters.h | 6 ++++++ 2 files changed, 21 insertions(+), 9 deletions(-)
Changes in this commit: rename ff_link -> ff_inlink and move to filters.h. diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 2c41ea8c22..2fe8b980e0 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -1099,7 +1099,6 @@ static int ff_filter_frame_framed(AVFilterLink *link, AVFrame *frame) AVFilterContext *dstctx = link->dst; AVFilterPad *dst = link->dstpad; int ret; - AVFilterCommand *cmd= link->dst->command_queue; int64_t pts; if (!(filter_frame = dst->filter_frame)) @@ -1111,14 +1110,7 @@ static int ff_filter_frame_framed(AVFilterLink *link, AVFrame *frame) goto fail; } - while(cmd && cmd->time <= frame->pts * av_q2d(link->time_base)){ - av_log(link->dst, AV_LOG_DEBUG, - "Processing command time:%f command:%s arg:%s\n", - cmd->time, cmd->command, cmd->arg); - avfilter_process_command(link->dst, cmd->command, cmd->arg, 0, 0, cmd->flags); - ff_command_queue_pop(link->dst); - cmd= link->dst->command_queue; - } + ff_inlink_process_commands(link, frame); pts = frame->pts; if (dstctx->enable_str) { @@ -1565,6 +1557,20 @@ int ff_inlink_make_frame_writable(AVFilterLink *link, AVFrame **rframe) return 0; } +void ff_inlink_process_commands(AVFilterLink *link, const AVFrame *frame) +{ + AVFilterCommand *cmd = link->dst->command_queue; + + while(cmd && cmd->time <= frame->pts * av_q2d(link->time_base)){ + av_log(link->dst, AV_LOG_DEBUG, + "Processing command time:%f command:%s arg:%s\n", + cmd->time, cmd->command, cmd->arg); + avfilter_process_command(link->dst, cmd->command, cmd->arg, 0, 0, cmd->flags); + ff_command_queue_pop(link->dst); + cmd= link->dst->command_queue; + } +} + const AVClass *avfilter_get_class(void) { return &avfilter_class; diff --git a/libavfilter/filters.h b/libavfilter/filters.h index 543f4df680..efbef2918d 100644 --- a/libavfilter/filters.h +++ b/libavfilter/filters.h @@ -33,6 +33,12 @@ void ff_filter_set_ready(AVFilterContext *filter, unsigned priority); /** + * Process the commands queued in the link up to the time of the frame. + * Commands will trigger the process_command() callback. + */ +void ff_inlink_process_commands(AVFilterLink *link, const AVFrame *frame); + +/** * Make sure a frame is writable. * This is similar to av_frame_make_writable() except it uses the link's * buffer allocation callback, and therefore allows direct rendering. -- 2.11.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel