aboutsummaryrefslogtreecommitdiff
path: root/graphics/video/smk_decoder.h
diff options
context:
space:
mode:
authorMatthew Hoops2010-05-31 21:29:43 +0000
committerMatthew Hoops2010-05-31 21:29:43 +0000
commit2138fe0d5afbcb8566c90e8338a5c2896282772f (patch)
treefc2938e2db7237c7871f172a0917652ce40d3326 /graphics/video/smk_decoder.h
parent844ef9ba1a08de70058cfa8014f55a801b7c77aa (diff)
downloadscummvm-rg350-2138fe0d5afbcb8566c90e8338a5c2896282772f.tar.gz
scummvm-rg350-2138fe0d5afbcb8566c90e8338a5c2896282772f.tar.bz2
scummvm-rg350-2138fe0d5afbcb8566c90e8338a5c2896282772f.zip
Fix our interpretation of the audio compression types to what FFmpeg currently does. Should fix bug #3009282.
svn-id: r49362
Diffstat (limited to 'graphics/video/smk_decoder.h')
-rw-r--r--graphics/video/smk_decoder.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/graphics/video/smk_decoder.h b/graphics/video/smk_decoder.h
index 437f47f2d6..6bf671f318 100644
--- a/graphics/video/smk_decoder.h
+++ b/graphics/video/smk_decoder.h
@@ -80,12 +80,18 @@ private:
uint getBlockRun(int index) { return (index <= 58) ? index + 1 : 128 << (index - 59); }
void queueCompressedBuffer(byte *buffer, uint32 bufferSize, uint32 unpackedSize, int streamNum);
+ enum AudioCompression {
+ kCompressionNone,
+ kCompressionDPCM,
+ kCompressionRDFT,
+ kCompressionDCT
+ };
+
struct AudioInfo {
- bool isCompressed;
+ AudioCompression compression;
bool hasAudio;
bool is16Bits;
bool isStereo;
- bool hasV2Compression;
uint32 sampleRate;
};