latm: Always reconfigure if no extradata was set previously

[ffmpeg] / libavcodec / celp_filters.c

diff --git a/libavcodec/celp_filters.c b/libavcodec/celp_filters.c
index 7f23acae00605a656a60ca9820891cde338eb635..381ffa489408c96bfcd9dd0dd84a6878d221d48e 100644 (file)
--- a/libavcodec/celp_filters.c
+++ b/libavcodec/celp_filters.c
@@ -3,20 +3,20 @@
  *
  * Copyright (c) 2008 Vladimir Voroshilov
  *
- * 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
  */
 
@@ -24,11 +24,10 @@
 
 #include "avcodec.h"
 #include "celp_filters.h"
+#include "libavutil/common.h"
 
-void ff_celp_convolve_circ(int16_t* fc_out,
-                           const int16_t* fc_in,
-                           const int16_t* filter,
-                           int len)
+void ff_celp_convolve_circ(int16_t* fc_out, const int16_t* fc_in,
+                           const int16_t* filter, int len)
 {
     int i, k;
 
@@ -57,42 +56,43 @@ void ff_celp_circ_addf(float *out, const float *in,
         out[k] = in[k] + fac * lagged[    k - lag];
 }
 
-int ff_celp_lp_synthesis_filter(int16_t *out,
-                                const int16_t* filter_coeffs,
-                                const int16_t* in,
-                                int buffer_length,
-                                int filter_length,
-                                int stop_on_overflow,
-                                int rounder)
+int ff_celp_lp_synthesis_filter(int16_t *out, const int16_t *filter_coeffs,
+                                const int16_t *in, int buffer_length,
+                                int filter_length, int stop_on_overflow,
+                                int shift, int rounder)
 {
     int i,n;
 
     for (n = 0; n < buffer_length; n++) {
-        int sum = rounder;
+        int sum = -rounder, sum1;
         for (i = 1; i <= filter_length; i++)
-            sum -= filter_coeffs[i-1] * out[n-i];
+            sum += filter_coeffs[i-1] * out[n-i];
 
-        sum = (sum >> 12) + in[n];
+        sum1 = ((-sum >> 12) + in[n]) >> shift;
+        sum  = av_clip_int16(sum1);
+
+        if (stop_on_overflow && sum != sum1)
+            return 1;
 
-        if (sum + 0x8000 > 0xFFFFU) {
-            if (stop_on_overflow)
-                return 1;
-            sum = (sum >> 31) ^ 32767;
-        }
         out[n] = sum;
     }
 
     return 0;
 }
 
-void ff_celp_lp_synthesis_filterf(float *out,
-                                  const float* filter_coeffs,
-                                  const float* in,
-                                  int buffer_length,
+void ff_celp_lp_synthesis_filterf(float *out, const float *filter_coeffs,
+                                  const float* in, int buffer_length,
                                   int filter_length)
 {
     int i,n;
 
+#if 0 // Unoptimized code path for improved readability
+    for (n = 0; n < buffer_length; n++) {
+        out[n] = in[n];
+        for (i = 1; i <= filter_length; i++)
+            out[n] -= filter_coeffs[i-1] * out[n-i];
+    }
+#else
     float out0, out1, out2, out3;
     float old_out0, old_out1, old_out2, old_out3;
     float a,b,c;
@@ -109,7 +109,7 @@ void ff_celp_lp_synthesis_filterf(float *out,
     old_out2 = out[-2];
     old_out3 = out[-1];
     for (n = 0; n <= buffer_length - 4; n+=4) {
-        float tmp0,tmp1,tmp2,tmp3;
+        float tmp0,tmp1,tmp2;
         float val;
 
         out0 = in[0];
@@ -133,9 +133,8 @@ void ff_celp_lp_synthesis_filterf(float *out,
         out2 -= val * old_out2;
         out3 -= val * old_out3;
 
-        old_out3 = out[-5];
-
         for (i = 5; i <= filter_length; i += 2) {
+            old_out3 = out[-i];
             val = filter_coeffs[i-1];
 
             out0 -= val * old_out3;
@@ -154,13 +153,11 @@ void ff_celp_lp_synthesis_filterf(float *out,
 
             FFSWAP(float, old_out0, old_out2);
             old_out1 = old_out3;
-            old_out3 = out[-i-2];
         }
 
         tmp0 = out0;
         tmp1 = out1;
         tmp2 = out2;
-        tmp3 = out3;
 
         out3 -= a * tmp2;
         out2 -= a * tmp1;
@@ -193,12 +190,11 @@ void ff_celp_lp_synthesis_filterf(float *out,
         for (i = 1; i <= filter_length; i++)
             out[n] -= filter_coeffs[i-1] * out[n-i];
     }
+#endif
 }
 
-void ff_celp_lp_zero_synthesis_filterf(float *out,
-                                       const float* filter_coeffs,
-                                       const float* in,
-                                       int buffer_length,
+void ff_celp_lp_zero_synthesis_filterf(float *out, const float *filter_coeffs,
+                                       const float *in, int buffer_length,
                                        int filter_length)
 {
     int i,n;