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

Don't assume 16-bit samples

Browse Source
This commit is contained in:
Chris Robinson 2009-10-21 13:50:53 -07:00
parent 4e399b41cd
commit 47b8510b0c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Alc/ALu.c
View File

@ -857,7 +857,7 @@ another_source:
ALuint DataPosFrac = 0;
ALuint Buffer;
ALbuffer *ALBuffer;
ALuint Channels;
ALuint Channels, Bytes;
ALuint BufferSize;
ALfloat Pitch;
@ -868,8 +868,9 @@ another_source:
Data = ALBuffer->data;
Channels = aluChannelsFromFormat(ALBuffer->format);
Bytes = aluBytesFromFormat(ALBuffer->format);
DataSize = ALBuffer->size;
DataSize /= Channels * aluBytesFromFormat(ALBuffer->format);
DataSize /= Channels * Bytes;
DataPosInt = ALSource->position;
DataPosFrac = ALSource->position_fraction;
@ -957,7 +958,7 @@ another_source:
NextBuf = (ALbuffer*)ALTHUNK_LOOKUPENTRY(BufferListItem->next->buffer);
if(NextBuf && NextBuf->data)
{
ulExtraSamples = min(NextBuf->size, (ALint)(ALBuffer->padding*Channels*2));
ulExtraSamples = min(NextBuf->size, (ALint)(ALBuffer->padding*Channels*Bytes));
memcpy(&Data[DataSize*Channels], NextBuf->data, ulExtraSamples);
}
}
@ -966,12 +967,12 @@ another_source:
NextBuf = (ALbuffer*)ALTHUNK_LOOKUPENTRY(ALSource->queue->buffer);
if(NextBuf && NextBuf->data)
{
ulExtraSamples = min(NextBuf->size, (ALint)(ALBuffer->padding*Channels*2));
ulExtraSamples = min(NextBuf->size, (ALint)(ALBuffer->padding*Channels*Bytes));
memcpy(&Data[DataSize*Channels], NextBuf->data, ulExtraSamples);
}
}
else
memset(&Data[DataSize*Channels], 0, (ALBuffer->padding*Channels*2));
memset(&Data[DataSize*Channels], 0, (ALBuffer->padding*Channels*Bytes));
}
BufferSize = min(BufferSize, (SamplesToDo-j));