Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fix hardcoded tables compililation caused by missing math constants
  lavf: Make codec_tag arrays constant
  twinvq: give massive struct a name.
  lavf, lavu: version bumps and APIchanges for av_gettime() move
  lavfi/audio: don't set cur_buf in ff_filter_samples().
  lavfi/fifo: add audio version of the fifo filter.
  fifo: fix parenthesis placement.
  lavfi: rename vf_fifo.c -> fifo.c
  lavc: remove stats_in from AVCodecContext options table.

Conflicts:
	doc/APIchanges
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/audio.c
	libavfilter/fifo.c
	libavformat/version.h
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

4 files changed, 65 insertions, 30 deletions

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 6de6ef4baf..088ab8f6a4 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -47,6 +47,7 @@ OBJS-$(CONFIG_AVFORMAT)                      += lavfutils.o
 OBJS-$(CONFIG_SWSCALE)                       += lswsutils.o
 
 OBJS-$(CONFIG_ACONVERT_FILTER)               += af_aconvert.o
+OBJS-$(CONFIG_AFIFO_FILTER)                  += fifo.o
 OBJS-$(CONFIG_AFORMAT_FILTER)                += af_aformat.o
 OBJS-$(CONFIG_AMERGE_FILTER)                 += af_amerge.o
 OBJS-$(CONFIG_AMIX_FILTER)                   += af_amix.o
@@ -87,7 +88,7 @@ OBJS-$(CONFIG_DRAWBOX_FILTER)                += vf_drawbox.o
 OBJS-$(CONFIG_DRAWTEXT_FILTER)               += vf_drawtext.o
 OBJS-$(CONFIG_FADE_FILTER)                   += vf_fade.o
 OBJS-$(CONFIG_FIELDORDER_FILTER)             += vf_fieldorder.o
-OBJS-$(CONFIG_FIFO_FILTER)                   += vf_fifo.o
+OBJS-$(CONFIG_FIFO_FILTER)                   += fifo.o
 OBJS-$(CONFIG_FORMAT_FILTER)                 += vf_format.o
 OBJS-$(CONFIG_FPS_FILTER)                    += vf_fps.o
 OBJS-$(CONFIG_FREI0R_FILTER)                 += vf_frei0r.o
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index 6d2d6cf2e9..3590b815a6 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -35,6 +35,7 @@ void avfilter_register_all(void)
     initialized = 1;
 
     REGISTER_FILTER (ACONVERT,    aconvert,    af);
+    REGISTER_FILTER (AFIFO,       afifo,       af);
     REGISTER_FILTER (AFORMAT,     aformat,     af);
     REGISTER_FILTER (AMERGE,      amerge,      af);
     REGISTER_FILTER (AMIX,        amix,        af);
diff --git a/libavfilter/audio.c b/libavfilter/audio.c
index 0a5248936a..d052ad9cf3 100644
--- a/libavfilter/audio.c
+++ b/libavfilter/audio.c
@@ -181,6 +181,7 @@ void ff_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref)
     void (*filter_samples)(AVFilterLink *, AVFilterBufferRef *);
     AVFilterPad *dst = link->dstpad;
     int64_t pts;
+    AVFilterBufferRef *buf_out;
 
     FF_TPRINTF_START(NULL, filter_samples); ff_tlog_link(NULL, link, 1);
 
@@ -194,22 +195,23 @@ void ff_filter_samples(AVFilterLink *link, AVFilterBufferRef *samplesref)
                "Copying audio data in avfilter (have perms %x, need %x, reject %x)\n",
                samplesref->perms, link->dstpad->min_perms, link->dstpad->rej_perms);
 
-        link->cur_buf = ff_default_get_audio_buffer(link, dst->min_perms,
-                                                    samplesref->audio->nb_samples);
-        link->cur_buf->pts                = samplesref->pts;
-        link->cur_buf->audio->sample_rate = samplesref->audio->sample_rate;
+        buf_out = ff_default_get_audio_buffer(link, dst->min_perms,
+                                              samplesref->audio->nb_samples);
+        buf_out->pts                = samplesref->pts;
+        buf_out->audio->sample_rate = samplesref->audio->sample_rate;
 
         /* Copy actual data into new samples buffer */
-        av_samples_copy(link->cur_buf->extended_data, samplesref->extended_data,
+        av_samples_copy(buf_out->extended_data, samplesref->extended_data,
                         0, 0, samplesref->audio->nb_samples,
                         av_get_channel_layout_nb_channels(link->channel_layout),
                         link->format);
 
         avfilter_unref_buffer(samplesref);
     } else
-        link->cur_buf = samplesref;
+        buf_out = samplesref;
 
-    pts = link->cur_buf->pts;
-    filter_samples(link, link->cur_buf);
+    link->cur_buf = buf_out;
+    pts = buf_out->pts;
+    filter_samples(link, buf_out);
     ff_update_link_current_pts(link, pts);
 }
diff --git a/libavfilter/vf_fifo.c b/libavfilter/fifo.c
index d9200d770a..da5aa648f6 100644
--- a/libavfilter/vf_fifo.c
+++ b/libavfilter/fifo.c
@@ -20,21 +20,22 @@
 
 /**
  * @file
- * FIFO buffering video filter
+ * FIFO buffering filter
  */
 
+#include "audio.h"
 #include "avfilter.h"
 #include "internal.h"
 #include "video.h"
 
-typedef struct BufPic {
-    AVFilterBufferRef *picref;
-    struct BufPic     *next;
-} BufPic;
+typedef struct Buf {
+    AVFilterBufferRef *buf;
+    struct Buf        *next;
+} Buf;
 
 typedef struct {
-    BufPic  root;
-    BufPic *last;   ///< last buffered picture
+    Buf  root;
+    Buf *last;   ///< last buffered frame
 } FifoContext;
 
 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)
 {
     FifoContext *fifo = ctx->priv;
-    BufPic *pic, *tmp;
+    Buf *buf, *tmp;
 
-    for (pic = fifo->root.next; pic; pic = tmp) {
-        tmp = pic->next;
-        avfilter_unref_buffer(pic->picref);
-        av_free(pic);
+    for (buf = fifo->root.next; buf; buf = tmp) {
+        tmp = buf->next;
+        avfilter_unref_buffer(buf->buf);
+        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) { }
@@ -74,19 +75,28 @@ static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) { }
 static int request_frame(AVFilterLink *outlink)
 {
     FifoContext *fifo = outlink->src->priv;
-    BufPic *tmp;
+    Buf *tmp;
     int ret;
 
     if (!fifo->root.next) {
-        if ((ret = avfilter_request_frame(outlink->src->inputs[0])) < 0)
+        if ((ret = ff_request_frame(outlink->src->inputs[0])) < 0)
             return ret;
     }
 
     /* 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);
-    ff_draw_slice (outlink, 0, outlink->h, 1);
-    ff_end_frame  (outlink);
+    switch (outlink->type) {
+    case AVMEDIA_TYPE_VIDEO:
+        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;
@@ -109,7 +119,7 @@ AVFilter avfilter_vf_fifo = {
     .inputs    = (const 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, },
@@ -119,3 +129,24 @@ AVFilter avfilter_vf_fifo = {
                                     .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}},
+};