[FFmpeg-cvslog] Merge commit 'a9ba59591ed509fb7e6decfde8da4cbfd4ddf4b8'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed Mar 22 11:30:53 2017 +0100| [fd5e1d132b460acc533e7d71148c6eca2c691d99] | committer: Clément Bœsch

Merge commit 'a9ba59591ed509fb7e6decfde8da4cbfd4ddf4b8'

* commit 'a9ba59591ed509fb7e6decfde8da4cbfd4ddf4b8':
  ac3dsp: Add some special-case handling for the C downmix function

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd5e1d132b460acc533e7d71148c6eca2c691d99
---

 libavcodec/ac3dsp.c | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/libavcodec/ac3dsp.c b/libavcodec/ac3dsp.c
index 23abc56..47963b9 100644
--- a/libavcodec/ac3dsp.c
+++ b/libavcodec/ac3dsp.c
@@ -216,9 +216,46 @@ static void ac3_sum_square_butterfly_float_c(float sum[4],
 static void ac3_downmix_c(float **samples, float **matrix,
                           int out_ch, int in_ch, int len)
 {
+    int **matrix_cmp = (int **)matrix;
     int i, j;
     float v0, v1;
-    if (out_ch == 2) {
+
+    if (in_ch == 5 && out_ch == 2 &&
+        !(matrix_cmp[1][0] | matrix_cmp[0][2]   |
+          matrix_cmp[1][3] | matrix_cmp[0][4]   |
+         (matrix_cmp[0][1] ^ matrix_cmp[1][1]) |
+         (matrix_cmp[0][0] ^ matrix_cmp[1][2]))) {
+        float front_mix    = matrix[0][0];
+        float center_mix   = matrix[0][1];
+        float surround_mix = matrix[0][3];
+
+        for (i = 0; i < len; i++) {
+            v0 = samples[0][i] * front_mix  +
+                 samples[1][i] * center_mix +
+                 samples[3][i] * surround_mix;
+
+            v1 = samples[1][i] * center_mix +
+                 samples[2][i] * front_mix  +
+                 samples[4][i] * surround_mix;
+
+            samples[0][i] = v0;
+            samples[1][i] = v1;
+        }
+    } else if (in_ch == 5 && out_ch == 1 &&
+               matrix_cmp[0][0] == matrix_cmp[0][2] &&
+               matrix_cmp[0][3] == matrix_cmp[0][4]) {
+        float front_mix    = matrix[0][0];
+        float center_mix   = matrix[0][1];
+        float surround_mix = matrix[0][3];
+
+        for (i = 0; i < len; i++) {
+            samples[0][i] = samples[0][i] * front_mix    +
+                            samples[1][i] * center_mix   +
+                            samples[2][i] * front_mix    +
+                            samples[3][i] * surround_mix +
+                            samples[4][i] * surround_mix;
+        }
+    } else if (out_ch == 2) {
         for (i = 0; i < len; i++) {
             v0 = v1 = 0.0f;
             for (j = 0; j < in_ch; j++) {


======================================================================