aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2014-10-31 22:52:30 -0700
committerChris Robinson <[email protected]>2014-10-31 22:52:30 -0700
commit28c1ec830e4ee8d45370d5e4e7d5fb27160bca5c (patch)
treed5ffc2445078e30ebb3b8922cbb0a56781971e0f
parentdd6e622206cce4dc543bad89633531ca303d29e2 (diff)
Support AL_EXT_MULAW_BFORMAT
-rw-r--r--Alc/ALc.c4
-rw-r--r--OpenAL32/alBuffer.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/Alc/ALc.c b/Alc/ALc.c
index 7763f501..ab9a73d0 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -500,9 +500,11 @@ static const ALCenums enumeration[] = {
DECL(AL_FORMAT_BFORMAT2D_8),
DECL(AL_FORMAT_BFORMAT2D_16),
DECL(AL_FORMAT_BFORMAT2D_FLOAT32),
+ DECL(AL_FORMAT_BFORMAT2D_MULAW),
DECL(AL_FORMAT_BFORMAT3D_8),
DECL(AL_FORMAT_BFORMAT3D_16),
DECL(AL_FORMAT_BFORMAT3D_FLOAT32),
+ DECL(AL_FORMAT_BFORMAT3D_MULAW),
DECL(AL_MONO_SOFT),
DECL(AL_STEREO_SOFT),
@@ -722,7 +724,7 @@ static ALCchar *alcCaptureDefaultDeviceSpecifier;
static const ALchar alExtList[] =
"AL_EXT_ALAW AL_EXT_BFORMAT AL_EXT_DOUBLE AL_EXT_EXPONENT_DISTANCE "
"AL_EXT_FLOAT32 AL_EXT_IMA4 AL_EXT_LINEAR_DISTANCE AL_EXT_MCFORMATS "
- "AL_EXT_MULAW AL_EXT_MULAW_MCFORMATS AL_EXT_OFFSET "
+ "AL_EXT_MULAW AL_EXT_MULAW_BFORMAT AL_EXT_MULAW_MCFORMATS AL_EXT_OFFSET "
"AL_EXT_source_distance_model AL_LOKI_quadriphonic AL_SOFT_block_alignment "
"AL_SOFT_buffer_samples AL_SOFT_buffer_sub_data AL_SOFT_deferred_updates "
"AL_SOFT_direct_channels AL_SOFT_loop_points AL_SOFT_MSADPCM "
diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c
index 09471fe8..904fd61d 100644
--- a/OpenAL32/alBuffer.c
+++ b/OpenAL32/alBuffer.c
@@ -1115,10 +1115,12 @@ static ALboolean DecomposeUserFormat(ALenum format, enum UserFmtChannels *chans,
{ AL_FORMAT_BFORMAT2D_8, UserFmtBFormat2D, UserFmtUByte },
{ AL_FORMAT_BFORMAT2D_16, UserFmtBFormat2D, UserFmtShort },
{ AL_FORMAT_BFORMAT2D_FLOAT32, UserFmtBFormat2D, UserFmtFloat },
+ { AL_FORMAT_BFORMAT2D_MULAW, UserFmtBFormat2D, UserFmtMulaw },
{ AL_FORMAT_BFORMAT3D_8, UserFmtBFormat3D, UserFmtUByte },
{ AL_FORMAT_BFORMAT3D_16, UserFmtBFormat3D, UserFmtShort },
{ AL_FORMAT_BFORMAT3D_FLOAT32, UserFmtBFormat3D, UserFmtFloat },
+ { AL_FORMAT_BFORMAT3D_MULAW, UserFmtBFormat3D, UserFmtMulaw },
};
ALuint i;