virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avfilter/settb: switch to activate

Browse Source 
Now correctly updates EOF timestamp.
This commit is contained in:
Paul B Mahol 2019-10-19 17:01:38 +02:00
parent 8732eb124e
commit 7df808ea84
1 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
libavfilter/settb.c
View File

@ -34,6 +34,7 @@
#include "libavutil/rational.h" #include "libavutil/rational.h"
#include "audio.h" #include "audio.h"
#include "avfilter.h" #include "avfilter.h"
#include "filters.h"
#include "internal.h" #include "internal.h"
#include "video.h" #include "video.h"
@ -104,22 +105,58 @@ static int config_output_props(AVFilterLink *outlink)
return 0; return 0;
} }
static int64_t rescale_pts(AVFilterLink *inlink, AVFilterLink *outlink, int64_t orig_pts)
{
AVFilterContext *ctx = inlink->dst;
int64_t new_pts = orig_pts;
if (av_cmp_q(inlink->time_base, outlink->time_base)) {
new_pts = av_rescale_q(orig_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, new_pts);
}
return new_pts;
}
static int filter_frame(AVFilterLink *inlink, AVFrame *frame) static int filter_frame(AVFilterLink *inlink, AVFrame *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)) { frame->pts = rescale_pts(inlink, outlink, frame->pts);
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, frame->pts);
}
return ff_filter_frame(outlink, frame); return ff_filter_frame(outlink, frame);
} }
static int activate(AVFilterContext *ctx)
{
AVFilterLink *inlink = ctx->inputs[0];
AVFilterLink *outlink = ctx->outputs[0];
AVFrame *in;
int status;
int64_t pts;
int ret;
FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink);
ret = ff_inlink_consume_frame(inlink, &in);
if (ret < 0)
return ret;
if (ret > 0)
return filter_frame(inlink, in);
if (ff_inlink_acknowledge_status(inlink, &status, &pts)) {
ff_outlink_set_status(outlink, status, rescale_pts(inlink, outlink, pts));
return 0;
}
FF_FILTER_FORWARD_WANTED(outlink, inlink);
return FFERROR_NOT_READY;
}
#if CONFIG_SETTB_FILTER #if CONFIG_SETTB_FILTER
DEFINE_OPTIONS(settb, VIDEO); DEFINE_OPTIONS(settb, VIDEO);
@ -129,7 +166,6 @@ static const AVFilterPad avfilter_vf_settb_inputs[] = {
{ {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.filter_frame = filter_frame,
}, },
{ NULL } { NULL }
}; };
@ -150,6 +186,7 @@ AVFilter ff_vf_settb = {
.priv_class = &settb_class, .priv_class = &settb_class,
.inputs = avfilter_vf_settb_inputs, .inputs = avfilter_vf_settb_inputs,
.outputs = avfilter_vf_settb_outputs, .outputs = avfilter_vf_settb_outputs,
.activate = activate,
}; };
#endif /* CONFIG_SETTB_FILTER */ #endif /* CONFIG_SETTB_FILTER */
@ -162,7 +199,6 @@ static const AVFilterPad avfilter_af_asettb_inputs[] = {
{ {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.filter_frame = filter_frame,
}, },
{ NULL } { NULL }
}; };
@ -183,5 +219,6 @@ AVFilter ff_af_asettb = {
.inputs = avfilter_af_asettb_inputs, .inputs = avfilter_af_asettb_inputs,
.outputs = avfilter_af_asettb_outputs, .outputs = avfilter_af_asettb_outputs,
.priv_class = &asettb_class, .priv_class = &asettb_class,
.activate = activate,
}; };
#endif /* CONFIG_ASETTB_FILTER */ #endif /* CONFIG_ASETTB_FILTER */