decode: flush the internal bsfs instead of constantly reinitalizing them

[ffmpeg] / libavcodec / sbrdsp.c

diff --git a/libavcodec/sbrdsp.c b/libavcodec/sbrdsp.c
index 85b4ebefb44f4a5fa929cc481f31e82da56b3b36..029433225f7463e9ba3375f0870bc58fac8f9b5d 100644 (file)
--- a/libavcodec/sbrdsp.c
+++ b/libavcodec/sbrdsp.c
@@ -22,6 +22,7 @@
 
 #include "config.h"
 #include "libavutil/attributes.h"
+#include "libavutil/intfloat.h"
 #include "sbrdsp.h"
 
 static void sbr_sum64x5_c(float *z)
@@ -51,37 +52,51 @@ static float sbr_sum_square_c(float (*x)[2], int n)
 
 static void sbr_neg_odd_64_c(float *x)
 {
+    union av_intfloat32 *xi = (union av_intfloat32*) x;
     int i;
-    for (i = 1; i < 64; i += 2)
-        x[i] = -x[i];
+    for (i = 1; i < 64; i += 4) {
+        xi[i + 0].i ^= 1U << 31;
+        xi[i + 2].i ^= 1U << 31;
+    }
 }
 
 static void sbr_qmf_pre_shuffle_c(float *z)
 {
+    union av_intfloat32 *zi = (union av_intfloat32*) z;
     int k;
-    z[64] = z[0];
-    z[65] = z[1];
-    for (k = 1; k < 32; k++) {
-        z[64+2*k  ] = -z[64 - k];
-        z[64+2*k+1] =  z[ k + 1];
+    zi[64].i = zi[0].i;
+    zi[65].i = zi[1].i;
+    for (k = 1; k < 31; k += 2) {
+        zi[64 + 2 * k + 0].i = zi[64 - k].i ^ (1U << 31);
+        zi[64 + 2 * k + 1].i = zi[ k + 1].i;
+        zi[64 + 2 * k + 2].i = zi[63 - k].i ^ (1U << 31);
+        zi[64 + 2 * k + 3].i = zi[ k + 2].i;
     }
+    zi[64 + 2 * 31 + 0].i = zi[64 - 31].i ^ (1U << 31);
+    zi[64 + 2 * 31 + 1].i = zi[31 +  1].i;
 }
 
 static void sbr_qmf_post_shuffle_c(float W[32][2], const float *z)
 {
+    const union av_intfloat32 *zi = (const union av_intfloat32*) z;
+    union av_intfloat32 *Wi       = (union av_intfloat32*) W;
     int k;
-    for (k = 0; k < 32; k++) {
-        W[k][0] = -z[63-k];
-        W[k][1] = z[k];
+    for (k = 0; k < 32; k += 2) {
+        Wi[2 * k + 0].i = zi[63 - k].i ^ (1U << 31);
+        Wi[2 * k + 1].i = zi[ k + 0].i;
+        Wi[2 * k + 2].i = zi[62 - k].i ^ (1U << 31);
+        Wi[2 * k + 3].i = zi[ k + 1].i;
     }
 }
 
 static void sbr_qmf_deint_neg_c(float *v, const float *src)
 {
+    const union av_intfloat32 *si = (const union av_intfloat32*)src;
+    union av_intfloat32 *vi = (union av_intfloat32*)v;
     int i;
     for (i = 0; i < 32; i++) {
-        v[     i] =  src[63 - 2*i    ];
-        v[63 - i] = -src[63 - 2*i - 1];
+        vi[     i].i = si[63 - 2 * i    ].i;
+        vi[63 - i].i = si[63 - 2 * i - 1].i ^ (1U << 31);
     }
 }
 
@@ -94,6 +109,11 @@ static void sbr_qmf_deint_bfly_c(float *v, const float *src0, const float *src1)
     }
 }
 
+
+#if 0
+    /* This code is slower because it multiplies memory accesses.
+     * It is left for educational purposes and because it may offer
+     * a better reference for writing arch-specific DSP functions. */
 static av_always_inline void autocorrelate(const float x[40][2],
                                            float phi[3][2][2], int lag)
 {
@@ -122,14 +142,13 @@ static av_always_inline void autocorrelate(const float x[40][2],
 
 static void sbr_autocorrelate_c(const float x[40][2], float phi[3][2][2])
 {
-#if 0
-    /* This code is slower because it multiplies memory accesses.
-     * It is left for educational purposes and because it may offer
-     * a better reference for writing arch-specific DSP functions. */
     autocorrelate(x, phi, 0);
     autocorrelate(x, phi, 1);
     autocorrelate(x, phi, 2);
+}
 #else
+static void sbr_autocorrelate_c(const float x[40][2], float phi[3][2][2])
+{
     float real_sum2 = x[0][0] * x[2][0] + x[0][1] * x[2][1];
     float imag_sum2 = x[0][0] * x[2][1] - x[0][1] * x[2][0];
     float real_sum1 = 0.0f, imag_sum1 = 0.0f, real_sum0 = 0.0f;
@@ -149,8 +168,8 @@ static void sbr_autocorrelate_c(const float x[40][2], float phi[3][2][2])
     phi[2 - 1][1][1] = imag_sum1 + x[ 0][0] * x[ 1][1] - x[ 0][1] * x[ 1][0];
     phi[0    ][0][0] = real_sum1 + x[38][0] * x[39][0] + x[38][1] * x[39][1];
     phi[0    ][0][1] = imag_sum1 + x[38][0] * x[39][1] - x[38][1] * x[39][0];
-#endif
 }
+#endif
 
 static void sbr_hf_gen_c(float (*X_high)[2], const float (*X_low)[2],
                          const float alpha0[2], const float alpha1[2],