Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / sbrdsp.c

diff --git a/libavcodec/sbrdsp.c b/libavcodec/sbrdsp.c
index f942759aa72a015daca092287cbe31760b2884c7..8c88fb33291d59828540e188b070fd9cf73de0e0 100644 (file)
--- a/libavcodec/sbrdsp.c
+++ b/libavcodec/sbrdsp.c
@@ -35,13 +35,18 @@ static void sbr_sum64x5_c(float *z)
 
 static float sbr_sum_square_c(float (*x)[2], int n)
 {
-    float sum = 0.0f;
+    float sum0 = 0.0f, sum1 = 0.0f;
     int i;
 
-    for (i = 0; i < n; i++)
-        sum += x[i][0] * x[i][0] + x[i][1] * x[i][1];
+    for (i = 0; i < n; i += 2)
+    {
+        sum0 += x[i + 0][0] * x[i + 0][0];
+        sum1 += x[i + 0][1] * x[i + 0][1];
+        sum0 += x[i + 1][0] * x[i + 1][0];
+        sum1 += x[i + 1][1] * x[i + 1][1];
+    }
 
-    return sum;
+    return sum0 + sum1;
 }
 
 static void sbr_neg_odd_64_c(float *x)