WMV8 is fully supported now.

[ffmpeg] / libavcodec / ra144.c

diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c
index 4e0b2c7a9a901f92a606965f5c5956a4826235b7..0398b13cedd09f27d8c1c0657a4e45b80d4d2728 100644 (file)
--- a/libavcodec/ra144.c
+++ b/libavcodec/ra144.c
@@ -1,6 +1,9 @@
 /*
  * Real Audio 1.0 (14.4K)
- * Copyright (c) 2003 the ffmpeg project
+ *
+ * Copyright (c) 2008 Vitor Sessak
+ * Copyright (c) 2003 Nick Kurshev
+ *     Based on public domain decoder at http://www.honeypot.net/audio
  *
  * This file is part of FFmpeg.
  *
@@ -22,6 +25,7 @@
 #include "avcodec.h"
 #include "bitstream.h"
 #include "ra144.h"
+#include "acelp_filters.h"
 
 #define NBLOCKS         4       ///< number of subblocks within a block
 #define BLOCKSIZE       40      ///< subblock size in 16-bit words
@@ -140,39 +144,6 @@ static void add_wav(int16_t *dest, int n, int skip_first, int *m,
         dest[i] = (s1[i]*v[0] + s2[i]*v[1] + s3[i]*v[2]) >> 12;
 }
 
-/**
- * LPC Filter. Each output value is predicted from the 10 previous computed
- * ones. It overwrites the input with the output.
- *
- * @param in the input of the filter. It should be an array of size len + 10.
- * The 10 first input values are used to evaluate the first filtered one.
- */
-static void lpc_filter(uint16_t *in, const int16_t *lpc_coefs, int len)
-{
-    int x, i;
-    int16_t *ptr = in;
-
-    for (i=0; i<len; i++) {
-        int sum = 0;
-        int new_val;
-
-        for(x=0; x<10; x++)
-            sum += lpc_coefs[9-x] * ptr[x];
-
-        sum >>= 12;
-
-        new_val = ptr[10] - sum;
-
-        if (new_val < -32768 || new_val > 32767) {
-            memset(in, 0, 50*sizeof(*in));
-            return;
-        }
-
-        ptr[10] = new_val;
-        ptr++;
-    }
-}
-
 static unsigned int rescale_rms(unsigned int rms, unsigned int energy)
 {
     return (rms * energy) >> 10;
@@ -237,7 +208,12 @@ static void do_output_subblock(RA144Context *ractx, const uint16_t  *lpc_coefs,
     memcpy(ractx->curr_sblock + 10, block,
            BLOCKSIZE*sizeof(*ractx->curr_sblock));
 
-    lpc_filter(ractx->curr_sblock, lpc_coefs, BLOCKSIZE);
+    if (ff_acelp_lp_synthesis_filter(
+                                     ractx->curr_sblock + 10, lpc_coefs,
+                                     ractx->curr_sblock + 10, BLOCKSIZE,
+                                     10, 1, 0xfff)
+        )
+        memset(ractx->curr_sblock, 0, 50*sizeof(*ractx->curr_sblock));
 }
 
 static void int_to_int16(int16_t *out, const int *inp)
@@ -323,7 +299,7 @@ static int interp(RA144Context *ractx, int16_t *out, int block_num,
     }
 }
 
-/* Uncompress one block (20 bytes -> 160*2 bytes) */
+/** Uncompress one block (20 bytes -> 160*2 bytes) */
 static int ra144_decode_frame(AVCodecContext * avctx, void *vdata,
                               int *data_size, const uint8_t *buf, int buf_size)
 {