x86: cabac: replace explicit memory references with "m" operands

[ffmpeg] / libavcodec / celp_filters.c

diff --git a/libavcodec/celp_filters.c b/libavcodec/celp_filters.c
index e828e0611c6da045ee73392bc40db0abcf28fc97..25a6744b040f55e09a6d75218ecd3e34bc90b373 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
  */
 
@@ -86,6 +86,13 @@ void ff_celp_lp_synthesis_filterf(float *out, const float *filter_coeffs,
 {
     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;
@@ -102,7 +109,7 @@ void ff_celp_lp_synthesis_filterf(float *out, const float *filter_coeffs,
     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];
@@ -153,7 +160,6 @@ void ff_celp_lp_synthesis_filterf(float *out, const float *filter_coeffs,
         tmp0 = out0;
         tmp1 = out1;
         tmp2 = out2;
-        tmp3 = out3;
 
         out3 -= a * tmp2;
         out2 -= a * tmp1;
@@ -186,6 +192,7 @@ void ff_celp_lp_synthesis_filterf(float *out, const float *filter_coeffs,
         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,