openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-23 19:30:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avfilter/vf_framerate: always request input if no output is provided in request_frame

Browse Source 
Fixes ticket #6285.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2017-04-05 01:41:15 +02:00
parent f1d80bc630
commit 51948b9d9e
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libavfilter/vf_framerate.c
View File

@ -440,7 +440,7 @@ copy_done:
s->pending_end_frame = 0; s->pending_end_frame = 0;
s->last_dest_frame_pts = s->work->pts; s->last_dest_frame_pts = s->work->pts;
return ff_filter_frame(ctx->outputs[0], s->work); return 1;
} }
static void set_srce_frame_dest_pts(AVFilterContext *ctx) static void set_srce_frame_dest_pts(AVFilterContext *ctx)
@ -586,6 +586,7 @@ static int config_input(AVFilterLink *inlink)
static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref) static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref)
{ {
int ret;
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
FrameRateContext *s = ctx->priv; FrameRateContext *s = ctx->priv;
@ -606,7 +607,10 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *inpicref)
set_srce_frame_dest_pts(ctx); set_srce_frame_dest_pts(ctx);
} }
return process_work_frame(ctx, 1); ret = process_work_frame(ctx, 1);
if (ret < 0)
return ret;
return ret ? ff_filter_frame(ctx->outputs[0], s->work) : 0;
} }
static int config_output(AVFilterLink *outlink) static int config_output(AVFilterLink *outlink)
@ -658,23 +662,13 @@ static int request_frame(AVFilterLink *outlink)
{ {
AVFilterContext *ctx = outlink->src; AVFilterContext *ctx = outlink->src;
FrameRateContext *s = ctx->priv; FrameRateContext *s = ctx->priv;
int val, i; int ret, i;
ff_dlog(ctx, "request_frame()\n"); ff_dlog(ctx, "request_frame()\n");
// if there is no "next" frame AND we are not in flush then get one from our input filter // if there is no "next" frame AND we are not in flush then get one from our input filter
if (!s->srce[s->frst] && !s->flush) { if (!s->srce[s->frst] && !s->flush)
ff_dlog(ctx, "request_frame() call source's request_frame()\n"); goto request;
val = ff_request_frame(outlink->src->inputs[0]);
if (val < 0 && (val != AVERROR_EOF)) {
ff_dlog(ctx, "request_frame() source's request_frame() returned error:%d\n", val);
return val;
} else if (val == AVERROR_EOF) {
s->flush = 1;
}
ff_dlog(ctx, "request_frame() source's request_frame() returned:%d\n", val);
return 0;
}
ff_dlog(ctx, "request_frame() REPEAT or FLUSH\n"); ff_dlog(ctx, "request_frame() REPEAT or FLUSH\n");
@ -695,7 +689,23 @@ static int request_frame(AVFilterLink *outlink)
} }
set_work_frame_pts(ctx); set_work_frame_pts(ctx);
return process_work_frame(ctx, 0); ret = process_work_frame(ctx, 0);
if (ret < 0)
return ret;
if (ret)
return ff_filter_frame(ctx->outputs[0], s->work);
request:
ff_dlog(ctx, "request_frame() call source's request_frame()\n");
ret = ff_request_frame(ctx->inputs[0]);
if (ret < 0 && (ret != AVERROR_EOF)) {
ff_dlog(ctx, "request_frame() source's request_frame() returned error:%d\n", ret);
return ret;
} else if (ret == AVERROR_EOF) {
s->flush = 1;
}
ff_dlog(ctx, "request_frame() source's request_frame() returned:%d\n", ret);
return 0;
} }
static const AVFilterPad framerate_inputs[] = { static const AVFilterPad framerate_inputs[] = {