virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

avformat/sierravmd: Support for Shivers 2 stereo tracks

Browse Source 
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>
This commit is contained in:
Nicolas Roy-Renaud
2017-02-17 22:50:11 -05:00
committed by Michael Niedermayer
parent 42959044ac
commit 4ec07e9431
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libavformat/sierravmd.c
View File

@@ -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;