RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

f_settb: switch to filter_frame 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Anton Khirnov 2012-11-28 22:10:29 +01:00 committed by Michael Niedermayer
parent eb1424b4fe
commit bb56436cfd
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavfilter/f_settb.c
View File

@ -103,37 +103,20 @@ static int config_output_props(AVFilterLink *outlink)
return 0; return 0;
} }
static int start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref) static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame)
{ {
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
AVFilterLink *outlink = ctx->outputs[0]; AVFilterLink *outlink = ctx->outputs[0];
if (av_cmp_q(inlink->time_base, outlink->time_base)) { if (av_cmp_q(inlink->time_base, outlink->time_base)) {
int64_t orig_pts = picref->pts; int64_t orig_pts = frame->pts;
picref->pts = av_rescale_q(picref->pts, inlink->time_base, outlink->time_base); 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", 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, 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 #if CONFIG_SETTB_FILTER
@ -142,8 +125,7 @@ static const AVFilterPad avfilter_vf_settb_inputs[] = {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer = ff_null_get_video_buffer, .get_video_buffer = ff_null_get_video_buffer,
.start_frame = start_frame, .filter_frame = filter_frame,
.end_frame = ff_null_end_frame
}, },
{ NULL } { NULL }
}; };