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

Automatically clean up filters and effects with their sublists

Browse Source
This commit is contained in:
Chris Robinson 2018-11-25 16:13:07 -08:00
parent 8ae07ad1ae
commit 127ec026e7
6 changed files with 54 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Alc/alc.cpp
View File

@ -2404,19 +2404,19 @@ ALCdevice_struct::~ALCdevice_struct()
BufferList.clear();
almtx_destroy(&BufferLock);
ReleaseALEffects(this);
std::for_each(EffectList.begin(), EffectList.end(),
[](EffectSubList &entry) noexcept -> void
{ al_free(entry.Effects); }
);
count = 0;
for(auto &sublist : EffectList)
count += POPCNT64(~sublist.FreeMask);
if(count > 0)
WARN(SZFMT " Effect%s not deleted\n", count, (count==1)?"":"s");
EffectList.clear();
almtx_destroy(&EffectLock);
ReleaseALFilters(this);
std::for_each(FilterList.begin(), FilterList.end(),
[](FilterSubList &entry) noexcept -> void
{ al_free(entry.Filters); }
);
count = 0;
for(auto &sublist : FilterList)
count += POPCNT64(~sublist.FreeMask);
if(count > 0)
WARN(SZFMT " Filter%s not deleted\n", count, (count==1)?"":"s");
FilterList.clear();
almtx_destroy(&FilterLock);

1
OpenAL32/Include/alEffect.h
View File

@ -199,7 +199,6 @@ inline ALboolean IsReverbEffect(ALenum type)
{ return type == AL_EFFECT_REVERB || type == AL_EFFECT_EAXREVERB; }
void InitEffect(ALeffect *effect);
void ReleaseALEffects(ALCdevice *device);
void LoadReverbPreset(const char *name, ALeffect *effect);

9
OpenAL32/Include/alFilter.h
View File

@ -4,9 +4,6 @@
#include "AL/alc.h"
#include "AL/al.h"
#ifdef __cplusplus
extern "C" {
#endif
#define LOWPASSFREQREF (5000.0f)
#define HIGHPASSFREQREF (250.0f)
@ -58,10 +55,4 @@ typedef struct ALfilter {
#define ALfilter_getParamiv(o, c, p, v) ((o)->vtab->getParamiv(o, c, p, v))
#define ALfilter_getParamfv(o, c, p, v) ((o)->vtab->getParamfv(o, c, p, v))
void ReleaseALFilters(ALCdevice *device);
#ifdef __cplusplus
}
#endif
#endif

32
OpenAL32/Include/alMain.h
View File

@ -566,15 +566,35 @@ struct BufferSubList {
{ std::swap(FreeMask, rhs.FreeMask); std::swap(Buffers, rhs.Buffers); return *this; }
};
typedef struct EffectSubList {
ALuint64 FreeMask{~ALuint64{}};
struct EffectSubList {
uint64_t FreeMask{~uint64_t{}};
struct ALeffect *Effects{nullptr}; /* 64 */
} EffectSubList;
typedef struct FilterSubList {
ALuint64 FreeMask{~ALuint64{}};
EffectSubList() noexcept = default;
EffectSubList(const EffectSubList&) = delete;
EffectSubList(EffectSubList&& rhs) noexcept : FreeMask{rhs.FreeMask}, Effects{rhs.Effects}
{ rhs.FreeMask = ~uint64_t{}; rhs.Effects = nullptr; }
~EffectSubList();
EffectSubList& operator=(const EffectSubList&) = delete;
EffectSubList& operator=(EffectSubList&& rhs) noexcept
{ std::swap(FreeMask, rhs.FreeMask); std::swap(Effects, rhs.Effects); return *this; }
};
struct FilterSubList {
uint64_t FreeMask{~uint64_t{}};
struct ALfilter *Filters{nullptr}; /* 64 */
} FilterSubList;
FilterSubList() noexcept = default;
FilterSubList(const FilterSubList&) = delete;
FilterSubList(FilterSubList&& rhs) noexcept : FreeMask{rhs.FreeMask}, Filters{rhs.Filters}
{ rhs.FreeMask = ~uint64_t{}; rhs.Filters = nullptr; }
~FilterSubList();
FilterSubList& operator=(const FilterSubList&) = delete;
FilterSubList& operator=(FilterSubList&& rhs) noexcept
{ std::swap(FreeMask, rhs.FreeMask); std::swap(Filters, rhs.Filters); return *this; }
};
typedef struct EnumeratedHrtf {

26
OpenAL32/alEffect.cpp
View File

@ -571,26 +571,18 @@ void InitEffect(ALeffect *effect)
InitEffectParams(effect, AL_EFFECT_NULL);
}
void ReleaseALEffects(ALCdevice *device)
EffectSubList::~EffectSubList()
{
size_t leftover = 0;
for(auto &sublist : device->EffectList)
ALuint64 usemask = ~FreeMask;
while(usemask)
{
ALuint64 usemask = ~sublist.FreeMask;
while(usemask)
{
ALsizei idx = CTZ64(usemask);
ALeffect *effect = sublist.Effects + idx;
effect->~ALeffect();
++leftover;
usemask &= ~(U64(1) << idx);
}
sublist.FreeMask = ~usemask;
ALsizei idx = CTZ64(usemask);
Effects[idx].~ALeffect();
usemask &= ~(U64(1) << idx);
}
if(leftover > 0)
WARN("(%p) Deleted " SZFMT " Effect%s\n", device, leftover, (leftover==1)?"":"s");
FreeMask = ~usemask;
al_free(Effects);
Effects = nullptr;
}

26
OpenAL32/alFilter.cpp
View File

@ -622,24 +622,16 @@ AL_API ALvoid AL_APIENTRY alGetFilterfv(ALuint filter, ALenum param, ALfloat *va
}
void ReleaseALFilters(ALCdevice *device)
FilterSubList::~FilterSubList()
{
size_t leftover = 0;
for(auto &sublist : device->FilterList)
ALuint64 usemask = ~FreeMask;
while(usemask)
{
ALuint64 usemask = ~sublist.FreeMask;
while(usemask)
{
ALsizei idx = CTZ64(usemask);
ALfilter *filter = sublist.Filters + idx;
filter->~ALfilter();
++leftover;
usemask &= ~(U64(1) << idx);
}
sublist.FreeMask = ~usemask;
ALsizei idx = CTZ64(usemask);
Filters[idx].~ALfilter();
usemask &= ~(U64(1) << idx);
}
if(leftover > 0)
WARN("(%p) Deleted " SZFMT " Filter%s\n", device, leftover, (leftover==1)?"":"s");
FreeMask = ~usemask;
al_free(Filters);
Filters = nullptr;
}