yadif: support more than yuv420p.

[ffmpeg] / libavcodec / mpegaudiodec_float.c

diff --git a/libavcodec/mpegaudiodec_float.c b/libavcodec/mpegaudiodec_float.c
index 578270be1e1868cdea59d314b5919b9e2aa118f2..e9041fcb63233f45e0b60e8171c2a199ae3e8e2e 100644 (file)
--- a/libavcodec/mpegaudiodec_float.c
+++ b/libavcodec/mpegaudiodec_float.c
@@ -2,20 +2,20 @@
  * Float MPEG Audio decoder
  * Copyright (c) 2010 Michael Niedermayer
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -34,15 +34,61 @@ void ff_mpa_synth_filter_float(MPADecodeContext *s, float *synth_buf_ptr,
     offset = *synth_buf_offset;
     synth_buf = synth_buf_ptr + offset;
 
-    dct32(synth_buf, sb_samples);
+    s->dct.dct32(synth_buf, sb_samples);
     s->apply_window_mp3(synth_buf, window, dither_state, samples, incr);
 
     offset = (offset - 32) & 511;
     *synth_buf_offset = offset;
 }
 
+static void compute_antialias_float(MPADecodeContext *s,
+                              GranuleDef *g)
+{
+    float *ptr;
+    int n, i;
+
+    /* we antialias only "long" bands */
+    if (g->block_type == 2) {
+        if (!g->switch_point)
+            return;
+        /* XXX: check this for 8000Hz case */
+        n = 1;
+    } else {
+        n = SBLIMIT - 1;
+    }
+
+    ptr = g->sb_hybrid + 18;
+    for(i = n;i > 0;i--) {
+        float tmp0, tmp1;
+        float *csa = &csa_table_float[0][0];
+#define FLOAT_AA(j)\
+        tmp0= ptr[-1-j];\
+        tmp1= ptr[   j];\
+        ptr[-1-j] = tmp0 * csa[0+4*j] - tmp1 * csa[1+4*j];\
+        ptr[   j] = tmp0 * csa[1+4*j] + tmp1 * csa[0+4*j];
+
+        FLOAT_AA(0)
+        FLOAT_AA(1)
+        FLOAT_AA(2)
+        FLOAT_AA(3)
+        FLOAT_AA(4)
+        FLOAT_AA(5)
+        FLOAT_AA(6)
+        FLOAT_AA(7)
+
+        ptr += 18;
+    }
+}
+
+static av_cold int decode_end(AVCodecContext * avctx)
+{
+    MPADecodeContext *s = avctx->priv_data;
+    ff_dct_end(&s->dct);
+    return 0;
+}
+
 #if CONFIG_MP1FLOAT_DECODER
-AVCodec mp1float_decoder =
+AVCodec ff_mp1float_decoder =
 {
     "mp1float",
     AVMEDIA_TYPE_AUDIO,
@@ -50,7 +96,7 @@ AVCodec mp1float_decoder =
     sizeof(MPADecodeContext),
     decode_init,
     NULL,
-    NULL,
+    decode_end,
     decode_frame,
     CODEC_CAP_PARSE_ONLY,
     .flush= flush,
@@ -58,7 +104,7 @@ AVCodec mp1float_decoder =
 };
 #endif
 #if CONFIG_MP2FLOAT_DECODER
-AVCodec mp2float_decoder =
+AVCodec ff_mp2float_decoder =
 {
     "mp2float",
     AVMEDIA_TYPE_AUDIO,
@@ -66,7 +112,7 @@ AVCodec mp2float_decoder =
     sizeof(MPADecodeContext),
     decode_init,
     NULL,
-    NULL,
+    decode_end,
     decode_frame,
     CODEC_CAP_PARSE_ONLY,
     .flush= flush,
@@ -74,7 +120,7 @@ AVCodec mp2float_decoder =
 };
 #endif
 #if CONFIG_MP3FLOAT_DECODER
-AVCodec mp3float_decoder =
+AVCodec ff_mp3float_decoder =
 {
     "mp3float",
     AVMEDIA_TYPE_AUDIO,
@@ -82,7 +128,7 @@ AVCodec mp3float_decoder =
     sizeof(MPADecodeContext),
     decode_init,
     NULL,
-    NULL,
+    decode_end,
     decode_frame,
     CODEC_CAP_PARSE_ONLY,
     .flush= flush,
@@ -90,7 +136,7 @@ AVCodec mp3float_decoder =
 };
 #endif
 #if CONFIG_MP3ADUFLOAT_DECODER
-AVCodec mp3adufloat_decoder =
+AVCodec ff_mp3adufloat_decoder =
 {
     "mp3adufloat",
     AVMEDIA_TYPE_AUDIO,
@@ -98,7 +144,7 @@ AVCodec mp3adufloat_decoder =
     sizeof(MPADecodeContext),
     decode_init,
     NULL,
-    NULL,
+    decode_end,
     decode_frame_adu,
     CODEC_CAP_PARSE_ONLY,
     .flush= flush,
@@ -106,7 +152,7 @@ AVCodec mp3adufloat_decoder =
 };
 #endif
 #if CONFIG_MP3ON4FLOAT_DECODER
-AVCodec mp3on4float_decoder =
+AVCodec ff_mp3on4float_decoder =
 {
     "mp3on4float",
     AVMEDIA_TYPE_AUDIO,