AuroraMiddleware/AuroraOpenALSoft
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pass the number of compressed frames to LoadData

Browse Source
This commit is contained in:
Chris Robinson 2011-03-16 10:00:24 -07:00
parent 4a1c0fedca
commit 9cee723e92
1 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
OpenAL32/alBuffer.c
View File

@ -34,7 +34,7 @@
#include "alThunk.h" #include "alThunk.h"
static ALenum LoadData(ALbuffer *ALBuf, ALuint freq, ALenum NewFormat, ALsizei size, enum UserFmtChannels chans, enum UserFmtType type, const ALvoid *data); static ALenum LoadData(ALbuffer *ALBuf, ALuint freq, ALenum NewFormat, ALsizei frames, enum UserFmtChannels chans, enum UserFmtType type, const ALvoid *data);
static void ConvertInput(ALvoid *dst, enum FmtType dstType, const ALvoid *src, enum UserFmtType srcType, ALsizei len); static void ConvertInput(ALvoid *dst, enum FmtType dstType, const ALvoid *src, enum UserFmtType srcType, ALsizei len);
static void ConvertInputIMA4(ALvoid *dst, enum FmtType dstType, const ALvoid *src, ALint chans, ALsizei len); static void ConvertInputIMA4(ALvoid *dst, enum FmtType dstType, const ALvoid *src, ALint chans, ALsizei len);
@ -325,13 +325,19 @@ AL_API ALvoid AL_APIENTRY alBufferData(ALuint buffer,ALenum format,const ALvoid
case UserFmtUShort: case UserFmtUShort:
case UserFmtInt: case UserFmtInt:
case UserFmtUInt: case UserFmtUInt:
case UserFmtFloat: case UserFmtFloat: {
err = LoadData(ALBuf, freq, format, size, SrcChannels, SrcType, data); ALuint FrameSize = FrameSizeFromUserFmt(SrcChannels, SrcType);
if((size%FrameSize) != 0)
err = AL_INVALID_VALUE;
else
err = LoadData(ALBuf, freq, format, size/FrameSize,
SrcChannels, SrcType, data);
if(err != AL_NO_ERROR) if(err != AL_NO_ERROR)
alSetError(Context, err); alSetError(Context, err);
break; } break;
case UserFmtDouble: { case UserFmtDouble: {
ALuint FrameSize = FrameSizeFromUserFmt(SrcChannels, SrcType);
ALenum NewFormat = AL_FORMAT_MONO_FLOAT32; ALenum NewFormat = AL_FORMAT_MONO_FLOAT32;
switch(SrcChannels) switch(SrcChannels)
{ {
@ -343,13 +349,24 @@ AL_API ALvoid AL_APIENTRY alBufferData(ALuint buffer,ALenum format,const ALvoid
case UserFmtX61: NewFormat = AL_FORMAT_61CHN32; break; case UserFmtX61: NewFormat = AL_FORMAT_61CHN32; break;
case UserFmtX71: NewFormat = AL_FORMAT_71CHN32; break; case UserFmtX71: NewFormat = AL_FORMAT_71CHN32; break;
} }
err = LoadData(ALBuf, freq, NewFormat, size, SrcChannels, SrcType, data); if((size%FrameSize) != 0)
err = AL_INVALID_VALUE;
else
err = LoadData(ALBuf, freq, NewFormat, size/FrameSize,
SrcChannels, SrcType, data);
if(err != AL_NO_ERROR) if(err != AL_NO_ERROR)
alSetError(Context, err); alSetError(Context, err);
} break; } break;
case UserFmtMulaw: case UserFmtMulaw:
case UserFmtIMA4: { case UserFmtIMA4: {
/* Here is where things vary:
* nVidia and Apple use 64+1 sample frames per block -> block_size=36 bytes per channel
* Most PC sound software uses 2040+1 sample frames per block -> block_size=1024 bytes per channel
*/
ALuint FrameSize = (SrcType == UserFmtIMA4) ?
(ChannelsFromUserFmt(SrcChannels) * 36) :
FrameSizeFromUserFmt(SrcChannels, SrcType);
ALenum NewFormat = AL_FORMAT_MONO16; ALenum NewFormat = AL_FORMAT_MONO16;
switch(SrcChannels) switch(SrcChannels)
{ {
@ -361,7 +378,11 @@ AL_API ALvoid AL_APIENTRY alBufferData(ALuint buffer,ALenum format,const ALvoid
case UserFmtX61: NewFormat = AL_FORMAT_61CHN16; break; case UserFmtX61: NewFormat = AL_FORMAT_61CHN16; break;
case UserFmtX71: NewFormat = AL_FORMAT_71CHN16; break; case UserFmtX71: NewFormat = AL_FORMAT_71CHN16; break;
} }
err = LoadData(ALBuf, freq, NewFormat, size, SrcChannels, SrcType, data); if((size%FrameSize) != 0)
err = AL_INVALID_VALUE;
else
err = LoadData(ALBuf, freq, NewFormat, size/FrameSize,
SrcChannels, SrcType, data);
if(err != AL_NO_ERROR) if(err != AL_NO_ERROR)
alSetError(Context, err); alSetError(Context, err);
} break; } break;
@ -1502,7 +1523,7 @@ static void ConvertInputIMA4(ALvoid *dst, enum FmtType dstType, const ALvoid *sr
* Currently, the new format must have the same channel configuration as the * Currently, the new format must have the same channel configuration as the
* original format. * original format.
*/ */
static ALenum LoadData(ALbuffer *ALBuf, ALuint freq, ALenum NewFormat, ALsizei size, enum UserFmtChannels SrcChannels, enum UserFmtType SrcType, const ALvoid *data) static ALenum LoadData(ALbuffer *ALBuf, ALuint freq, ALenum NewFormat, ALsizei frames, enum UserFmtChannels SrcChannels, enum UserFmtType SrcType, const ALvoid *data)
{ {
ALuint NewChannels, NewBytes; ALuint NewChannels, NewBytes;
enum FmtChannels DstChannels; enum FmtChannels DstChannels;
@ -1520,16 +1541,10 @@ static ALenum LoadData(ALbuffer *ALBuf, ALuint freq, ALenum NewFormat, ALsizei s
{ {
ALuint OrigChannels = ChannelsFromUserFmt(SrcChannels); ALuint OrigChannels = ChannelsFromUserFmt(SrcChannels);
/* Here is where things vary: newsize = frames;
* nVidia and Apple use 64+1 sample frames per block -> block_size=36 bytes per channel
* Most PC sound software uses 2040+1 sample frames per block -> block_size=1024 bytes per channel
*/
if((size%(36*OrigChannels)) != 0)
return AL_INVALID_VALUE;
newsize = size / 36;
newsize *= 65; newsize *= 65;
newsize *= NewBytes; newsize *= NewBytes;
newsize *= NewChannels;
if(newsize > INT_MAX) if(newsize > INT_MAX)
return AL_OUT_OF_MEMORY; return AL_OUT_OF_MEMORY;
@ -1544,7 +1559,7 @@ static ALenum LoadData(ALbuffer *ALBuf, ALuint freq, ALenum NewFormat, ALsizei s
ALBuf->OriginalChannels = SrcChannels; ALBuf->OriginalChannels = SrcChannels;
ALBuf->OriginalType = SrcType; ALBuf->OriginalType = SrcType;
ALBuf->OriginalSize = size; ALBuf->OriginalSize = frames * 36 * OrigChannels;
ALBuf->OriginalAlign = 36 * OrigChannels; ALBuf->OriginalAlign = 36 * OrigChannels;
} }
else else
@ -1552,11 +1567,9 @@ static ALenum LoadData(ALbuffer *ALBuf, ALuint freq, ALenum NewFormat, ALsizei s
ALuint OrigBytes = BytesFromUserFmt(SrcType); ALuint OrigBytes = BytesFromUserFmt(SrcType);
ALuint OrigChannels = ChannelsFromUserFmt(SrcChannels); ALuint OrigChannels = ChannelsFromUserFmt(SrcChannels);
if((size%(OrigBytes*OrigChannels)) != 0) newsize = frames;
return AL_INVALID_VALUE;
newsize = size / OrigBytes;
newsize *= NewBytes; newsize *= NewBytes;
newsize *= NewChannels;
if(newsize > INT_MAX) if(newsize > INT_MAX)
return AL_OUT_OF_MEMORY; return AL_OUT_OF_MEMORY;
@ -1570,7 +1583,7 @@ static ALenum LoadData(ALbuffer *ALBuf, ALuint freq, ALenum NewFormat, ALsizei s
ALBuf->OriginalChannels = SrcChannels; ALBuf->OriginalChannels = SrcChannels;
ALBuf->OriginalType = SrcType; ALBuf->OriginalType = SrcType;
ALBuf->OriginalSize = size; ALBuf->OriginalSize = frames * OrigBytes * OrigChannels;
ALBuf->OriginalAlign = OrigBytes * OrigChannels; ALBuf->OriginalAlign = OrigBytes * OrigChannels;
} }