avcodec/wmalosslessdec: fix type for coeffs and lms_updates in cdlms struct
authorPaul B Mahol <onemda@gmail.com>
Sun, 1 May 2016 08:46:20 +0000 (10:46 +0200)
committerPaul B Mahol <onemda@gmail.com>
Sun, 1 May 2016 08:49:12 +0000 (10:49 +0200)
They should really be int16_t.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavcodec/lossless_audiodsp.c
libavcodec/lossless_audiodsp.h
libavcodec/wmalosslessdec.c

index 55495d0..ea0568e 100644 (file)
@@ -36,8 +36,8 @@ static int32_t scalarproduct_and_madd_int16_c(int16_t *v1, const int16_t *v2,
     return res;
 }
 
-static int32_t scalarproduct_and_madd_int32_c(int32_t *v1, const int32_t *v2,
-                                              const int32_t *v3,
+static int32_t scalarproduct_and_madd_int32_c(int16_t *v1, const int32_t *v2,
+                                              const int16_t *v3,
                                               int order, int mul)
 {
     int res = 0;
index 930fe30..eea5d49 100644 (file)
@@ -37,9 +37,9 @@ typedef struct LLAudDSPContext {
                                             const int16_t *v3,
                                             int len, int mul);
 
-    int32_t (*scalarproduct_and_madd_int32)(int32_t *v1 /* align 16 */,
+    int32_t (*scalarproduct_and_madd_int32)(int16_t *v1 /* align 16 */,
                                             const int32_t *v2,
-                                            const int32_t *v3,
+                                            const int16_t *v3,
                                             int len, int mul);
 } LLAudDSPContext;
 
index 9d56d97..983c10a 100644 (file)
@@ -147,9 +147,9 @@ typedef struct WmallDecodeCtx {
         int scaling;
         int coefsend;
         int bitsend;
-        DECLARE_ALIGNED(16, int32_t, coefs)[MAX_ORDER + WMALL_COEFF_PAD_SIZE/sizeof(int16_t)];
+        DECLARE_ALIGNED(16, int16_t, coefs)[MAX_ORDER + WMALL_COEFF_PAD_SIZE/sizeof(int16_t)];
         DECLARE_ALIGNED(16, int32_t, lms_prevvalues)[MAX_ORDER * 2 + WMALL_COEFF_PAD_SIZE/sizeof(int16_t)];
-        DECLARE_ALIGNED(16, int32_t, lms_updates)[MAX_ORDER * 2 + WMALL_COEFF_PAD_SIZE/sizeof(int16_t)];
+        DECLARE_ALIGNED(16, int16_t, lms_updates)[MAX_ORDER * 2 + WMALL_COEFF_PAD_SIZE/sizeof(int16_t)];
         int recent;
     } cdlms[WMALL_MAX_CHANNELS][9];