generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi/fifo: add audio version of the fifo filter.

Browse Source
This commit is contained in:
Anton Khirnov 2012-05-16 08:21:47 +02:00
parent 27570e211a
commit 4a97ff2fa7
3 changed files with 53 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavfilter/Makefile
View File

@ -25,6 +25,7 @@ OBJS = allfilters.o \
vf_scale.o \ vf_scale.o \
video.o \ video.o \
OBJS-$(CONFIG_AFIFO_FILTER) += fifo.o
OBJS-$(CONFIG_AFORMAT_FILTER) += af_aformat.o OBJS-$(CONFIG_AFORMAT_FILTER) += af_aformat.o
OBJS-$(CONFIG_AMIX_FILTER) += af_amix.o OBJS-$(CONFIG_AMIX_FILTER) += af_amix.o
OBJS-$(CONFIG_ANULL_FILTER) += af_anull.o OBJS-$(CONFIG_ANULL_FILTER) += af_anull.o

1
libavfilter/allfilters.c
View File

@ -34,6 +34,7 @@ void avfilter_register_all(void)
return; return;
initialized = 1; initialized = 1;
REGISTER_FILTER (AFIFO, afifo, af);
REGISTER_FILTER (AFORMAT, aformat, af); REGISTER_FILTER (AFORMAT, aformat, af);
REGISTER_FILTER (AMIX, amix, af); REGISTER_FILTER (AMIX, amix, af);
REGISTER_FILTER (ANULL, anull, af); REGISTER_FILTER (ANULL, anull, af);

71
libavfilter/fifo.c
View File

@ -20,21 +20,22 @@
/** /**
* @file * @file
* FIFO buffering video filter * FIFO buffering filter
*/ */
#include "audio.h"
#include "avfilter.h" #include "avfilter.h"
#include "internal.h" #include "internal.h"
#include "video.h" #include "video.h"
typedef struct BufPic { typedef struct Buf {
AVFilterBufferRef *picref; AVFilterBufferRef *buf;
struct BufPic *next; struct Buf *next;
} BufPic; } Buf;
typedef struct { typedef struct {
BufPic root; Buf root;
BufPic *last; ///< last buffered picture Buf *last; ///< last buffered frame
} FifoContext; } FifoContext;
static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
@ -49,22 +50,22 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
static av_cold void uninit(AVFilterContext *ctx) static av_cold void uninit(AVFilterContext *ctx)
{ {
FifoContext *fifo = ctx->priv; FifoContext *fifo = ctx->priv;
BufPic *pic, *tmp; Buf *buf, *tmp;
for (pic = fifo->root.next; pic; pic = tmp) { for (buf = fifo->root.next; buf; buf = tmp) {
tmp = pic->next; tmp = buf->next;
avfilter_unref_buffer(pic->picref); avfilter_unref_buffer(buf->buf);
av_free(pic); av_free(buf);
} }
} }
static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref) static void add_to_queue(AVFilterLink *inlink, AVFilterBufferRef *buf)
{ {
FifoContext *fifo = inlink->dst->priv; FifoContext *fifo = inlink->dst->priv;
fifo->last->next = av_mallocz(sizeof(BufPic)); fifo->last->next = av_mallocz(sizeof(Buf));
fifo->last = fifo->last->next; fifo->last = fifo->last->next;
fifo->last->picref = picref; fifo->last->buf = buf;
} }
static void end_frame(AVFilterLink *inlink) { } static void end_frame(AVFilterLink *inlink) { }
@ -74,7 +75,7 @@ static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) { }
static int request_frame(AVFilterLink *outlink) static int request_frame(AVFilterLink *outlink)
{ {
FifoContext *fifo = outlink->src->priv; FifoContext *fifo = outlink->src->priv;
BufPic *tmp; Buf *tmp;
int ret; int ret;
if (!fifo->root.next) { if (!fifo->root.next) {
@ -84,9 +85,18 @@ static int request_frame(AVFilterLink *outlink)
/* by doing this, we give ownership of the reference to the next filter, /* by doing this, we give ownership of the reference to the next filter,
* so we don't have to worry about dereferencing it ourselves. */ * so we don't have to worry about dereferencing it ourselves. */
ff_start_frame(outlink, fifo->root.next->picref); switch (outlink->type) {
ff_draw_slice (outlink, 0, outlink->h, 1); case AVMEDIA_TYPE_VIDEO:
ff_end_frame (outlink); ff_start_frame(outlink, fifo->root.next->buf);
ff_draw_slice (outlink, 0, outlink->h, 1);
ff_end_frame (outlink);
break;
case AVMEDIA_TYPE_AUDIO:
ff_filter_samples(outlink, fifo->root.next->buf);
break;
default:
return AVERROR(EINVAL);
}
if (fifo->last == fifo->root.next) if (fifo->last == fifo->root.next)
fifo->last = &fifo->root; fifo->last = &fifo->root;
@ -109,7 +119,7 @@ AVFilter avfilter_vf_fifo = {
.inputs = (AVFilterPad[]) {{ .name = "default", .inputs = (AVFilterPad[]) {{ .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer= ff_null_get_video_buffer, .get_video_buffer= ff_null_get_video_buffer,
.start_frame = start_frame, .start_frame = add_to_queue,
.draw_slice = draw_slice, .draw_slice = draw_slice,
.end_frame = end_frame, .end_frame = end_frame,
.rej_perms = AV_PERM_REUSE2, }, .rej_perms = AV_PERM_REUSE2, },
@ -119,3 +129,24 @@ AVFilter avfilter_vf_fifo = {
.request_frame = request_frame, }, .request_frame = request_frame, },
{ .name = NULL}}, { .name = NULL}},
}; };
AVFilter avfilter_af_afifo = {
.name = "afifo",
.description = NULL_IF_CONFIG_SMALL("Buffer input frames and send them when they are requested."),
.init = init,
.uninit = uninit,
.priv_size = sizeof(FifoContext),
.inputs = (AVFilterPad[]) {{ .name = "default",
.type = AVMEDIA_TYPE_AUDIO,
.get_audio_buffer = ff_null_get_audio_buffer,
.filter_samples = add_to_queue,
.rej_perms = AV_PERM_REUSE2, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
.type = AVMEDIA_TYPE_AUDIO,
.request_frame = request_frame, },
{ .name = NULL}},
};