[FFmpeg-cvslog] avformat/cafdec: reject multichannel Opus streams

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Sep 19 23:04:55 2017 -0300| [5a3b602acda68fe5ca09082dc753179450a97a13] | committer: James Almer

avformat/cafdec: reject multichannel Opus streams

Multichannel Opus streams require channel mapping information in extradata.

Signed-off-by: James Almer <jamrial at gmail.com>

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

 libavformat/cafdec.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
index 4e47addc02..7652d9e238 100644
--- a/libavformat/cafdec.c
+++ b/libavformat/cafdec.c
@@ -167,6 +167,12 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size)
             avio_skip(pb, size - ALAC_NEW_KUKI);
         }
     } else if (st->codecpar->codec_id == AV_CODEC_ID_OPUS) {
+        // The data layout for Opus is currently unknown, so we do not export
+        // extradata at all. Multichannel streams are not supported.
+        if (st->codecpar->channels > 2) {
+            avpriv_request_sample(s, "multichannel Opus in CAF");
+            return AVERROR_PATCHWELCOME;
+        }
         avio_skip(pb, size);
     } else {
         av_freep(&st->codecpar->extradata);