[FFmpeg-cvslog] libopus: decode ambisonics with non-diegetic sources

[Felicia]

ffmpeg | branch: master | Felicia <flim at google.com> | Mon Feb  6 15:49:36 2017 -0800| [fcf3e06fe406823214e95993e210ac2cc2bfa6b4] | committer: Michael Niedermayer

libopus: decode ambisonics with non-diegetic sources

Channel mapping 2 additionally supports a non-diegetic stereo track
appended to the end of a full-order ambisonics signal, such that the
total channel count is either
  (n + 1) ^ 2, or
  (n + 1) ^ 2 + 2
where n is the ambisonics order

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/opus.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/opus.c b/libavcodec/opus.c
index 1eeb92c..07e70fd 100644
--- a/libavcodec/opus.c
+++ b/libavcodec/opus.c
@@ -373,10 +373,12 @@ av_cold int ff_opus_parse_extradata(AVCodecContext *avctx,
             channel_reorder = channel_reorder_vorbis;
         } else if (map_type == 2) {
             int ambisonic_order = ff_sqrt(channels) - 1;
-            if (channels != (ambisonic_order + 1) * (ambisonic_order + 1)) {
+            if (channels != ((ambisonic_order + 1) * (ambisonic_order + 1)) &&
+                channels != ((ambisonic_order + 1) * (ambisonic_order + 1) + 2)) {
                 av_log(avctx, AV_LOG_ERROR,
                        "Channel mapping 2 is only specified for channel counts"
-                       " which can be written as (n + 1)^2 for nonnegative integer n\n");
+                       " which can be written as (n + 1)^2 or (n + 1)^2 + 2"
+                       " for nonnegative integer n\n");
                 return AVERROR_INVALIDDATA;
             }
             layout = 0;