[FFmpeg-cvslog] avformat/sierravmd: Support for Shivers 2 stereo tracks

[Nicolas Roy-Renaud]

ffmpeg | branch: master | Nicolas Roy-Renaud <nicolas.roy-renaud.1 at ens.etsmtl.ca> | Fri Feb 17 22:50:11 2017 -0500| [4ec07e943144ec0b7b89bff49bd54e6f6d6db4e8] | committer: Michael Niedermayer

avformat/sierravmd: Support for Shivers 2 stereo tracks

Signed-off-by: Nicolas Roy-Renaud <nicolas.roy-renaud.1 at ens.etsmtl.ca>
Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/sierravmd.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c
index 734a3f2..6960c28 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;