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

Anton Khirnov committed 14 years ago

Commit 4a97ff21 parent 27570e23 files · +53 −20Browse files

Unified · Split

3 files

libavfilter/Makefile +1 −0
libavfilter/allfilters.c +1 −0
libavfilter/fifo.c +51 −20

@@ -25,6 +25,7 @@ OBJS = allfilters.o \ · 24 unmodified lines
25	vf_scale.o \	25	vf_scale.o \
26	video.o \	26	video.o \
27		27
		28	OBJS-$(CONFIG_AFIFO_FILTER) += fifo.o
28	OBJS-$(CONFIG_AFORMAT_FILTER) += af_aformat.o	29	OBJS-$(CONFIG_AFORMAT_FILTER) += af_aformat.o
29	OBJS-$(CONFIG_AMIX_FILTER) += af_amix.o	30	OBJS-$(CONFIG_AMIX_FILTER) += af_amix.o
30	OBJS-$(CONFIG_ANULL_FILTER) += af_anull.o	31	OBJS-$(CONFIG_ANULL_FILTER) += af_anull.o

libavfilter/allfilters.c+1−0

@@ -34,6 +34,7 @@ void avfilter_register_all(void) · 33 unmodified lines
34	return;	34	return;
35	initialized = 1;	35	initialized = 1;
36		36
		37	REGISTER_FILTER (AFIFO, afifo, af);
37	REGISTER_FILTER (AFORMAT, aformat, af);	38	REGISTER_FILTER (AFORMAT, aformat, af);
38	REGISTER_FILTER (AMIX, amix, af);	39	REGISTER_FILTER (AMIX, amix, af);
39	REGISTER_FILTER (ANULL, anull, af);	40	REGISTER_FILTER (ANULL, anull, af);

libavfilter/fifo.c+51−20

 /**
  * @file
- * FIFO buffering video filter
+ * FIFO buffering filter
  */
+#include "audio.h"
 #include "avfilter.h"
 #include "internal.h"
 #include "video.h"
-typedef struct BufPic {
+typedef struct Buf {
-    AVFilterBufferRef *picref;
+    AVFilterBufferRef *buf;
-    struct BufPic     *next;
+    struct Buf        *next;
-} BufPic;
+} Buf;
 typedef struct {
-    BufPic  root;
+    Buf  root;
-    BufPic *last;   ///< last buffered picture
+    Buf *last;   ///< last buffered frame
 } FifoContext;
 static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
 static av_cold void uninit(AVFilterContext *ctx)
 {
     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;
-    fifo->last->next = av_mallocz(sizeof(BufPic));
+    fifo->last->next = av_mallocz(sizeof(Buf));
     fifo->last = fifo->last->next;
-    fifo->last->picref = picref;
+    fifo->last->buf = buf;
 }
 static void end_frame(AVFilterLink *inlink) { }
 static int request_frame(AVFilterLink *outlink)
 {
     FifoContext *fifo = outlink->src->priv;
-    BufPic *tmp;
+    Buf *tmp;
     int ret;
     if (!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. */
-    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)
         fifo->last = &fifo->root;
     .inputs    = (AVFilterPad[]) {{ .name            = "default",
                                     .type            = AVMEDIA_TYPE_VIDEO,
                                     .get_video_buffer= ff_null_get_video_buffer,
-                                    .start_frame     = start_frame,
+                                    .start_frame     = add_to_queue,
                                     .draw_slice      = draw_slice,
                                     .end_frame       = end_frame,
                                     .rej_perms       = AV_PERM_REUSE2, },
                                     .request_frame   = request_frame, },
                                   { .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}},
+};

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

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code