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

avfilter/vf_framerate: switch to activate 

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2018-08-27 00:51:52 +02:00
parent 43d3b61abe
commit 37caec3dc4
1 changed files with 63 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
libavfilter/vf_framerate.c
View File

@ -38,6 +38,7 @@
#include "avfilter.h"
#include "internal.h"
#include "video.h"
#include "filters.h"
#include "framerate.h"
#define OFFSET(x) offsetof(FrameRateContext, x)
@ -360,27 +361,48 @@ static int config_input(AVFilterLink *inlink)
return 0;
}
static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref)
static int activate(AVFilterContext *ctx)
{
int ret;
AVFilterContext *ctx = inlink->dst;
int ret, status;
AVFilterLink *inlink = ctx->inputs[0];
AVFilterLink *outlink = ctx->outputs[0];
FrameRateContext *s = ctx->priv;
AVFrame *inpicref;
int64_t pts;
FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink);
retry:
ret = process_work_frame(ctx);
if (ret < 0)
return ret;
else if (ret == 1)
return ff_filter_frame(outlink, s->work);
ret = ff_inlink_consume_frame(inlink, &inpicref);
if (ret < 0)
return ret;
if (inpicref) {
if (inpicref->interlaced_frame)
av_log(ctx, AV_LOG_WARNING, "Interlaced frame found - the output will not be correct.\n");
if (inpicref->pts == AV_NOPTS_VALUE) {
av_log(ctx, AV_LOG_WARNING, "Ignoring frame without PTS.\n");
return 0;
av_frame_free(&inpicref);
}
}
if (inpicref) {
pts = av_rescale_q(inpicref->pts, s->srce_time_base, s->dest_time_base);
if (s->f1 && pts == s->pts1) {
av_log(ctx, AV_LOG_WARNING, "Ignoring frame with same PTS.\n");
return 0;
av_frame_free(&inpicref);
}
}
if (inpicref) {
av_frame_free(&s->f0);
s->f0 = s->f1;
s->pts0 = s->pts1;
@ -399,14 +421,21 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref)
if (s->start_pts == AV_NOPTS_VALUE)
s->start_pts = s->pts1;
do {
ret = process_work_frame(ctx);
if (ret <= 0)
return ret;
ret = ff_filter_frame(ctx->outputs[0], s->work);
} while (ret >= 0);
goto retry;
}
return ret;
if (ff_inlink_acknowledge_status(inlink, &status, &pts)) {
if (!s->flush) {
s->flush = 1;
goto retry;
}
ff_outlink_set_status(outlink, status, pts);
return 0;
}
FF_FILTER_FORWARD_WANTED(outlink, inlink);
return FFERROR_NOT_READY;
}
static int config_output(AVFilterLink *outlink)
@ -454,33 +483,11 @@ static int config_output(AVFilterLink *outlink)
return 0;
}
static int request_frame(AVFilterLink *outlink)
{
AVFilterContext *ctx = outlink->src;
FrameRateContext *s = ctx->priv;
int ret;
ff_dlog(ctx, "request_frame()\n");
ret = ff_request_frame(ctx->inputs[0]);
if (ret == AVERROR_EOF && s->f1 && !s->flush) {
s->flush = 1;
ret = process_work_frame(ctx);
if (ret < 0)
return ret;
ret = ret ? ff_filter_frame(ctx->outputs[0], s->work) : AVERROR_EOF;
}
ff_dlog(ctx, "request_frame() source's request_frame() returned:%d\n", ret);
return ret;
}
static const AVFilterPad framerate_inputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
.config_props = config_input,
.filter_frame = filter_frame,
},
{ NULL }
};
@ -489,7 +496,6 @@ static const AVFilterPad framerate_outputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
.request_frame = request_frame,
.config_props = config_output,
},
{ NULL }
@ -506,4 +512,5 @@ AVFilter ff_vf_framerate = {
.inputs = framerate_inputs,
.outputs = framerate_outputs,
.flags = AVFILTER_FLAG_SLICE_THREADS,
.activate = activate,
};