aboutsummaryrefslogtreecommitdiff
path: root/audio/decoders/quicktime_intern.h
diff options
context:
space:
mode:
authorMatthew Hoops2011-07-10 15:20:33 -0400
committerMatthew Hoops2011-07-10 15:50:47 -0400
commitc46aa548d6d8a1eabb968bfd0152215490bf746c (patch)
tree2d69f3ce5415f13a1b55af1f7efc5a5b43b1c4f4 /audio/decoders/quicktime_intern.h
parent0d02cc0ef5efe1ed3d16904f6622fa9cd520be1d (diff)
downloadscummvm-rg350-c46aa548d6d8a1eabb968bfd0152215490bf746c.tar.gz
scummvm-rg350-c46aa548d6d8a1eabb968bfd0152215490bf746c.tar.bz2
scummvm-rg350-c46aa548d6d8a1eabb968bfd0152215490bf746c.zip
AUDIO: Fix remaining AAC bugs by decoding with the same AAC context
This introduces a new Audio::Codec class, based on DrMcCoy's solution for WMA in eos.
Diffstat (limited to 'audio/decoders/quicktime_intern.h')
-rw-r--r--audio/decoders/quicktime_intern.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/audio/decoders/quicktime_intern.h b/audio/decoders/quicktime_intern.h
index f288d5604b..7ce06b85fe 100644
--- a/audio/decoders/quicktime_intern.h
+++ b/audio/decoders/quicktime_intern.h
@@ -45,6 +45,7 @@ namespace Common {
namespace Audio {
class AudioStream;
+class Codec;
class QueuingAudioStream;
class QuickTimeAudioDecoder : public Common::QuickTimeParser {
@@ -68,10 +69,12 @@ protected:
class AudioSampleDesc : public Common::QuickTimeParser::SampleDesc {
public:
AudioSampleDesc(Common::QuickTimeParser::Track *parentTrack, uint32 codecTag);
+ ~AudioSampleDesc();
bool isAudioCodecSupported() const;
uint32 getAudioChunkSampleCount(uint chunk) const;
AudioStream *createAudioStream(Common::SeekableReadStream *stream) const;
+ void initCodec();
// TODO: Make private in the long run
uint16 _bitsPerSample;
@@ -79,6 +82,8 @@ protected:
uint32 _sampleRate;
uint32 _samplesPerFrame;
uint32 _bytesPerFrame;
+
+ Codec *_codec;
};
// Common::QuickTimeParser API