[Scummvm-cvs-logs] SF.net SVN: scummvm:[46270] scummvm/trunk/graphics/video/avi_decoder.cpp

[drmccoy at users.sourceforge.net]

Revision: 46270
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46270&view=rev
Author:   drmccoy
Date:     2009-12-06 04:38:20 +0000 (Sun, 06 Dec 2009)

Log Message:
-----------
Adding support for mono signed 16bit little-endian uncompressed PCM audio (thank you, clone :))

Modified Paths:
--------------
    scummvm/trunk/graphics/video/avi_decoder.cpp

Modified: scummvm/trunk/graphics/video/avi_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/avi_decoder.cpp	2009-12-06 00:54:24 UTC (rev 46269)
+++ scummvm/trunk/graphics/video/avi_decoder.cpp	2009-12-06 04:38:20 UTC (rev 46270)
@@ -425,8 +425,16 @@
 }
 
 Audio::AppendableAudioStream *AviDecoder::createAudioStream() {
-	if (_wvInfo.tag == AVI_WAVE_FORMAT_PCM)
-		return Audio::makeAppendableAudioStream(AUDIO_RATE, Audio::Mixer::FLAG_UNSIGNED|Audio::Mixer::FLAG_AUTOFREE);
+	byte flags = Audio::Mixer::FLAG_AUTOFREE;
+
+	if (_wvInfo.tag == AVI_WAVE_FORMAT_PCM) {
+		if (_audsHeader.sampleSize == 2)
+			flags |= Audio::Mixer::FLAG_16BITS|Audio::Mixer::FLAG_LITTLE_ENDIAN;
+		else
+			flags |= Audio::Mixer::FLAG_UNSIGNED;
+
+		return Audio::makeAppendableAudioStream(AUDIO_RATE, flags);
+	}
 	
 	if (_wvInfo.tag != 0) // No sound
 		warning ("Unsupported AVI audio format %d", _wvInfo.tag);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.