From 05945c7f8827d0309892a6eaf14696b686a0e41d Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 28 Nov 2012 17:19:06 +0100 Subject: [PATCH] libavfilter/fifo: switch to filter_frame, the filter did not support slices. Signed-off-by: Michael Niedermayer --- libavfilter/fifo.c | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/libavfilter/fifo.c b/libavfilter/fifo.c index e995f37a94..ffde246c4b 100644 --- a/libavfilter/fifo.c +++ b/libavfilter/fifo.c @@ -77,7 +77,6 @@ static int add_to_queue(AVFilterLink *inlink, AVFilterBufferRef *buf) { FifoContext *fifo = inlink->dst->priv; - inlink->cur_buf = NULL; fifo->last->next = av_mallocz(sizeof(Buf)); if (!fifo->last->next) { avfilter_unref_buffer(buf); @@ -99,16 +98,6 @@ static void queue_pop(FifoContext *s) s->root.next = tmp; } -static int end_frame(AVFilterLink *inlink) -{ - return 0; -} - -static int draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) -{ - return 0; -} - /** * Move data pointers and pts offset samples forward. */ @@ -242,28 +231,12 @@ static int request_frame(AVFilterLink *outlink) av_assert0(fifo->root.next); } - /* by doing this, we give ownership of the reference to the next filter, - * so we don't have to worry about dereferencing it ourselves. */ - switch (outlink->type) { - case AVMEDIA_TYPE_VIDEO: - if ((ret = ff_start_frame(outlink, fifo->root.next->buf)) < 0 || - (ret = ff_draw_slice(outlink, 0, outlink->h, 1)) < 0 || - (ret = ff_end_frame(outlink)) < 0) - return ret; - - queue_pop(fifo); - break; - case AVMEDIA_TYPE_AUDIO: if (outlink->request_samples) { return return_audio_frame(outlink->src); } else { - ret = ff_filter_frame(outlink, fifo->root.next->buf); + ret = ff_filter_frame(outlink, fifo->root.next->buf); queue_pop(fifo); } - break; - default: - return AVERROR(EINVAL); - } return ret; } @@ -273,9 +246,7 @@ static const AVFilterPad avfilter_vf_fifo_inputs[] = { .name = "default", .type = AVMEDIA_TYPE_VIDEO, .get_video_buffer = ff_null_get_video_buffer, - .start_frame = add_to_queue, - .draw_slice = draw_slice, - .end_frame = end_frame, + .filter_frame = add_to_queue, .min_perms = AV_PERM_PRESERVE, }, { NULL }