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

Add alGetBufferSamplesSOFT

Browse Source
This commit is contained in:
Chris Robinson 2011-03-16 12:56:39 -07:00
parent 5621ee4239
commit 575195a283
2 changed files with 113 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenAL32/Include/alMain.h
View File

@ -49,6 +49,7 @@ ALC_API void ALC_APIENTRY alcRenderSamples(ALCdevice *device, ALCvoid *buffer, A
#define AL_SOFT_buffer_samples 1
typedef void (AL_APIENTRY*LPALBUFFERSAMPLESSOFT)(ALuint,ALuint,ALenum,ALsizei,ALenum,ALenum,const ALvoid*);
typedef void (AL_APIENTRY*LPALBUFFERSUBSAMPLESSOFT)(ALuint,ALsizei,ALsizei,ALenum,ALenum,const ALvoid*);
typedef void (AL_APIENTRY*LPALGETBUFFERSAMPLESSOFT)(ALuint,ALsizei,ALsizei,ALenum,ALenum,ALvoid*);
#ifdef AL_ALEXT_PROTOTYPES
AL_API void AL_APIENTRY alBufferSamplesSOFT(ALuint buffer,
ALuint samplerate, ALenum internalformat, ALsizei frames,
@ -56,6 +57,9 @@ AL_API void AL_APIENTRY alBufferSamplesSOFT(ALuint buffer,
AL_API void AL_APIENTRY alBufferSubSamplesSOFT(ALuint buffer,
ALsizei offset, ALsizei frames,
ALenum channels, ALenum type, const ALvoid *data);
AL_API void AL_APIENTRY alGetBufferSamplesSOFT(ALuint buffer,
ALsizei offset, ALsizei frames,
ALenum channels, ALenum type, ALvoid *data);
#endif
#endif

116
OpenAL32/alBuffer.c
View File

@ -37,6 +37,8 @@
static ALenum LoadData(ALbuffer *ALBuf, ALuint freq, ALenum NewFormat, ALsizei frames, enum UserFmtChannels chans, enum UserFmtType type, const ALvoid *data, ALboolean storesrc);
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 ConvertOutput(ALvoid *dst, enum UserFmtType dstType, const ALvoid *src, enum FmtType srcType, ALsizei len);
static void ConvertOutputIMA4(ALvoid *dst, const ALvoid *src, enum FmtType srcType, ALint chans, ALsizei len);
#define LookupBuffer(m, k) ((ALbuffer*)LookupUIntMapKey(&(m), (k)))
@ -595,6 +597,71 @@ AL_API void AL_APIENTRY alBufferSubSamplesSOFT(ALuint buffer,
ProcessContext(Context);
}
AL_API void AL_APIENTRY alGetBufferSamplesSOFT(ALuint buffer,
ALsizei offset, ALsizei frames,
ALenum channels, ALenum type, ALvoid *data)
{
ALCcontext *Context;
ALCdevice *device;
ALbuffer *ALBuf;
Context = GetContextSuspended();
if(!Context) return;
if(Context->SampleSink)
{
ALintptrEXT offset;
if(Context->SampleSink->state == MAPPED)
{
alSetError(Context, AL_INVALID_OPERATION);
ProcessContext(Context);
return;
}
offset = (const ALubyte*)data - (ALubyte*)NULL;
data = Context->SampleSink->data + offset;
}
device = Context->Device;
if((ALBuf=LookupBuffer(device->BufferMap, buffer)) == NULL)
alSetError(Context, AL_INVALID_NAME);
else if(frames < 0 || offset < 0 || (frames > 0 && data == NULL))
alSetError(Context, AL_INVALID_VALUE);
else if(channels != (ALenum)ALBuf->FmtChannels ||
IsValidType(type) == AL_FALSE)
alSetError(Context, AL_INVALID_ENUM);
else
{
ALuint FrameSize = FrameSizeFromFmt(ALBuf->FmtChannels, ALBuf->FmtType);
ALuint FrameCount = ALBuf->size / FrameSize;
if((ALuint)offset > FrameCount || (ALuint)frames > FrameCount-offset)
alSetError(Context, AL_INVALID_VALUE);
else if(type == UserFmtIMA4 && (frames%65) != 0)
alSetError(Context, AL_INVALID_VALUE);
else if(type == UserFmtIMA4)
{
/* offset -> byte offset, length -> block count */
offset *= FrameSize;
frames /= 65;
ConvertOutputIMA4(data, &((ALubyte*)ALBuf->data)[offset],
ALBuf->FmtType,
ChannelsFromFmt(ALBuf->FmtChannels),
frames);
}
else
{
/* offset -> byte offset */
offset *= FrameSize;
ConvertOutput(data, type,
&((ALubyte*)ALBuf->data)[offset], ALBuf->FmtType,
frames*ChannelsFromUserFmt(channels));
}
}
ProcessContext(Context);
}
AL_API void AL_APIENTRY alBufferf(ALuint buffer, ALenum eParam, ALfloat flValue)
{
@ -1599,22 +1666,15 @@ static void ConvertInput(ALvoid *dst, enum FmtType dstType, const ALvoid *src, e
{
switch(dstType)
{
(void)Convert_ALbyte;
case FmtUByte:
Convert_ALubyte(dst, src, srcType, len);
break;
case FmtShort:
Convert_ALshort(dst, src, srcType, len);
break;
(void)Convert_ALushort;
(void)Convert_ALint;
(void)Convert_ALuint;
case FmtFloat:
Convert_ALfloat(dst, src, srcType, len);
break;
(void)Convert_ALdouble;
(void)Convert_ALmulaw;
(void)Convert_IMA4;
}
}
@ -1736,6 +1796,48 @@ static ALenum LoadData(ALbuffer *ALBuf, ALuint freq, ALenum NewFormat, ALsizei f
}
static void ConvertOutput(ALvoid *dst, enum UserFmtType dstType, const ALvoid *src, enum FmtType srcType, ALsizei len)
{
switch(dstType)
{
case UserFmtByte:
Convert_ALbyte(dst, src, srcType, len);
break;
case UserFmtUByte:
Convert_ALubyte(dst, src, srcType, len);
break;
case UserFmtShort:
Convert_ALshort(dst, src, srcType, len);
break;
case UserFmtUShort:
Convert_ALushort(dst, src, srcType, len);
break;
case UserFmtInt:
Convert_ALint(dst, src, srcType, len);
break;
case UserFmtUInt:
Convert_ALuint(dst, src, srcType, len);
break;
case UserFmtFloat:
Convert_ALfloat(dst, src, srcType, len);
break;
case UserFmtDouble:
Convert_ALdouble(dst, src, srcType, len);
break;
case UserFmtMulaw:
Convert_ALmulaw(dst, src, srcType, len);
break;
case UserFmtIMA4:
break; /* not handled here */
}
}
static void ConvertOutputIMA4(ALvoid *dst, const ALvoid *src, enum FmtType srcType, ALint chans, ALsizei len)
{
Convert_IMA4(dst, src, srcType, chans, len);
}
ALuint BytesFromUserFmt(enum UserFmtType type)
{
switch(type)