[Scummvm-git-logs] scummvm master -> 35f4983ca122750fd4e3b5e2857b9d17dd73f932

[bgK]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8f1d1836f3 MOHAWK: Fix decoding sounds with 16 bit samples
35f4983ca1 Merge pull request #1201 from ccawley2011/mohawk-sound


Commit: 8f1d1836f3f8330b9aa26dcc14d87a3bde36b2d9
    https://github.com/scummvm/scummvm/commit/8f1d1836f3f8330b9aa26dcc14d87a3bde36b2d9
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-05-24T17:22:15+01:00

Commit Message:
MOHAWK: Fix decoding sounds with 16 bit samples

Changed paths:
    engines/mohawk/sound.cpp


diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp
index c465940..7bd6c63 100644
--- a/engines/mohawk/sound.cpp
+++ b/engines/mohawk/sound.cpp
@@ -158,11 +158,16 @@ Audio::RewindableAudioStream *makeMohawkWaveStream(Common::SeekableReadStream *s
 	// The sound in the CD version of Riven is encoded in Intel DVI ADPCM
 	// The sound in the DVD version of Riven is encoded in MPEG-2 Layer II or Intel DVI ADPCM
 	if (dataChunk.encoding == kCodecRaw) {
-		byte flags = Audio::FLAG_UNSIGNED;
+		byte flags = 0;
 
 		if (dataChunk.channels == 2)
 			flags |= Audio::FLAG_STEREO;
 
+		if (dataChunk.bitsPerSample == 16)
+			flags |= Audio::FLAG_16BITS;
+		else
+			flags |= Audio::FLAG_UNSIGNED;
+
 		return Audio::makeRawStream(dataChunk.audioData, dataChunk.sampleRate, flags);
 	} else if (dataChunk.encoding == kCodecADPCM) {
 		uint32 blockAlign = dataChunk.channels * dataChunk.bitsPerSample / 8;


Commit: 35f4983ca122750fd4e3b5e2857b9d17dd73f932
    https://github.com/scummvm/scummvm/commit/35f4983ca122750fd4e3b5e2857b9d17dd73f932
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2018-05-28T10:44:21+02:00

Commit Message:
Merge pull request #1201 from ccawley2011/mohawk-sound

MOHAWK: Fix decoding sounds with 16 bit samples

Changed paths:
    engines/mohawk/sound.cpp