commit 8824fdb1c242b450f981a8ba1f23c4dadeaf6558
author Jean-Marc Valin <jmvalin@jmvalin.ca> Tue Sep 10 01:15:19 2013 -0400
committer Jean-Marc Valin <jmvalin@jmvalin.ca> Tue Sep 10 01:15:19 2013 -0400
tree c44288e78308b6269e5c0aed00ac6cd26e41f8c9
parent 7317de4fbb90407825a0d916d4582abc41dfab55

Adds surround masking to SILK

src/opus_multistream_encoder.c

diff --git a/src/opus_multistream_encoder.c b/src/opus_multistream_encoder.c
index 91ce2cd..8bf97ed 100644
--- a/src/opus_multistream_encoder.c
+++ b/src/opus_multistream_encoder.c
@@ -741,10 +741,13 @@
       opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrates[s]));
       if (st->surround)
       {
-         opus_encoder_ctl(enc, OPUS_SET_FORCE_MODE(MODE_CELT_ONLY));
          opus_encoder_ctl(enc, OPUS_SET_BANDWIDTH(OPUS_BANDWIDTH_FULLBAND));
          if (s < st->layout.nb_coupled_streams)
+         {
+            /* To preserve the spatial image, force stereo CELT on coupled streams */
+            opus_encoder_ctl(enc, OPUS_SET_FORCE_MODE(MODE_CELT_ONLY));
             opus_encoder_ctl(enc, OPUS_SET_FORCE_CHANNELS(2));
+         }
       }
    }