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

Use a vector to handle mixing buffer storage

Browse Source
This commit is contained in:
Chris Robinson 2018-11-19 06:22:09 -08:00
parent f766437569
commit f0cc34a60e
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Alc/alc.cpp
View File

@ -1704,7 +1704,6 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const ALCint *attrList)
ALCsizei hrtf_id = -1;
ALCcontext *context;
ALCuint oldFreq;
size_t size;
ALCsizei i;
int val;
@ -2002,13 +2001,14 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const ALCint *attrList)
device->ChannelDelay[i].Buffer = nullptr;
}
al_free(device->Dry.Buffer);
device->Dry.Buffer = nullptr;
device->Dry.NumChannels = 0;
device->FOAOut.Buffer = nullptr;
device->FOAOut.NumChannels = 0;
device->RealOut.Buffer = nullptr;
device->RealOut.NumChannels = 0;
device->MixBuffer.clear();
device->MixBuffer.shrink_to_fit();
UpdateClockBase(device);
device->FixedLatency = 0;
@ -2113,17 +2113,14 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const ALCint *attrList)
device->FOAOut.NumChannels, device->RealOut.NumChannels);
/* Allocate extra channels for any post-filter output. */
size = (device->Dry.NumChannels + device->FOAOut.NumChannels +
device->RealOut.NumChannels)*sizeof(device->Dry.Buffer[0]);
ALsizei num_chans{device->Dry.NumChannels + device->FOAOut.NumChannels +
device->RealOut.NumChannels};
TRACE("Allocating " SZFMT " channels, " SZFMT " bytes\n", size/sizeof(device->Dry.Buffer[0]), size);
device->Dry.Buffer = static_cast<float(*)[BUFFERSIZE]>(al_calloc(16, size));
if(!device->Dry.Buffer)
{
ERR("Failed to allocate " SZFMT " bytes for mix buffer\n", size);
return ALC_INVALID_DEVICE;
}
TRACE("Allocating %d channels, " SZFMT " bytes\n", num_chans,
num_chans*sizeof(device->MixBuffer[0]));
device->MixBuffer.resize(num_chans);
device->Dry.Buffer = &reinterpret_cast<ALfloat(&)[BUFFERSIZE]>(device->MixBuffer[0]);
if(device->RealOut.NumChannels != 0)
device->RealOut.Buffer = device->Dry.Buffer + device->Dry.NumChannels +
device->FOAOut.NumChannels;
@ -2461,14 +2458,6 @@ ALCdevice_struct::~ALCdevice_struct()
ChannelDelay[i].Length = 0;
ChannelDelay[i].Buffer = nullptr;
}
al_free(Dry.Buffer);
Dry.Buffer = nullptr;
Dry.NumChannels = 0;
FOAOut.Buffer = nullptr;
FOAOut.NumChannels = 0;
RealOut.Buffer = nullptr;
RealOut.NumChannels = 0;
}

3
OpenAL32/Include/alMain.h
View File

@ -648,6 +648,9 @@ struct ALCdevice_struct {
/* Temp storage used for mixer processing. */
alignas(16) ALfloat TempBuffer[4][BUFFERSIZE];
/* Mixing buffer used by the Dry mix, FOAOut, and Real out. */
al::vector<std::array<ALfloat,BUFFERSIZE>, 16> MixBuffer;
/* The "dry" path corresponds to the main output. */
MixParams Dry;
ALsizei NumChannelsPerOrder[MAX_AMBI_ORDER+1]{};