videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-08-12 04:15:06 +02:00
Code Releases Activity

lavfi: add ff_inlink_evaluate_timeline_at_frame().

Browse Source
This commit is contained in:
Nicolas George 2016-12-20 17:13:04 +01:00
parent 0e3d2496e2
commit e7e4c8dfbe
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libavfilter/avfilter.c
View File

@ -1100,7 +1100,6 @@ static int ff_filter_frame_framed(AVFilterLink *link, AVFrame *frame)
AVFilterContext *dstctx = link->dst;
AVFilterPad *dst = link->dstpad;
int ret;
int64_t pts;
if (!(filter_frame = dst->filter_frame))
filter_frame = default_filter_frame;
@ -1112,24 +1111,15 @@ static int ff_filter_frame_framed(AVFilterLink *link, AVFrame *frame)
}
ff_inlink_process_commands(link, frame);
dstctx->is_disabled = !ff_inlink_evaluate_timeline_at_frame(link, frame);
pts = frame->pts;
if (dstctx->enable_str) {
int64_t pos = av_frame_get_pkt_pos(frame);
dstctx->var_values[VAR_N] = link->frame_count_out;
dstctx->var_values[VAR_T] = pts == AV_NOPTS_VALUE ? NAN : pts * av_q2d(link->time_base);
dstctx->var_values[VAR_W] = link->w;
dstctx->var_values[VAR_H] = link->h;
dstctx->var_values[VAR_POS] = pos == -1 ? NAN : pos;
dstctx->is_disabled = fabs(av_expr_eval(dstctx->enable, dstctx->var_values, NULL)) < 0.5;
/* TODO reindent */
if (dstctx->is_disabled &&
(dstctx->filter->flags & AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC))
filter_frame = default_filter_frame;
}
ret = filter_frame(link, frame);
link->frame_count_out++;
ff_update_link_current_pts(link, pts);
ff_update_link_current_pts(link, frame->pts);
return ret;
fail:
@ -1575,6 +1565,24 @@ int ff_inlink_process_commands(AVFilterLink *link, const AVFrame *frame)
return 0;
}
int ff_inlink_evaluate_timeline_at_frame(AVFilterLink *link, const AVFrame *frame)
{
AVFilterContext *dstctx = link->dst;
int64_t pts = frame->pts;
int64_t pos = av_frame_get_pkt_pos(frame);
if (!dstctx->enable_str)
return 1;
dstctx->var_values[VAR_N] = link->frame_count_out;
dstctx->var_values[VAR_T] = pts == AV_NOPTS_VALUE ? NAN : pts * av_q2d(link->time_base);
dstctx->var_values[VAR_W] = link->w;
dstctx->var_values[VAR_H] = link->h;
dstctx->var_values[VAR_POS] = pos == -1 ? NAN : pos;
return fabs(av_expr_eval(dstctx->enable, dstctx->var_values, NULL)) >= 0.5;
}
const AVClass *avfilter_get_class(void)
{
return &avfilter_class;

8
libavfilter/filters.h
View File

@ -46,6 +46,14 @@ void ff_filter_set_ready(AVFilterContext *filter, unsigned priority);
*/
int ff_inlink_process_commands(AVFilterLink *link, const AVFrame *frame);
/**
* Evaluate the timeline expression of the link for the time and properties
* of the frame.
* @return >0 if enabled, 0 if disabled
* @note It does not update link->dst->is_disabled.
*/
int ff_inlink_evaluate_timeline_at_frame(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