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

Pass a BufferStorage to EffectState::createBuffer

Browse Source
This commit is contained in:
Chris Robinson
2020-08-28 00:44:55 -07:00
parent 1f486f820e
commit 986a58d5b4
4 changed files with 27 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
al/auxeffectslot.cpp
+2 -6
View File
@@ -469,9 +469,7 @@ START_API_FUNC
{
FPUCtl mixer_mode{};
auto *state = slot->Effect.State.get();
slot->Effect.Buffer.reset(state->createBuffer(device, buffer->mBuffer.mData.data(),
buffer->mBuffer.mSampleRate, buffer->mBuffer.mType, buffer->mBuffer.mChannels,
buffer->mBuffer.mSampleLen));
slot->Effect.Buffer.reset(state->createBuffer(device, buffer->mBuffer));
}
}
break;
@@ -746,9 +744,7 @@ ALenum ALeffectslot::initEffect(ALeffect *effect, ALCcontext *context)
State->deviceUpdate(Device);
Effect.Buffer = nullptr;
if(Buffer)
Effect.Buffer.reset(State->createBuffer(Device, Buffer->mBuffer.mData.data(),
Buffer->mBuffer.mSampleRate, Buffer->mBuffer.mType, Buffer->mBuffer.mChannels,
Buffer->mBuffer.mSampleLen));
Effect.Buffer.reset(State->createBuffer(Device, Buffer->mBuffer));
}
if(!effect)
alc/alc.cpp
+2 -7
View File
@@ -2101,9 +2101,7 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const int *attrList)
if(ALbuffer *buffer{slot->Buffer})
{
slot->Effect.Buffer = nullptr;
slot->Effect.Buffer.reset(state->createBuffer(device, buffer->mBuffer.mData.data(),
buffer->mBuffer.mSampleRate, buffer->mBuffer.mType, buffer->mBuffer.mChannels,
buffer->mBuffer.mSampleLen));
slot->Effect.Buffer.reset(state->createBuffer(device, buffer->mBuffer));
}
slot->updateProps(context);
}
@@ -2129,10 +2127,7 @@ static ALCenum UpdateDeviceParams(ALCdevice *device, const int *attrList)
if(ALbuffer *buffer{slot->Buffer})
{
slot->Effect.Buffer = nullptr;
slot->Effect.Buffer.reset(state->createBuffer(device,
buffer->mBuffer.mData.data(), buffer->mBuffer.mSampleRate,
buffer->mBuffer.mType, buffer->mBuffer.mChannels,
buffer->mBuffer.mSampleLen));
slot->Effect.Buffer.reset(state->createBuffer(device, buffer->mBuffer));
}
slot->updateProps(context);
}
alc/effects/base.h
+3 -4
View File
@@ -8,10 +8,10 @@
#include "almalloc.h"
#include "alspan.h"
#include "atomic.h"
#include "buffer_storage.h"
#include "intrusive_ptr.h"
struct ALeffectslot;
struct BufferStorage;
union EffectProps {
@@ -173,11 +173,10 @@ struct EffectState : public al::intrusive_ref<EffectState> {
virtual void deviceUpdate(const ALCdevice *device) = 0;
/* Implementations are currently required to copy the buffer data if they
* wish to hold on to it, as there's no guarantee the buffer won't be
* detached and deleted or altered during a mix.
* deleted or altered during a mix.
*/
virtual EffectBufferBase *createBuffer(const ALCdevice */*device*/,
const al::byte */*sampleData*/, ALuint /*sampleRate*/, FmtType /*sampleType*/,
FmtChannels /*channelType*/, ALuint /*numSamples*/)
const BufferStorage &/*buffer*/)
{ return nullptr; }
virtual void update(const ALCcontext *context, const ALeffectslot *slot, const EffectProps *props, const EffectTarget target) = 0;
virtual void process(const size_t samplesToDo, const al::span<const FloatBufferLine> samplesIn, const al::span<FloatBufferLine> samplesOut) = 0;
alc/effects/convolution.cpp
+20 -18
View File
@@ -10,6 +10,7 @@
#include "alcontext.h"
#include "almalloc.h"
#include "alspan.h"
#include "buffer_storage.h"
#include "effects/base.h"
#include "fmt_traits.h"
#include "logging.h"
@@ -107,8 +108,7 @@ struct ConvolutionState final : public EffectState {
~ConvolutionState() override = default;
void deviceUpdate(const ALCdevice *device) override;
EffectBufferBase *createBuffer(const ALCdevice *device, const al::byte *sampleData,
ALuint sampleRate, FmtType sampleType, FmtChannels channelType, ALuint numSamples) override;
EffectBufferBase *createBuffer(const ALCdevice *device, const BufferStorage &buffer) override;
void update(const ALCcontext *context, const ALeffectslot *slot, const EffectProps *props, const EffectTarget target) override;
void process(const size_t samplesToDo, const al::span<const FloatBufferLine> samplesIn, const al::span<FloatBufferLine> samplesOut) override;
@@ -133,14 +133,13 @@ void ConvolutionState::deviceUpdate(const ALCdevice* /*device*/)
}
EffectBufferBase *ConvolutionState::createBuffer(const ALCdevice *device,
const al::byte *sampleData, ALuint sampleRate, FmtType sampleType,
FmtChannels channelType, ALuint numSamples)
const BufferStorage &buffer)
{
/* An empty buffer doesn't need a convolution filter. */
if(numSamples < 1) return nullptr;
if(buffer.mSampleLen < 1) return nullptr;
/* FIXME: Support anything. */
if(channelType != FmtMono && channelType != FmtStereo)
if(buffer.mChannels != FmtMono && buffer.mChannels != FmtStereo)
return nullptr;
/* The impulse response needs to have the same sample rate as the input and
@@ -149,21 +148,23 @@ EffectBufferBase *ConvolutionState::createBuffer(const ALCdevice *device,
* very infrequent called, go ahead and use the polyphase resampler.
*/
PPhaseResampler resampler;
if(device->Frequency != sampleRate)
resampler.init(sampleRate, device->Frequency);
if(device->Frequency != buffer.mSampleRate)
resampler.init(buffer.mSampleRate, device->Frequency);
const auto resampledCount = static_cast<ALuint>(
(uint64_t{numSamples}*device->Frequency + (sampleRate-1)) / sampleRate);
(uint64_t{buffer.mSampleLen}*device->Frequency + (buffer.mSampleRate-1)) /
buffer.mSampleRate);
al::intrusive_ptr<ConvolutionFilter> filter{new ConvolutionFilter{}};
auto bytesPerSample = BytesFromFmt(sampleType);
auto numChannels = ChannelsFromFmt(channelType, 1);
auto bytesPerSample = BytesFromFmt(buffer.mType);
auto numChannels = ChannelsFromFmt(buffer.mChannels, buffer.mAmbiOrder);
constexpr size_t m{ConvolveUpdateSize/2 + 1};
/* Calculate the number of segments needed to hold the impulse response and
* the input history (rounded up), and allocate them.
*/
filter->mNumConvolveSegs = (numSamples+(ConvolveUpdateSamples-1)) / ConvolveUpdateSamples;
filter->mNumConvolveSegs = (buffer.mSampleLen+(ConvolveUpdateSamples-1)) /
ConvolveUpdateSamples;
const size_t complex_length{filter->mNumConvolveSegs * m * (numChannels+1)};
filter->mComplexData = std::make_unique<complex_d[]>(complex_length);
@@ -174,17 +175,18 @@ EffectBufferBase *ConvolutionState::createBuffer(const ALCdevice *device,
for(size_t c{1};c < numChannels;++c)
filter->mConvolveFilter[c] = filter->mConvolveFilter[c-1] + filter->mNumConvolveSegs*m;
filter->mChannels = channelType;
filter->mChannels = buffer.mChannels;
auto fftbuffer = std::make_unique<std::array<complex_d,ConvolveUpdateSize>>();
auto srcsamples = std::make_unique<double[]>(maxz(numSamples, resampledCount));
auto srcsamples = std::make_unique<double[]>(maxz(buffer.mSampleLen, resampledCount));
for(size_t c{0};c < numChannels;++c)
{
/* Load the samples from the buffer, and resample to match the device. */
LoadSamples(srcsamples.get(), sampleData + bytesPerSample*c, numChannels, sampleType,
numSamples);
if(device->Frequency != sampleRate)
resampler.process(numSamples, srcsamples.get(), resampledCount, srcsamples.get());
LoadSamples(srcsamples.get(), buffer.mData.data() + bytesPerSample*c, numChannels,
buffer.mType, buffer.mSampleLen);
if(device->Frequency != buffer.mSampleRate)
resampler.process(buffer.mSampleLen, srcsamples.get(), resampledCount,
srcsamples.get());
size_t done{0};
complex_d *filteriter = filter->mConvolveFilter[c];