diff options
| author | Nicolas Roy-Renaud <nicolas.roy-renaud.1@ens.etsmtl.ca> | 2017-02-17 22:50:11 -0500 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-02-21 19:05:04 +0100 |
| commit | 4ec07e943144ec0b7b89bff49bd54e6f6d6db4e8 (patch) | |
| tree | ce534dfe9c6459406aab63f94fd4e76be5ec822f /libavformat/sierravmd.c | |
| parent | 42959044ac7dc40d5593cca2386d26257a615e5b (diff) | |
avformat/sierravmd: Support for Shivers 2 stereo tracks
Signed-off-by: Nicolas Roy-Renaud <nicolas.roy-renaud.1@ens.etsmtl.ca>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/sierravmd.c')
| -rw-r--r-- | libavformat/sierravmd.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c index 734a3f2c1e..6960c2868f 100644 --- a/libavformat/sierravmd.c +++ b/libavformat/sierravmd.c @@ -142,13 +142,6 @@ static int vmd_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_VMDAUDIO; st->codecpar->codec_tag = 0; /* no fourcc */ - if (vmd->vmd_header[811] & 0x80) { - st->codecpar->channels = 2; - st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; - } else { - st->codecpar->channels = 1; - st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; - } st->codecpar->sample_rate = vmd->sample_rate; st->codecpar->block_align = AV_RL16(&vmd->vmd_header[806]); if (st->codecpar->block_align & 0x8000) { @@ -157,6 +150,19 @@ static int vmd_read_header(AVFormatContext *s) } else { st->codecpar->bits_per_coded_sample = 8; } + if (vmd->vmd_header[811] & 0x80) { + st->codecpar->channels = 2; + st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; + } else if (vmd->vmd_header[811] & 0x2) { + /* Shivers 2 stereo audio */ + /* Frame length is for 1 channel */ + st->codecpar->channels = 2; + st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; + st->codecpar->block_align = st->codecpar->block_align << 1; + } else { + st->codecpar->channels = 1; + st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + } st->codecpar->bit_rate = st->codecpar->sample_rate * st->codecpar->bits_per_coded_sample * st->codecpar->channels; |