aboutsummaryrefslogtreecommitdiffstats
path: root/alc
diff options
context:
space:
mode:
Diffstat (limited to 'alc')
-rw-r--r--alc/backends/coreaudio.cpp2
-rw-r--r--alc/backends/wasapi.cpp2
-rw-r--r--alc/converter.cpp371
-rw-r--r--alc/converter.h59
-rw-r--r--alc/uiddefs.cpp37
5 files changed, 2 insertions, 469 deletions
diff --git a/alc/backends/coreaudio.cpp b/alc/backends/coreaudio.cpp
index 43c78063..0dd8e766 100644
--- a/alc/backends/coreaudio.cpp
+++ b/alc/backends/coreaudio.cpp
@@ -32,7 +32,7 @@
#include "alcmain.h"
#include "alu.h"
#include "ringbuffer.h"
-#include "converter.h"
+#include "core/converter.h"
#include "core/logging.h"
#include "backends/base.h"
diff --git a/alc/backends/wasapi.cpp b/alc/backends/wasapi.cpp
index 4df64e73..76c6d009 100644
--- a/alc/backends/wasapi.cpp
+++ b/alc/backends/wasapi.cpp
@@ -59,7 +59,7 @@
#include "alcmain.h"
#include "alu.h"
#include "comptr.h"
-#include "converter.h"
+#include "core/converter.h"
#include "core/helpers.h"
#include "core/logging.h"
#include "ringbuffer.h"
diff --git a/alc/converter.cpp b/alc/converter.cpp
deleted file mode 100644
index f7d4fc46..00000000
--- a/alc/converter.cpp
+++ /dev/null
@@ -1,371 +0,0 @@
-
-#include "config.h"
-
-#include "converter.h"
-
-#include <algorithm>
-#include <cmath>
-#include <cstdint>
-#include <iterator>
-#include <limits.h>
-
-#include "albit.h"
-#include "albyte.h"
-#include "alnumeric.h"
-#include "core/fpu_ctrl.h"
-
-struct CTag;
-struct CopyTag;
-
-
-namespace {
-
-constexpr uint MaxPitch{10};
-
-static_assert((BufferLineSize-1)/MaxPitch > 0, "MaxPitch is too large for BufferLineSize!");
-static_assert((INT_MAX>>MixerFracBits)/MaxPitch > BufferLineSize,
- "MaxPitch and/or BufferLineSize are too large for MixerFracBits!");
-
-/* Base template left undefined. Should be marked =delete, but Clang 3.8.1
- * chokes on that given the inline specializations.
- */
-template<DevFmtType T>
-inline float LoadSample(DevFmtType_t<T> val) noexcept;
-
-template<> inline float LoadSample<DevFmtByte>(DevFmtType_t<DevFmtByte> val) noexcept
-{ return val * (1.0f/128.0f); }
-template<> inline float LoadSample<DevFmtShort>(DevFmtType_t<DevFmtShort> val) noexcept
-{ return val * (1.0f/32768.0f); }
-template<> inline float LoadSample<DevFmtInt>(DevFmtType_t<DevFmtInt> val) noexcept
-{ return static_cast<float>(val) * (1.0f/2147483648.0f); }
-template<> inline float LoadSample<DevFmtFloat>(DevFmtType_t<DevFmtFloat> val) noexcept
-{ return val; }
-
-template<> inline float LoadSample<DevFmtUByte>(DevFmtType_t<DevFmtUByte> val) noexcept
-{ return LoadSample<DevFmtByte>(static_cast<int8_t>(val - 128)); }
-template<> inline float LoadSample<DevFmtUShort>(DevFmtType_t<DevFmtUShort> val) noexcept
-{ return LoadSample<DevFmtShort>(static_cast<int16_t>(val - 32768)); }
-template<> inline float LoadSample<DevFmtUInt>(DevFmtType_t<DevFmtUInt> val) noexcept
-{ return LoadSample<DevFmtInt>(static_cast<int32_t>(val - 2147483648u)); }
-
-
-template<DevFmtType T>
-inline void LoadSampleArray(float *RESTRICT dst, const void *src, const size_t srcstep,
- const size_t samples) noexcept
-{
- const DevFmtType_t<T> *ssrc = static_cast<const DevFmtType_t<T>*>(src);
- for(size_t i{0u};i < samples;i++)
- dst[i] = LoadSample<T>(ssrc[i*srcstep]);
-}
-
-void LoadSamples(float *dst, const void *src, const size_t srcstep, const DevFmtType srctype,
- const size_t samples) noexcept
-{
-#define HANDLE_FMT(T) \
- case T: LoadSampleArray<T>(dst, src, srcstep, samples); break
- switch(srctype)
- {
- HANDLE_FMT(DevFmtByte);
- HANDLE_FMT(DevFmtUByte);
- HANDLE_FMT(DevFmtShort);
- HANDLE_FMT(DevFmtUShort);
- HANDLE_FMT(DevFmtInt);
- HANDLE_FMT(DevFmtUInt);
- HANDLE_FMT(DevFmtFloat);
- }
-#undef HANDLE_FMT
-}
-
-
-template<DevFmtType T>
-inline DevFmtType_t<T> StoreSample(float) noexcept;
-
-template<> inline float StoreSample<DevFmtFloat>(float val) noexcept
-{ return val; }
-template<> inline int32_t StoreSample<DevFmtInt>(float val) noexcept
-{ return fastf2i(clampf(val*2147483648.0f, -2147483648.0f, 2147483520.0f)); }
-template<> inline int16_t StoreSample<DevFmtShort>(float val) noexcept
-{ return static_cast<int16_t>(fastf2i(clampf(val*32768.0f, -32768.0f, 32767.0f))); }
-template<> inline int8_t StoreSample<DevFmtByte>(float val) noexcept
-{ return static_cast<int8_t>(fastf2i(clampf(val*128.0f, -128.0f, 127.0f))); }
-
-/* Define unsigned output variations. */
-template<> inline uint32_t StoreSample<DevFmtUInt>(float val) noexcept
-{ return static_cast<uint32_t>(StoreSample<DevFmtInt>(val)) + 2147483648u; }
-template<> inline uint16_t StoreSample<DevFmtUShort>(float val) noexcept
-{ return static_cast<uint16_t>(StoreSample<DevFmtShort>(val) + 32768); }
-template<> inline uint8_t StoreSample<DevFmtUByte>(float val) noexcept
-{ return static_cast<uint8_t>(StoreSample<DevFmtByte>(val) + 128); }
-
-template<DevFmtType T>
-inline void StoreSampleArray(void *dst, const float *RESTRICT src, const size_t dststep,
- const size_t samples) noexcept
-{
- DevFmtType_t<T> *sdst = static_cast<DevFmtType_t<T>*>(dst);
- for(size_t i{0u};i < samples;i++)
- sdst[i*dststep] = StoreSample<T>(src[i]);
-}
-
-
-void StoreSamples(void *dst, const float *src, const size_t dststep, const DevFmtType dsttype,
- const size_t samples) noexcept
-{
-#define HANDLE_FMT(T) \
- case T: StoreSampleArray<T>(dst, src, dststep, samples); break
- switch(dsttype)
- {
- HANDLE_FMT(DevFmtByte);
- HANDLE_FMT(DevFmtUByte);
- HANDLE_FMT(DevFmtShort);
- HANDLE_FMT(DevFmtUShort);
- HANDLE_FMT(DevFmtInt);
- HANDLE_FMT(DevFmtUInt);
- HANDLE_FMT(DevFmtFloat);
- }
-#undef HANDLE_FMT
-}
-
-
-template<DevFmtType T>
-void Mono2Stereo(float *RESTRICT dst, const void *src, const size_t frames) noexcept
-{
- const DevFmtType_t<T> *ssrc = static_cast<const DevFmtType_t<T>*>(src);
- for(size_t i{0u};i < frames;i++)
- dst[i*2 + 1] = dst[i*2 + 0] = LoadSample<T>(ssrc[i]) * 0.707106781187f;
-}
-
-template<DevFmtType T>
-void Multi2Mono(uint chanmask, const size_t step, const float scale, float *RESTRICT dst,
- const void *src, const size_t frames) noexcept
-{
- const DevFmtType_t<T> *ssrc = static_cast<const DevFmtType_t<T>*>(src);
- std::fill_n(dst, frames, 0.0f);
- for(size_t c{0};chanmask;++c)
- {
- if LIKELY((chanmask&1))
- {
- for(size_t i{0u};i < frames;i++)
- dst[i] += LoadSample<T>(ssrc[i*step + c]);
- }
- chanmask >>= 1;
- }
- for(size_t i{0u};i < frames;i++)
- dst[i] *= scale;
-}
-
-} // namespace
-
-SampleConverterPtr CreateSampleConverter(DevFmtType srcType, DevFmtType dstType, size_t numchans,
- uint srcRate, uint dstRate, Resampler resampler)
-{
- if(numchans < 1 || srcRate < 1 || dstRate < 1)
- return nullptr;
-
- SampleConverterPtr converter{new(FamCount(numchans)) SampleConverter{numchans}};
- converter->mSrcType = srcType;
- converter->mDstType = dstType;
- converter->mSrcTypeSize = BytesFromDevFmt(srcType);
- converter->mDstTypeSize = BytesFromDevFmt(dstType);
-
- converter->mSrcPrepCount = 0;
- converter->mFracOffset = 0;
-
- /* Have to set the mixer FPU mode since that's what the resampler code expects. */
- FPUCtl mixer_mode{};
- auto step = static_cast<uint>(
- mind(srcRate*double{MixerFracOne}/dstRate + 0.5, MaxPitch*MixerFracOne));
- converter->mIncrement = maxu(step, 1);
- if(converter->mIncrement == MixerFracOne)
- converter->mResample = Resample_<CopyTag,CTag>;
- else
- converter->mResample = PrepareResampler(resampler, converter->mIncrement,
- &converter->mState);
-
- return converter;
-}
-
-uint SampleConverter::availableOut(uint srcframes) const
-{
- int prepcount{mSrcPrepCount};
- if(prepcount < 0)
- {
- /* Negative prepcount means we need to skip that many input samples. */
- if(static_cast<uint>(-prepcount) >= srcframes)
- return 0;
- srcframes -= static_cast<uint>(-prepcount);
- prepcount = 0;
- }
-
- if(srcframes < 1)
- {
- /* No output samples if there's no input samples. */
- return 0;
- }
-
- if(prepcount < MaxResamplerPadding
- && static_cast<uint>(MaxResamplerPadding - prepcount) >= srcframes)
- {
- /* Not enough input samples to generate an output sample. */
- return 0;
- }
-
- auto DataSize64 = static_cast<uint64_t>(prepcount);
- DataSize64 += srcframes;
- DataSize64 -= MaxResamplerPadding;
- DataSize64 <<= MixerFracBits;
- DataSize64 -= mFracOffset;
-
- /* If we have a full prep, we can generate at least one sample. */
- return static_cast<uint>(clampu64((DataSize64 + mIncrement-1)/mIncrement, 1,
- std::numeric_limits<int>::max()));
-}
-
-uint SampleConverter::convert(const void **src, uint *srcframes, void *dst, uint dstframes)
-{
- const uint SrcFrameSize{static_cast<uint>(mChan.size()) * mSrcTypeSize};
- const uint DstFrameSize{static_cast<uint>(mChan.size()) * mDstTypeSize};
- const uint increment{mIncrement};
- auto SamplesIn = static_cast<const al::byte*>(*src);
- uint NumSrcSamples{*srcframes};
-
- FPUCtl mixer_mode{};
- uint pos{0};
- while(pos < dstframes && NumSrcSamples > 0)
- {
- int prepcount{mSrcPrepCount};
- if(prepcount < 0)
- {
- /* Negative prepcount means we need to skip that many input samples. */
- if(static_cast<uint>(-prepcount) >= NumSrcSamples)
- {
- mSrcPrepCount = static_cast<int>(NumSrcSamples) + prepcount;
- NumSrcSamples = 0;
- break;
- }
- SamplesIn += SrcFrameSize*static_cast<uint>(-prepcount);
- NumSrcSamples -= static_cast<uint>(-prepcount);
- mSrcPrepCount = 0;
- continue;
- }
- const uint toread{minu(NumSrcSamples, BufferLineSize - MaxResamplerPadding)};
-
- if(prepcount < MaxResamplerPadding
- && static_cast<uint>(MaxResamplerPadding - prepcount) >= toread)
- {
- /* Not enough input samples to generate an output sample. Store
- * what we're given for later.
- */
- for(size_t chan{0u};chan < mChan.size();chan++)
- LoadSamples(&mChan[chan].PrevSamples[prepcount], SamplesIn + mSrcTypeSize*chan,
- mChan.size(), mSrcType, toread);
-
- mSrcPrepCount = prepcount + static_cast<int>(toread);
- NumSrcSamples = 0;
- break;
- }
-
- float *RESTRICT SrcData{mSrcSamples};
- float *RESTRICT DstData{mDstSamples};
- uint DataPosFrac{mFracOffset};
- auto DataSize64 = static_cast<uint64_t>(prepcount);
- DataSize64 += toread;
- DataSize64 -= MaxResamplerPadding;
- DataSize64 <<= MixerFracBits;
- DataSize64 -= DataPosFrac;
-
- /* If we have a full prep, we can generate at least one sample. */
- auto DstSize = static_cast<uint>(
- clampu64((DataSize64 + increment-1)/increment, 1, BufferLineSize));
- DstSize = minu(DstSize, dstframes-pos);
-
- for(size_t chan{0u};chan < mChan.size();chan++)
- {
- const al::byte *SrcSamples{SamplesIn + mSrcTypeSize*chan};
- al::byte *DstSamples = static_cast<al::byte*>(dst) + mDstTypeSize*chan;
-
- /* Load the previous samples into the source data first, then the
- * new samples from the input buffer.
- */
- std::copy_n(mChan[chan].PrevSamples, prepcount, SrcData);
- LoadSamples(SrcData + prepcount, SrcSamples, mChan.size(), mSrcType, toread);
-
- /* Store as many prep samples for next time as possible, given the
- * number of output samples being generated.
- */
- uint SrcDataEnd{(DstSize*increment + DataPosFrac)>>MixerFracBits};
- if(SrcDataEnd >= static_cast<uint>(prepcount)+toread)
- std::fill(std::begin(mChan[chan].PrevSamples),
- std::end(mChan[chan].PrevSamples), 0.0f);
- else
- {
- const size_t len{minz(al::size(mChan[chan].PrevSamples),
- static_cast<uint>(prepcount)+toread-SrcDataEnd)};
- std::copy_n(SrcData+SrcDataEnd, len, mChan[chan].PrevSamples);
- std::fill(std::begin(mChan[chan].PrevSamples)+len,
- std::end(mChan[chan].PrevSamples), 0.0f);
- }
-
- /* Now resample, and store the result in the output buffer. */
- const float *ResampledData{mResample(&mState, SrcData+(MaxResamplerPadding>>1),
- DataPosFrac, increment, {DstData, DstSize})};
-
- StoreSamples(DstSamples, ResampledData, mChan.size(), mDstType, DstSize);
- }
-
- /* Update the number of prep samples still available, as well as the
- * fractional offset.
- */
- DataPosFrac += increment*DstSize;
- mSrcPrepCount = mini(prepcount + static_cast<int>(toread - (DataPosFrac>>MixerFracBits)),
- MaxResamplerPadding);
- mFracOffset = DataPosFrac & MixerFracMask;
-
- /* Update the src and dst pointers in case there's still more to do. */
- SamplesIn += SrcFrameSize*(DataPosFrac>>MixerFracBits);
- NumSrcSamples -= minu(NumSrcSamples, (DataPosFrac>>MixerFracBits));
-
- dst = static_cast<al::byte*>(dst) + DstFrameSize*DstSize;
- pos += DstSize;
- }
-
- *src = SamplesIn;
- *srcframes = NumSrcSamples;
-
- return pos;
-}
-
-
-void ChannelConverter::convert(const void *src, float *dst, uint frames) const
-{
- if(mDstChans == DevFmtMono)
- {
- const float scale{std::sqrt(1.0f / static_cast<float>(al::popcount(mChanMask)))};
- switch(mSrcType)
- {
-#define HANDLE_FMT(T) case T: Multi2Mono<T>(mChanMask, mSrcStep, scale, dst, src, frames); break
- HANDLE_FMT(DevFmtByte);
- HANDLE_FMT(DevFmtUByte);
- HANDLE_FMT(DevFmtShort);
- HANDLE_FMT(DevFmtUShort);
- HANDLE_FMT(DevFmtInt);
- HANDLE_FMT(DevFmtUInt);
- HANDLE_FMT(DevFmtFloat);
-#undef HANDLE_FMT
- }
- }
- else if(mChanMask == 0x1 && mDstChans == DevFmtStereo)
- {
- switch(mSrcType)
- {
-#define HANDLE_FMT(T) case T: Mono2Stereo<T>(dst, src, frames); break
- HANDLE_FMT(DevFmtByte);
- HANDLE_FMT(DevFmtUByte);
- HANDLE_FMT(DevFmtShort);
- HANDLE_FMT(DevFmtUShort);
- HANDLE_FMT(DevFmtInt);
- HANDLE_FMT(DevFmtUInt);
- HANDLE_FMT(DevFmtFloat);
-#undef HANDLE_FMT
- }
- }
-}
diff --git a/alc/converter.h b/alc/converter.h
deleted file mode 100644
index ffcfbc18..00000000
--- a/alc/converter.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef CONVERTER_H
-#define CONVERTER_H
-
-#include <cstddef>
-#include <memory>
-
-#include "almalloc.h"
-#include "core/devformat.h"
-#include "core/mixer/defs.h"
-
-using uint = unsigned int;
-
-
-struct SampleConverter {
- DevFmtType mSrcType{};
- DevFmtType mDstType{};
- uint mSrcTypeSize{};
- uint mDstTypeSize{};
-
- int mSrcPrepCount{};
-
- uint mFracOffset{};
- uint mIncrement{};
- InterpState mState{};
- ResamplerFunc mResample{};
-
- alignas(16) float mSrcSamples[BufferLineSize]{};
- alignas(16) float mDstSamples[BufferLineSize]{};
-
- struct ChanSamples {
- alignas(16) float PrevSamples[MaxResamplerPadding];
- };
- al::FlexArray<ChanSamples> mChan;
-
- SampleConverter(size_t numchans) : mChan{numchans} { }
-
- uint convert(const void **src, uint *srcframes, void *dst, uint dstframes);
- uint availableOut(uint srcframes) const;
-
- DEF_FAM_NEWDEL(SampleConverter, mChan)
-};
-using SampleConverterPtr = std::unique_ptr<SampleConverter>;
-
-SampleConverterPtr CreateSampleConverter(DevFmtType srcType, DevFmtType dstType, size_t numchans,
- uint srcRate, uint dstRate, Resampler resampler);
-
-
-struct ChannelConverter {
- DevFmtType mSrcType{};
- uint mSrcStep{};
- uint mChanMask{};
- DevFmtChannels mDstChans{};
-
- bool is_active() const noexcept { return mChanMask != 0; }
-
- void convert(const void *src, float *dst, uint frames) const;
-};
-
-#endif /* CONVERTER_H */
diff --git a/alc/uiddefs.cpp b/alc/uiddefs.cpp
deleted file mode 100644
index 244c01a5..00000000
--- a/alc/uiddefs.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-
-#include "config.h"
-
-
-#ifndef AL_NO_UID_DEFS
-
-#if defined(HAVE_GUIDDEF_H) || defined(HAVE_INITGUID_H)
-#define INITGUID
-#include <windows.h>
-#ifdef HAVE_GUIDDEF_H
-#include <guiddef.h>
-#else
-#include <initguid.h>
-#endif
-
-DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80,0x00, 0x00,0xaa,0x00,0x38,0x9b,0x71);
-DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80,0x00, 0x00,0xaa,0x00,0x38,0x9b,0x71);
-
-DEFINE_GUID(IID_IDirectSoundNotify, 0xb0210783, 0x89cd, 0x11d0, 0xaf,0x08, 0x00,0xa0,0xc9,0x25,0xcd,0x16);
-
-DEFINE_GUID(CLSID_MMDeviceEnumerator, 0xbcde0395, 0xe52f, 0x467c, 0x8e,0x3d, 0xc4,0x57,0x92,0x91,0x69,0x2e);
-DEFINE_GUID(IID_IMMDeviceEnumerator, 0xa95664d2, 0x9614, 0x4f35, 0xa7,0x46, 0xde,0x8d,0xb6,0x36,0x17,0xe6);
-DEFINE_GUID(IID_IAudioClient, 0x1cb9ad4c, 0xdbfa, 0x4c32, 0xb1,0x78, 0xc2,0xf5,0x68,0xa7,0x03,0xb2);
-DEFINE_GUID(IID_IAudioRenderClient, 0xf294acfc, 0x3146, 0x4483, 0xa7,0xbf, 0xad,0xdc,0xa7,0xc2,0x60,0xe2);
-DEFINE_GUID(IID_IAudioCaptureClient, 0xc8adbd64, 0xe71e, 0x48a0, 0xa4,0xde, 0x18,0x5c,0x39,0x5c,0xd3,0x17);
-
-#ifdef HAVE_WASAPI
-#include <wtypes.h>
-#include <devpropdef.h>
-#include <propkeydef.h>
-DEFINE_DEVPROPKEY(DEVPKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80,0x20, 0x67,0xd1,0x46,0xa8,0x50,0xe0, 14);
-DEFINE_PROPERTYKEY(PKEY_AudioEndpoint_FormFactor, 0x1da5d803, 0xd492, 0x4edd, 0x8c,0x23, 0xe0,0xc0,0xff,0xee,0x7f,0x0e, 0);
-DEFINE_PROPERTYKEY(PKEY_AudioEndpoint_GUID, 0x1da5d803, 0xd492, 0x4edd, 0x8c, 0x23,0xe0, 0xc0,0xff,0xee,0x7f,0x0e, 4 );
-#endif
-#endif
-
-#endif /* AL_NO_UID_DEFS */
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-20 13:33:07 +0000