commit 3421f6d2baebd064ed42d7ee5814b511be11c105
author Mark Harris <mark.hsj@gmail.com> Sat Aug 27 07:03:02 2016 -0700
committer Mark Harris <mark.hsj@gmail.com> Sat Aug 27 07:03:02 2016 -0700
tree 66aa24ea96b0cceaab09bf92ef46b968a9fe6b93
parent 9f3883a955d8d7a7110aa1b5973b041f5374b76a

Correct analysis downmix scaling factor

Divide by the actual number of channels mixed

src/opus_encoder.c

diff --git a/src/opus_encoder.c b/src/opus_encoder.c
index d1784e7..f484b0a 100644
--- a/src/opus_encoder.c
+++ b/src/opus_encoder.c
@@ -811,9 +811,9 @@
 #else
    scale = 1.f;
 #endif
-   if (C==-2)
+   if (c2==-2)
       scale /= C;
-   else
+   else if (c2>-1)
       scale /= 2;
    for (j=0;j<subframe;j++)
       sub[j] *= scale;
@@ -846,9 +846,9 @@
 #else
    scale = 1.f/32768;
 #endif
-   if (C==-2)
+   if (c2==-2)
       scale /= C;
-   else
+   else if (c2>-1)
       scale /= 2;
    for (j=0;j<subframe;j++)
       sub[j] *= scale;