From 76105b29b7f885ed873f6af7321d8e48a5b0a41e Mon Sep 17 00:00:00 2001 From: Matthew Hoops Date: Thu, 14 Apr 2011 10:25:02 -0400 Subject: AUDIO: Split the QuickTimeAudioDecoder into a new header file (Mirroring the new adpcm_intern.h file) --- audio/decoders/quicktime.cpp | 1 + audio/decoders/quicktime.h | 49 +------------------- audio/decoders/quicktime_intern.h | 96 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+), 48 deletions(-) create mode 100644 audio/decoders/quicktime_intern.h (limited to 'audio') diff --git a/audio/decoders/quicktime.cpp b/audio/decoders/quicktime.cpp index d4cd3a62f2..5115a20218 100644 --- a/audio/decoders/quicktime.cpp +++ b/audio/decoders/quicktime.cpp @@ -30,6 +30,7 @@ #include "audio/audiostream.h" #include "audio/decoders/quicktime.h" +#include "audio/decoders/quicktime_intern.h" // Codecs #include "audio/decoders/aac.h" diff --git a/audio/decoders/quicktime.h b/audio/decoders/quicktime.h index 8a779d45a6..ff81ec9390 100644 --- a/audio/decoders/quicktime.h +++ b/audio/decoders/quicktime.h @@ -34,7 +34,6 @@ #ifndef AUDIO_QUICKTIME_H #define AUDIO_QUICKTIME_H -#include "common/quicktime.h" #include "common/scummsys.h" #include "common/types.h" @@ -45,53 +44,7 @@ namespace Common { namespace Audio { -class AudioStream; -class RewindableAudioStream; -class QueuingAudioStream; - -class QuickTimeAudioDecoder : public Common::QuickTimeParser { -public: - QuickTimeAudioDecoder(); - virtual ~QuickTimeAudioDecoder(); - - /** - * Load a QuickTime audio file - * @param filename the filename to load - */ - bool loadAudioFile(const Common::String &filename); - - /** - * Load a QuickTime audio file from a SeekableReadStream - * @param stream the stream to load - */ - bool loadAudioStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeFileHandle); - -protected: - struct AudioSampleDesc : public Common::QuickTimeParser::SampleDesc { - AudioSampleDesc(); - - uint16 channels; - uint32 sampleRate; - uint32 samplesPerFrame; - uint32 bytesPerFrame; - }; - - // Common::QuickTimeParser API - virtual Common::QuickTimeParser::SampleDesc *readSampleDesc(MOVStreamContext *st, uint32 format); - - AudioStream *createAudioStream(Common::SeekableReadStream *stream); - bool checkAudioCodecSupport(uint32 tag, byte objectTypeMP4); - void init(); - - void queueNextAudioChunk(); - uint32 getAudioChunkSampleCount(uint chunk); - int8 _audioStreamIndex; - uint _curAudioChunk; - QueuingAudioStream *_audStream; - - void setAudioStreamPos(const Timestamp &where); - bool isOldDemuxing() const; -}; +class SeekableAudioStream; /** * Try to load a QuickTime sound file from the given file name and create a SeekableAudioStream diff --git a/audio/decoders/quicktime_intern.h b/audio/decoders/quicktime_intern.h new file mode 100644 index 0000000000..691ef7b58c --- /dev/null +++ b/audio/decoders/quicktime_intern.h @@ -0,0 +1,96 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + * + */ + +/** + * Internal interface to the QuickTime audio decoder. + * + * This is available so that the QuickTimeVideoDecoder can use + * this directly. + */ + +#ifndef AUDIO_QUICKTIME_INTERN_H +#define AUDIO_QUICKTIME_INTERN_H + +#include "common/quicktime.h" +#include "common/scummsys.h" +#include "common/types.h" + +namespace Common { + class SeekableReadStream; + class String; +} + +namespace Audio { + +class AudioStream; +class QueuingAudioStream; + +class QuickTimeAudioDecoder : public Common::QuickTimeParser { +public: + QuickTimeAudioDecoder(); + virtual ~QuickTimeAudioDecoder(); + + /** + * Load a QuickTime audio file + * @param filename the filename to load + */ + bool loadAudioFile(const Common::String &filename); + + /** + * Load a QuickTime audio file from a SeekableReadStream + * @param stream the stream to load + */ + bool loadAudioStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeFileHandle); + +protected: + struct AudioSampleDesc : public Common::QuickTimeParser::SampleDesc { + AudioSampleDesc(); + + uint16 channels; + uint32 sampleRate; + uint32 samplesPerFrame; + uint32 bytesPerFrame; + }; + + // Common::QuickTimeParser API + virtual Common::QuickTimeParser::SampleDesc *readSampleDesc(MOVStreamContext *st, uint32 format); + + AudioStream *createAudioStream(Common::SeekableReadStream *stream); + bool checkAudioCodecSupport(uint32 tag, byte objectTypeMP4); + void init(); + + void queueNextAudioChunk(); + uint32 getAudioChunkSampleCount(uint chunk); + int8 _audioStreamIndex; + uint _curAudioChunk; + QueuingAudioStream *_audStream; + + void setAudioStreamPos(const Timestamp &where); + bool isOldDemuxing() const; +}; + +} // End of namespace Audio + +#endif -- cgit v1.2.3