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

Use std::array for the voice's PrevSamples

Browse Source
This commit is contained in:
Chris Robinson
2018-11-30 21:23:43 -08:00
parent c7569c31ad
commit 1e6e84374b
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/alc.cpp
+2 -1
View File
@@ -2835,7 +2835,8 @@ void AllocateVoices(ALCcontext *context, ALsizei num_voices, ALsizei old_sends)
voice->Offset = old_voice->Offset;
memcpy(voice->PrevSamples, old_voice->PrevSamples, sizeof(voice->PrevSamples));
std::copy(std::begin(old_voice->PrevSamples), std::end(old_voice->PrevSamples),
std::begin(voice->PrevSamples));
voice->ResampleState = old_voice->ResampleState;
Alc/mixvoice.cpp
+6 -5
View File
@@ -356,13 +356,14 @@ ALboolean MixSource(ALvoice *voice, ALuint SourceID, ALCcontext *Context, ALsize
for(ALsizei chan{0};chan < NumChannels;chan++)
{
ALfloat *SrcData{Device->TempBuffer[SOURCE_DATA_BUF]};
ALfloat (&SrcData)[BUFFERSIZE] = Device->TempBuffer[SOURCE_DATA_BUF];
/* Load the previous samples into the source data first, and clear the rest. */
std::copy_n(voice->PrevSamples[chan], MAX_RESAMPLE_PADDING, SrcData);
std::fill_n(SrcData+MAX_RESAMPLE_PADDING, BUFFERSIZE-MAX_RESAMPLE_PADDING, 0.0f);
ALsizei FilledAmt{MAX_RESAMPLE_PADDING};
auto srciter = std::copy(std::begin(voice->PrevSamples[chan]),
std::end(voice->PrevSamples[chan]), std::begin(SrcData));
std::fill(srciter, std::end(SrcData), 0.0f);
auto FilledAmt = static_cast<ALsizei>(voice->PrevSamples[chan].size());
if(isstatic)
{
/* TODO: For static sources, loop points are taken from the
@@ -501,7 +502,7 @@ ALboolean MixSource(ALvoice *voice, ALuint SourceID, ALCcontext *Context, ALsize
/* Store the last source samples used for next time. */
std::copy_n(&SrcData[(increment*DstBufferSize + DataPosFrac)>>FRACTIONBITS],
MAX_RESAMPLE_PADDING, voice->PrevSamples[chan]);
voice->PrevSamples[chan].size(), std::begin(voice->PrevSamples[chan]));
/* Now resample, then filter and mix to the appropriate outputs. */
const ALfloat *ResampledData{Resample(&voice->ResampleState,
OpenAL32/Include/alu.h
+1 -1
View File
@@ -244,7 +244,7 @@ struct ALvoice {
ALuint Offset; /* Number of output samples mixed since starting. */
alignas(16) ALfloat PrevSamples[MAX_INPUT_CHANNELS][MAX_RESAMPLE_PADDING];
alignas(16) std::array<std::array<ALfloat,MAX_RESAMPLE_PADDING>,MAX_INPUT_CHANNELS> PrevSamples;
InterpState ResampleState;