AerialX/openal-soft-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More buffer conversion refactoring

Browse Source
This commit is contained in:
Chris Robinson 2008-11-01 16:35:16 -07:00
parent af5a5b76ec
commit eda1e41152
1 changed files with 28 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
OpenAL32/alBuffer.c
View File

@ -309,74 +309,40 @@ ALAPI ALvoid ALAPIENTRY alBufferData(ALuint buffer,ALenum format,const ALvoid *d
padding = freq / LOWPASSFREQCUTOFF; padding = freq / LOWPASSFREQCUTOFF;
if(padding < 1) padding = 1; if(padding < 1) padding = 1;
size /= OrigBytes;
size *= 2;
// Samples are converted to 16 bit here
temp = realloc(ALBuf->data, (padding*NewChannels + size) * sizeof(ALshort));
if(temp)
{
ALBuf->data = temp;
switch(OrigBytes) switch(OrigBytes)
{ {
case 1: case 1:
size /= sizeof(ALubyte); for(i = 0;i < size;i+=4)
size *= 2;
// 8bit Samples are converted to 16 bit here
temp = realloc(ALBuf->data, (padding*NewChannels + size) * (1*sizeof(ALshort)));
if (temp)
{
ALBuf->data = temp;
for (i = 0;i < size;i+=4)
{ {
ALBuf->data[i+0] = 0; ALBuf->data[i+0] = 0;
ALBuf->data[i+1] = 0; ALBuf->data[i+1] = 0;
ALBuf->data[i+2] = (ALshort)((((ALubyte*)data)[i/2+0]-128) << 8); ALBuf->data[i+2] = (ALshort)((((ALubyte*)data)[i/2+0]-128) << 8);
ALBuf->data[i+3] = (ALshort)((((ALubyte*)data)[i/2+1]-128) << 8); ALBuf->data[i+3] = (ALshort)((((ALubyte*)data)[i/2+1]-128) << 8);
} }
memset(&(ALBuf->data[size]), 0, padding*NewChannels*2);
ALBuf->format = NewFormat;
ALBuf->eOriginalFormat = format;
ALBuf->size = size*1*sizeof(ALshort);
ALBuf->frequency = freq;
ALBuf->padding = padding;
}
else
alSetError(AL_OUT_OF_MEMORY);
break; break;
case 2: case 2:
size /= sizeof(ALshort); for(i = 0;i < size;i+=4)
size *= 2;
temp = realloc(ALBuf->data, (padding*NewChannels + size) * (1*sizeof(ALshort)));
if (temp)
{
ALBuf->data = temp;
for (i = 0;i < size;i+=4)
{ {
ALBuf->data[i+0] = 0; ALBuf->data[i+0] = 0;
ALBuf->data[i+1] = 0; ALBuf->data[i+1] = 0;
ALBuf->data[i+2] = ((ALshort*)data)[i/2+0]; ALBuf->data[i+2] = ((ALshort*)data)[i/2+0];
ALBuf->data[i+3] = ((ALshort*)data)[i/2+1]; ALBuf->data[i+3] = ((ALshort*)data)[i/2+1];
} }
memset(&(ALBuf->data[size]), 0, padding*NewChannels*2);
ALBuf->format = NewFormat;
ALBuf->eOriginalFormat = format;
ALBuf->size = size*1*sizeof(ALshort);
ALBuf->frequency = freq;
ALBuf->padding = padding;
}
else
alSetError(AL_OUT_OF_MEMORY);
break; break;
case 4: case 4:
size /= sizeof(ALfloat); for(i = 0;i < size;i+=4)
size *= 2;
temp = realloc(ALBuf->data, (padding*NewChannels + size) * (1*sizeof(ALshort)));
if (temp)
{ {
ALint smp; ALint smp;
ALBuf->data = temp;
for (i = 0;i < size;i+=4)
{
ALBuf->data[i+0] = 0; ALBuf->data[i+0] = 0;
ALBuf->data[i+1] = 0; ALBuf->data[i+1] = 0;
smp = (((ALfloat*)data)[i/2+0] * 32767.5f - 0.5); smp = (((ALfloat*)data)[i/2+0] * 32767.5f - 0.5);
@ -388,21 +354,21 @@ ALAPI ALvoid ALAPIENTRY alBufferData(ALuint buffer,ALenum format,const ALvoid *d
smp = max(smp, -32768); smp = max(smp, -32768);
ALBuf->data[i+3] = (ALshort)smp; ALBuf->data[i+3] = (ALshort)smp;
} }
memset(&(ALBuf->data[size]), 0, padding*NewChannels*2);
ALBuf->format = NewFormat;
ALBuf->eOriginalFormat = format;
ALBuf->size = size*1*sizeof(ALshort);
ALBuf->frequency = freq;
ALBuf->padding = padding;
}
else
alSetError(AL_OUT_OF_MEMORY);
break; break;
default: default:
assert(0); assert(0);
} }
memset(&(ALBuf->data[size]), 0, padding*NewChannels*sizeof(ALshort));
ALBuf->format = NewFormat;
ALBuf->eOriginalFormat = format;
ALBuf->size = size*sizeof(ALshort);
ALBuf->frequency = freq;
ALBuf->padding = padding;
}
else
alSetError(AL_OUT_OF_MEMORY);
} break; } break;
case AL_FORMAT_QUAD8_LOKI: case AL_FORMAT_QUAD8_LOKI: