[FFmpeg-cvslog] f_settb: switch to filter_frame
Anton Khirnov
git at videolan.org
Wed Nov 28 22:44:16 CET 2012
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Nov 28 22:10:29 2012 +0100| [bb56436cfda8ebdac5fcef9194fea64fd7b86b6a] | committer: Michael Niedermayer
f_settb: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb56436cfda8ebdac5fcef9194fea64fd7b86b6a
---
libavfilter/f_settb.c | 30 ++++++------------------------
1 file changed, 6 insertions(+), 24 deletions(-)
diff --git a/libavfilter/f_settb.c b/libavfilter/f_settb.c
index 01bc1aa..5b9434e 100644
--- a/libavfilter/f_settb.c
+++ b/libavfilter/f_settb.c
@@ -103,37 +103,20 @@ static int config_output_props(AVFilterLink *outlink)
return 0;
}
-static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref)
+static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame)
{
AVFilterContext *ctx = inlink->dst;
AVFilterLink *outlink = ctx->outputs[0];
if (av_cmp_q(inlink->time_base, outlink->time_base)) {
- int64_t orig_pts = picref->pts;
- picref->pts = av_rescale_q(picref->pts, inlink->time_base, outlink->time_base);
+ int64_t orig_pts = frame->pts;
+ frame->pts = av_rescale_q(frame->pts, inlink->time_base, outlink->time_base);
av_log(ctx, AV_LOG_DEBUG, "tb:%d/%d pts:%"PRId64" -> tb:%d/%d pts:%"PRId64"\n",
inlink ->time_base.num, inlink ->time_base.den, orig_pts,
- outlink->time_base.num, outlink->time_base.den, picref->pts);
+ outlink->time_base.num, outlink->time_base.den, frame->pts);
}
- inlink->cur_buf = NULL;
- return ff_start_frame(outlink, picref);
-}
-
-static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *samplesref)
-{
- AVFilterContext *ctx = inlink->dst;
- AVFilterLink *outlink = ctx->outputs[0];
-
- if (av_cmp_q(inlink->time_base, outlink->time_base)) {
- int64_t orig_pts = samplesref->pts;
- samplesref->pts = av_rescale_q(samplesref->pts, inlink->time_base, outlink->time_base);
- av_log(ctx, AV_LOG_DEBUG, "tb:%d/%d pts:%"PRId64" -> tb:%d/%d pts:%"PRId64"\n",
- inlink ->time_base.num, inlink ->time_base.den, orig_pts,
- outlink->time_base.num, outlink->time_base.den, samplesref->pts);
- }
-
- return ff_filter_frame(outlink, samplesref);
+ return ff_filter_frame(outlink, frame);
}
#if CONFIG_SETTB_FILTER
@@ -142,8 +125,7 @@ static const AVFilterPad avfilter_vf_settb_inputs[] = {
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer = ff_null_get_video_buffer,
- .start_frame = start_frame,
- .end_frame = ff_null_end_frame
+ .filter_frame = filter_frame,
},
{ NULL }
};
More information about the ffmpeg-cvslog
mailing list