AxioDL/boo
2
0
Fork 0
mirror of https://github.com/AxioDL/boo.git synced 2025-06-06 22:53:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34 from lioncash/ltrt

Browse Source 
LtRtProcessing: Make use of if constexpr in ClampFull()
This commit is contained in:
Phillip Stephens 2019-08-24 20:46:08 -07:00 committed by GitHub
commit efbb2f96ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/audiodev/LtRtProcessing.cpp
View File

@ -1,16 +1,17 @@
#include "LtRtProcessing.hpp" #include "lib/audiodev/LtRtProcessing.hpp"
#include <cmath>
#include <algorithm> #include <algorithm>
#include <cmath>
#undef min #undef min
#undef max #undef max
namespace boo { namespace boo {
namespace {
template <typename T> template <typename T>
inline T ClampFull(float in) { constexpr T ClampFull(float in) {
if (std::is_floating_point<T>()) { if constexpr (std::is_floating_point_v<T>) {
return std::min<T>(std::max<T>(in, -1.f), 1.f); return std::clamp(in, -1.f, 1.f);
} else { } else {
constexpr T MAX = std::numeric_limits<T>::max(); constexpr T MAX = std::numeric_limits<T>::max();
constexpr T MIN = std::numeric_limits<T>::min(); constexpr T MIN = std::numeric_limits<T>::min();
@ -23,6 +24,7 @@ inline T ClampFull(float in) {
return in; return in;
} }
} }
} // Anonymous namespace
#if INTEL_IPP #if INTEL_IPP
@ -237,19 +239,16 @@ LtRtProcessing::LtRtProcessing(int _5msFrames, const AudioVoiceEngineMixInfo& mi
m_inMixInfo.m_channelMap.m_channels[3] = AudioChannel::RearLeft; m_inMixInfo.m_channelMap.m_channels[3] = AudioChannel::RearLeft;
m_inMixInfo.m_channelMap.m_channels[4] = AudioChannel::RearRight; m_inMixInfo.m_channelMap.m_channels[4] = AudioChannel::RearRight;
int samples = m_windowFrames * (5 * 2 + 2 * 2); const int samples = m_windowFrames * (5 * 2 + 2 * 2);
switch (mixInfo.m_sampleFormat) { switch (mixInfo.m_sampleFormat) {
case SOXR_INT16_I: case SOXR_INT16_I:
m_16Buffer.reset(new int16_t[samples]); m_16Buffer = std::make_unique<int16_t[]>(samples);
memset(m_16Buffer.get(), 0, sizeof(int16_t) * samples);
break; break;
case SOXR_INT32_I: case SOXR_INT32_I:
m_32Buffer.reset(new int32_t[samples]); m_32Buffer = std::make_unique<int32_t[]>(samples);
memset(m_32Buffer.get(), 0, sizeof(int32_t) * samples);
break; break;
case SOXR_FLOAT32_I: case SOXR_FLOAT32_I:
m_fltBuffer.reset(new float[samples]); m_fltBuffer = std::make_unique<float[]>(samples);
memset(m_fltBuffer.get(), 0, sizeof(float) * samples);
break; break;
default: default:
break; break;
@ -259,7 +258,7 @@ LtRtProcessing::LtRtProcessing(int _5msFrames, const AudioVoiceEngineMixInfo& mi
template <typename T> template <typename T>
void LtRtProcessing::Process(const T* input, T* output, int frameCount) { void LtRtProcessing::Process(const T* input, T* output, int frameCount) {
#if 0 #if 0
for (int i=0 ; i<frameCount ; ++i) for (int i = 0; i < frameCount; ++i)
{ {
output[i * 2] = input[i * 5 + 3]; output[i * 2] = input[i * 5 + 3];
output[i * 2 + 1] = input[i * 5 + 4]; output[i * 2 + 1] = input[i * 5 + 4];