diff options
| author | Chris Robinson <[email protected]> | 2010-11-27 22:00:24 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2010-11-27 22:00:24 -0800 |
| commit | 754a122aa0d4cba3e9fec8d993f2d8b354f50491 (patch) | |
| tree | c70f0127a8da537a2445f888ab2751a6b8ead3a6 /OpenAL32/Include | |
| parent | 0486d633c68b3cb7e400bec3337494b5c62d979d (diff) | |
Support muLaw with LoadData
Diffstat (limited to 'OpenAL32/Include')
| -rw-r--r-- | OpenAL32/Include/alBuffer.h | 1 | ||||
| -rw-r--r-- | OpenAL32/Include/alu.h | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/OpenAL32/Include/alBuffer.h b/OpenAL32/Include/alBuffer.h index 2c67eb17..c8220a12 100644 --- a/OpenAL32/Include/alBuffer.h +++ b/OpenAL32/Include/alBuffer.h @@ -15,6 +15,7 @@ enum SrcFmtType { SrcFmtUShort, /* AL_UNSIGNED_SHORT */ SrcFmtFloat, /* AL_FLOAT */ SrcFmtDouble, /* AL_DOUBLE */ + SrcFmtMulaw, /* AL_MULAW */ }; enum SrcFmtChannels { SrcFmtMono, /* AL_MONO */ diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index c157a529..533dd9da 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -131,6 +131,14 @@ static __inline ALuint aluBytesFromFormat(ALenum format) case AL_FORMAT_STEREO_DOUBLE_EXT: return 8; + case AL_FORMAT_MONO_MULAW: + case AL_FORMAT_STEREO_MULAW: + case AL_FORMAT_QUAD_MULAW: + case AL_FORMAT_51CHN_MULAW: + case AL_FORMAT_61CHN_MULAW: + case AL_FORMAT_71CHN_MULAW: + return 1; + default: return 0; } @@ -143,12 +151,14 @@ static __inline ALuint aluChannelsFromFormat(ALenum format) case AL_FORMAT_MONO16: case AL_FORMAT_MONO_FLOAT32: case AL_FORMAT_MONO_DOUBLE_EXT: + case AL_FORMAT_MONO_MULAW: return 1; case AL_FORMAT_STEREO8: case AL_FORMAT_STEREO16: case AL_FORMAT_STEREO_FLOAT32: case AL_FORMAT_STEREO_DOUBLE_EXT: + case AL_FORMAT_STEREO_MULAW: return 2; case AL_FORMAT_QUAD8_LOKI: @@ -156,21 +166,25 @@ static __inline ALuint aluChannelsFromFormat(ALenum format) case AL_FORMAT_QUAD8: case AL_FORMAT_QUAD16: case AL_FORMAT_QUAD32: + case AL_FORMAT_QUAD_MULAW: return 4; case AL_FORMAT_51CHN8: case AL_FORMAT_51CHN16: case AL_FORMAT_51CHN32: + case AL_FORMAT_51CHN_MULAW: return 6; case AL_FORMAT_61CHN8: case AL_FORMAT_61CHN16: case AL_FORMAT_61CHN32: + case AL_FORMAT_61CHN_MULAW: return 7; case AL_FORMAT_71CHN8: case AL_FORMAT_71CHN16: case AL_FORMAT_71CHN32: + case AL_FORMAT_71CHN_MULAW: return 8; default: |