diff options
| author | Maxim Poliakovski <max_pole@gmx.de> | 2013-09-28 00:18:18 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-09-29 21:52:57 +0200 |
| commit | 23d0fdcf6f30843fc3f14084d80581f1ca10f1f3 (patch) | |
| tree | 2bcd2660c5ac96647535364584e3c3e3cc7ad1b6 /libavformat/omadec.c | |
| parent | 93370d12164236d59645314871a1d6808b2a8ddb (diff) | |
Add support for multichannel ATRAC3+ streams.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavformat/omadec.c')
| -rw-r--r-- | libavformat/omadec.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libavformat/omadec.c b/libavformat/omadec.c index 274112e5af..e68071cf70 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -1,7 +1,7 @@ /* * Sony OpenMG (OMA) demuxer * - * Copyright (c) 2008 Maxim Poliakovski + * Copyright (c) 2008, 2013 Maxim Poliakovski * 2008 Benjamin Larsson * 2011 David Goldwich * @@ -284,7 +284,7 @@ static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header) static int oma_read_header(AVFormatContext *s) { int ret, framesize, jsflag, samplerate; - uint32_t codec_params; + uint32_t codec_params, channel_id; int16_t eid; uint8_t buf[EA3_HEADER_SIZE]; uint8_t *edata; @@ -364,7 +364,14 @@ static int oma_read_header(AVFormatContext *s) avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); break; case OMA_CODECID_ATRAC3P: - st->codec->channels = (codec_params >> 10) & 7; + channel_id = (codec_params >> 10) & 7; + if (!channel_id) { + av_log(s, AV_LOG_ERROR, + "Invalid ATRAC-X channel id: %d\n", channel_id); + return AVERROR_INVALIDDATA; + } + st->codec->channel_layout = ff_oma_chid_to_native_layout[channel_id - 1]; + st->codec->channels = ff_oma_chid_to_num_channels[channel_id - 1]; framesize = ((codec_params & 0x3FF) * 8) + 8; samplerate = ff_oma_srate_tab[(codec_params >> 13) & 7] * 100; if (!samplerate) { |