libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-21 19:51:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AUDIO: Combine WaveFormat enums under one header

Browse Source
This commit is contained in:
SupSuper 2021-02-05 14:28:21 +00:00 committed by Filippos Karapetis
parent 9a33d895ed
commit 872a547230
5 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/decoders/asf.cpp
View File

@ -382,7 +382,7 @@ ASFStream::Packet *ASFStream::readPacket() {
Codec *ASFStream::createCodec() {
switch (_compression) {
case kWaveWMAv2:
case kWaveFormatWMAv2:
return new WMACodec(2, _sampleRate, _channels, _bitRate, _blockAlign, _extraData);
default:
error("ASFStream::createAudioStream(): Unknown compression 0x%04x", _compression);

9
audio/decoders/wave.cpp
View File

@ -25,6 +25,7 @@
#include "common/stream.h"
#include "audio/audiostream.h"
#include "audio/decoders/wave_types.h"
#include "audio/decoders/wave.h"
#include "audio/decoders/adpcm.h"
#include "audio/decoders/mp3.h"
@ -32,14 +33,6 @@
namespace Audio {
// Audio Codecs
enum {
kWaveFormatPCM = 1,
kWaveFormatMSADPCM = 2,
kWaveFormatMSIMAADPCM = 17,
kWaveFormatMP3 = 85
};
bool loadWAVFromStream(Common::SeekableReadStream &stream, int &size, int &rate, byte &flags, uint16 *wavType, int *blockAlign_) {
const int32 initialPos = stream.pos();
byte buf[4+1];

14
audio/decoders/wave_types.h
View File

@ -25,12 +25,16 @@
namespace Audio {
// Audio Codecs
enum WaveCompressionType {
kWavePCM = 0x0001,
kWaveMSADPCM = 0x0002,
kWaveMSIMAADPCM = 0x0011,
kWaveMSIMAADPCM2 = 0x0069,
kWaveWMAv2 = 0x0161
kWaveFormatNone = 0x0000,
kWaveFormatPCM = 0x0001,
kWaveFormatMSADPCM = 0x0002,
kWaveFormatMSIMAADPCM = 0x0011,
kWaveFormatMP3 = 0x0055,
kWaveFormatDK3 = 0x0062, // rogue format number
kWaveFormatMSIMAADPCM2 = 0x0069,
kWaveFormatWMAv2 = 0x0161
};
} // End of namespace Audio

13
video/avi_decoder.cpp
View File

@ -30,6 +30,7 @@
#include "video/avi_decoder.h"
// Audio Codecs
#include "audio/decoders/wave_types.h"
#include "audio/decoders/adpcm.h"
#include "audio/decoders/mp3.h"
#include "audio/decoders/raw.h"
@ -1096,7 +1097,7 @@ void AVIDecoder::AVIAudioTrack::createAudioStream() {
_packetStream = 0;
switch (_wvInfo.tag) {
case kWaveFormatPCM: {
case Audio::kWaveFormatPCM: {
byte flags = 0;
if (_audsHeader.sampleSize == 2)
flags |= Audio::FLAG_16BITS | Audio::FLAG_LITTLE_ENDIAN;
@ -1109,23 +1110,23 @@ void AVIDecoder::AVIAudioTrack::createAudioStream() {
_packetStream = Audio::makePacketizedRawStream(_wvInfo.samplesPerSec, flags);
break;
}
case kWaveFormatMSADPCM:
case Audio::kWaveFormatMSADPCM:
_packetStream = Audio::makePacketizedADPCMStream(Audio::kADPCMMS, _wvInfo.samplesPerSec, _wvInfo.channels, _wvInfo.blockAlign);
break;
case kWaveFormatMSIMAADPCM:
case Audio::kWaveFormatMSIMAADPCM:
_packetStream = Audio::makePacketizedADPCMStream(Audio::kADPCMMSIma, _wvInfo.samplesPerSec, _wvInfo.channels, _wvInfo.blockAlign);
break;
case kWaveFormatDK3:
case Audio::kWaveFormatDK3:
_packetStream = Audio::makePacketizedADPCMStream(Audio::kADPCMDK3, _wvInfo.samplesPerSec, _wvInfo.channels, _wvInfo.blockAlign);
break;
case kWaveFormatMP3:
case Audio::kWaveFormatMP3:
#ifdef USE_MAD
_packetStream = Audio::makePacketizedMP3Stream(_wvInfo.channels, _wvInfo.samplesPerSec);
#else
warning("AVI MP3 stream found, but no libmad support compiled in");
#endif
break;
case kWaveFormatNone:
case Audio::kWaveFormatNone:
break;
default:
warning("Unsupported AVI audio format %d", _wvInfo.tag);

10
video/avi_decoder.h
View File

@ -296,16 +296,6 @@ protected:
protected:
Audio::AudioStream *getAudioStream() const { return _audioStream; }
// Audio Codecs
enum {
kWaveFormatNone = 0,
kWaveFormatPCM = 1,
kWaveFormatMSADPCM = 2,
kWaveFormatMSIMAADPCM = 17,
kWaveFormatMP3 = 85,
kWaveFormatDK3 = 98 // rogue format number
};
AVIStreamHeader _audsHeader;
PCMWaveFormat _wvInfo;
Audio::AudioStream *_audioStream;