diff options
| author | Anton Khirnov <anton@khirnov.net> | 2017-07-01 10:49:58 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2017-07-22 09:30:56 +0200 |
| commit | 48a5c35346aeded1c65b8709bbb085fa4e705c91 (patch) | |
| tree | 4d359a4fcd34a5e39e805a393c53d508c98121a8 | |
| parent | ce1a99d870c05b639512920cd3a1dee3e41d323f (diff) | |
| download | ffmpeg-48a5c35346aeded1c65b8709bbb085fa4e705c91.tar.gz | |
caf: add an Opus tag
CC: libav-stable@libav.org
| -rw-r--r-- | libavformat/caf.c | 1 | ||||
| -rw-r--r-- | libavformat/cafdec.c | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/libavformat/caf.c b/libavformat/caf.c index cf128d5624..c299cad01b 100644 --- a/libavformat/caf.c +++ b/libavformat/caf.c @@ -49,6 +49,7 @@ const AVCodecTag ff_codec_caf_tags[] = { { AV_CODEC_ID_QCELP, MKBETAG('Q','c','l','p') }, { AV_CODEC_ID_QDM2, MKBETAG('Q','D','M','2') }, { AV_CODEC_ID_QDM2, MKBETAG('Q','D','M','C') }, + { AV_CODEC_ID_OPUS, MKBETAG('o','p','u','s') }, /* currently unsupported codecs */ /*{ AC-3 over S/PDIF MKBETAG('c','a','c','3') },*/ /*{ MPEG4CELP MKBETAG('c','e','l','p') },*/ diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c index efc8c49c4a..d6b6007a1d 100644 --- a/libavformat/cafdec.c +++ b/libavformat/cafdec.c @@ -156,6 +156,14 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size) avio_skip(pb, size - ALAC_NEW_KUKI); } st->codecpar->extradata_size = ALAC_HEADER; + } 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 { st->codecpar->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE); if (!st->codecpar->extradata) |