aboutsummaryrefslogtreecommitdiffstats
path: root/alc
diff options
context:
space:
mode:
Diffstat (limited to 'alc')
-rw-r--r--alc/effects/convolution.cpp2
-rw-r--r--alc/fmt_traits.cpp79
-rw-r--r--alc/fmt_traits.h81
-rw-r--r--alc/voice.cpp2
4 files changed, 2 insertions, 162 deletions
diff --git a/alc/effects/convolution.cpp b/alc/effects/convolution.cpp
index b190e75e..677c59ba 100644
--- a/alc/effects/convolution.cpp
+++ b/alc/effects/convolution.cpp
@@ -17,9 +17,9 @@
#include "buffer_storage.h"
#include "core/ambidefs.h"
#include "core/filters/splitter.h"
+#include "core/fmt_traits.h"
#include "effects/base.h"
#include "effectslot.h"
-#include "fmt_traits.h"
#include "logging.h"
#include "polyphase_resampler.h"
diff --git a/alc/fmt_traits.cpp b/alc/fmt_traits.cpp
deleted file mode 100644
index 054d8766..00000000
--- a/alc/fmt_traits.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-
-#include "config.h"
-
-#include "fmt_traits.h"
-
-
-namespace al {
-
-const int16_t muLawDecompressionTable[256] = {
- -32124,-31100,-30076,-29052,-28028,-27004,-25980,-24956,
- -23932,-22908,-21884,-20860,-19836,-18812,-17788,-16764,
- -15996,-15484,-14972,-14460,-13948,-13436,-12924,-12412,
- -11900,-11388,-10876,-10364, -9852, -9340, -8828, -8316,
- -7932, -7676, -7420, -7164, -6908, -6652, -6396, -6140,
- -5884, -5628, -5372, -5116, -4860, -4604, -4348, -4092,
- -3900, -3772, -3644, -3516, -3388, -3260, -3132, -3004,
- -2876, -2748, -2620, -2492, -2364, -2236, -2108, -1980,
- -1884, -1820, -1756, -1692, -1628, -1564, -1500, -1436,
- -1372, -1308, -1244, -1180, -1116, -1052, -988, -924,
- -876, -844, -812, -780, -748, -716, -684, -652,
- -620, -588, -556, -524, -492, -460, -428, -396,
- -372, -356, -340, -324, -308, -292, -276, -260,
- -244, -228, -212, -196, -180, -164, -148, -132,
- -120, -112, -104, -96, -88, -80, -72, -64,
- -56, -48, -40, -32, -24, -16, -8, 0,
- 32124, 31100, 30076, 29052, 28028, 27004, 25980, 24956,
- 23932, 22908, 21884, 20860, 19836, 18812, 17788, 16764,
- 15996, 15484, 14972, 14460, 13948, 13436, 12924, 12412,
- 11900, 11388, 10876, 10364, 9852, 9340, 8828, 8316,
- 7932, 7676, 7420, 7164, 6908, 6652, 6396, 6140,
- 5884, 5628, 5372, 5116, 4860, 4604, 4348, 4092,
- 3900, 3772, 3644, 3516, 3388, 3260, 3132, 3004,
- 2876, 2748, 2620, 2492, 2364, 2236, 2108, 1980,
- 1884, 1820, 1756, 1692, 1628, 1564, 1500, 1436,
- 1372, 1308, 1244, 1180, 1116, 1052, 988, 924,
- 876, 844, 812, 780, 748, 716, 684, 652,
- 620, 588, 556, 524, 492, 460, 428, 396,
- 372, 356, 340, 324, 308, 292, 276, 260,
- 244, 228, 212, 196, 180, 164, 148, 132,
- 120, 112, 104, 96, 88, 80, 72, 64,
- 56, 48, 40, 32, 24, 16, 8, 0
-};
-
-const int16_t aLawDecompressionTable[256] = {
- -5504, -5248, -6016, -5760, -4480, -4224, -4992, -4736,
- -7552, -7296, -8064, -7808, -6528, -6272, -7040, -6784,
- -2752, -2624, -3008, -2880, -2240, -2112, -2496, -2368,
- -3776, -3648, -4032, -3904, -3264, -3136, -3520, -3392,
- -22016,-20992,-24064,-23040,-17920,-16896,-19968,-18944,
- -30208,-29184,-32256,-31232,-26112,-25088,-28160,-27136,
- -11008,-10496,-12032,-11520, -8960, -8448, -9984, -9472,
- -15104,-14592,-16128,-15616,-13056,-12544,-14080,-13568,
- -344, -328, -376, -360, -280, -264, -312, -296,
- -472, -456, -504, -488, -408, -392, -440, -424,
- -88, -72, -120, -104, -24, -8, -56, -40,
- -216, -200, -248, -232, -152, -136, -184, -168,
- -1376, -1312, -1504, -1440, -1120, -1056, -1248, -1184,
- -1888, -1824, -2016, -1952, -1632, -1568, -1760, -1696,
- -688, -656, -752, -720, -560, -528, -624, -592,
- -944, -912, -1008, -976, -816, -784, -880, -848,
- 5504, 5248, 6016, 5760, 4480, 4224, 4992, 4736,
- 7552, 7296, 8064, 7808, 6528, 6272, 7040, 6784,
- 2752, 2624, 3008, 2880, 2240, 2112, 2496, 2368,
- 3776, 3648, 4032, 3904, 3264, 3136, 3520, 3392,
- 22016, 20992, 24064, 23040, 17920, 16896, 19968, 18944,
- 30208, 29184, 32256, 31232, 26112, 25088, 28160, 27136,
- 11008, 10496, 12032, 11520, 8960, 8448, 9984, 9472,
- 15104, 14592, 16128, 15616, 13056, 12544, 14080, 13568,
- 344, 328, 376, 360, 280, 264, 312, 296,
- 472, 456, 504, 488, 408, 392, 440, 424,
- 88, 72, 120, 104, 24, 8, 56, 40,
- 216, 200, 248, 232, 152, 136, 184, 168,
- 1376, 1312, 1504, 1440, 1120, 1056, 1248, 1184,
- 1888, 1824, 2016, 1952, 1632, 1568, 1760, 1696,
- 688, 656, 752, 720, 560, 528, 624, 592,
- 944, 912, 1008, 976, 816, 784, 880, 848
-};
-
-} // namespace al
diff --git a/alc/fmt_traits.h b/alc/fmt_traits.h
deleted file mode 100644
index 9d2a2567..00000000
--- a/alc/fmt_traits.h
+++ /dev/null
@@ -1,81 +0,0 @@
-#ifndef ALC_FMT_TRAITS_H
-#define ALC_FMT_TRAITS_H
-
-#include <cstddef>
-#include <cstdint>
-
-#include "albyte.h"
-#include "buffer_storage.h"
-
-
-namespace al {
-
-extern const int16_t muLawDecompressionTable[256];
-extern const int16_t aLawDecompressionTable[256];
-
-
-template<FmtType T>
-struct FmtTypeTraits { };
-
-template<>
-struct FmtTypeTraits<FmtUByte> {
- using Type = uint8_t;
-
- template<typename OutT>
- static constexpr inline OutT to(const Type val) noexcept
- { return val*OutT{1.0/128.0} - OutT{1.0}; }
-};
-template<>
-struct FmtTypeTraits<FmtShort> {
- using Type = int16_t;
-
- template<typename OutT>
- static constexpr inline OutT to(const Type val) noexcept { return val*OutT{1.0/32768.0}; }
-};
-template<>
-struct FmtTypeTraits<FmtFloat> {
- using Type = float;
-
- template<typename OutT>
- static constexpr inline OutT to(const Type val) noexcept { return val; }
-};
-template<>
-struct FmtTypeTraits<FmtDouble> {
- using Type = double;
-
- template<typename OutT>
- static constexpr inline OutT to(const Type val) noexcept { return static_cast<OutT>(val); }
-};
-template<>
-struct FmtTypeTraits<FmtMulaw> {
- using Type = uint8_t;
-
- template<typename OutT>
- static constexpr inline OutT to(const Type val) noexcept
- { return muLawDecompressionTable[val] * OutT{1.0/32768.0}; }
-};
-template<>
-struct FmtTypeTraits<FmtAlaw> {
- using Type = uint8_t;
-
- template<typename OutT>
- static constexpr inline OutT to(const Type val) noexcept
- { return aLawDecompressionTable[val] * OutT{1.0/32768.0}; }
-};
-
-
-template<FmtType SrcType, typename DstT>
-inline void LoadSampleArray(DstT *RESTRICT dst, const al::byte *src, const size_t srcstep,
- const size_t samples) noexcept
-{
- using TypeTraits = FmtTypeTraits<SrcType>;
- using SampleType = typename TypeTraits::Type;
-
- const SampleType *RESTRICT ssrc{reinterpret_cast<const SampleType*>(src)};
- for(size_t i{0u};i < samples;i++)
- dst[i] = TypeTraits::template to<DstT>(ssrc[i*srcstep]);
-}
-
-} // namespace al
-
-#endif /* ALC_FMT_TRAITS_H */
diff --git a/alc/voice.cpp b/alc/voice.cpp
index 8aa5a59f..8b4e0c2e 100644
--- a/alc/voice.cpp
+++ b/alc/voice.cpp
@@ -50,10 +50,10 @@
#include "core/filters/biquad.h"
#include "core/filters/nfc.h"
#include "core/filters/splitter.h"
+#include "core/fmt_traits.h"
#include "core/mixer/defs.h"
#include "core/mixer/hrtfdefs.h"
#include "cpu_caps.h"
-#include "fmt_traits.h"
#include "hrtf.h"
#include "inprogext.h"
#include "logging.h"
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-20 10:29:50 +0000