RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-05 12:07:49 +00:00
Code Issues Projects Releases Wiki Activity

lavfi: use the consume helpers in ff_filter_frame_to_filter().

Browse Source
This commit is contained in:
Nicolas George 2016-12-20 23:23:29 +01:00
parent d360ddf03b
commit db4a71c0ff
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavfilter/avfilter.c
View File

@ -1253,24 +1253,25 @@ static int take_samples(AVFilterLink *link, unsigned min, unsigned max,
int ff_filter_frame_to_filter(AVFilterLink *link) int ff_filter_frame_to_filter(AVFilterLink *link)
{ {
AVFrame *frame; AVFrame *frame = NULL;
AVFilterContext *dst = link->dst; AVFilterContext *dst = link->dst;
int ret; int ret;
av_assert1(ff_framequeue_queued_frames(&link->fifo)); av_assert1(ff_framequeue_queued_frames(&link->fifo));
if (link->min_samples) { ret = link->min_samples ?
int min = link->min_samples; ff_inlink_consume_samples(link, link->min_samples, link->max_samples, &frame) :
if (link->status_in) ff_inlink_consume_frame(link, &frame);
min = FFMIN(min, ff_framequeue_queued_samples(&link->fifo)); av_assert1(ret);
ret = take_samples(link, min, link->max_samples, &frame); if (ret < 0) {
if (ret < 0) av_assert1(!frame);
return ret; return ret;
} else {
frame = ff_framequeue_take(&link->fifo);
} }
/* The filter will soon have received a new frame, that may allow it to /* The filter will soon have received a new frame, that may allow it to
produce one or more: unblock its outputs. */ produce one or more: unblock its outputs. */
filter_unblock(dst); filter_unblock(dst);
/* AVFilterPad.filter_frame() expect frame_count_out to have the value
before the frame; ff_filter_frame_framed() will re-increment it. */
link->frame_count_out--;
ret = ff_filter_frame_framed(link, frame); ret = ff_filter_frame_framed(link, frame);
if (ret < 0 && ret != link->status_out) { if (ret < 0 && ret != link->status_out) {
ff_avfilter_link_set_out_status(link, ret, AV_NOPTS_VALUE); ff_avfilter_link_set_out_status(link, ret, AV_NOPTS_VALUE);