aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLopuska <[email protected]>2019-07-10 07:14:31 +0200
committerkcat <[email protected]>2019-07-09 22:14:31 -0700
commit4a33bbb14d6b5f7673fe0371004236bac8f5bb2a (patch)
tree1ece0323a5e5dee97600277003fcde6cb0e9f768
parent3ffb6867a3bac856bacebf25dfbcf48b4482d50f (diff)
vocal morpher implementation (#312)
* vocal morpher implementation * compile fix for GCC
-rw-r--r--Alc/alc.cpp2
-rw-r--r--Alc/effects/base.h10
-rw-r--r--Alc/effects/vmorpher.cpp490
-rw-r--r--CMakeLists.txt1
-rw-r--r--OpenAL32/Include/alEffect.h3
-rw-r--r--OpenAL32/alEffect.cpp4
6 files changed, 506 insertions, 4 deletions
diff --git a/Alc/alc.cpp b/Alc/alc.cpp
index 7efa8514..3e176957 100644
--- a/Alc/alc.cpp
+++ b/Alc/alc.cpp
@@ -617,9 +617,7 @@ constexpr struct {
DECL(AL_EFFECT_FLANGER),
DECL(AL_EFFECT_PITCH_SHIFTER),
DECL(AL_EFFECT_FREQUENCY_SHIFTER),
-#if 0
DECL(AL_EFFECT_VOCAL_MORPHER),
-#endif
DECL(AL_EFFECT_RING_MODULATOR),
DECL(AL_EFFECT_AUTOWAH),
DECL(AL_EFFECT_COMPRESSOR),
diff --git a/Alc/effects/base.h b/Alc/effects/base.h
index c2848f37..2b067f11 100644
--- a/Alc/effects/base.h
+++ b/Alc/effects/base.h
@@ -110,6 +110,15 @@ union EffectProps {
} Pshifter;
struct {
+ ALfloat Rate;
+ ALint PhonemeA;
+ ALint PhonemeB;
+ ALint PhonemeACoarseTuning;
+ ALint PhonemeBCoarseTuning;
+ ALint Waveform;
+ } Vmorpher;
+
+ struct {
ALfloat Gain;
} Dedicated;
};
@@ -180,6 +189,7 @@ EffectStateFactory *FlangerStateFactory_getFactory(void);
EffectStateFactory *FshifterStateFactory_getFactory(void);
EffectStateFactory *ModulatorStateFactory_getFactory(void);
EffectStateFactory *PshifterStateFactory_getFactory(void);
+EffectStateFactory* VmorpherStateFactory_getFactory(void);
EffectStateFactory *DedicatedStateFactory_getFactory(void);
diff --git a/Alc/effects/vmorpher.cpp b/Alc/effects/vmorpher.cpp
new file mode 100644
index 00000000..c656a14e
--- /dev/null
+++ b/Alc/effects/vmorpher.cpp
@@ -0,0 +1,490 @@
+/**
+ * OpenAL cross platform audio library
+ * Copyright (C) 2019 by Anis A. Hireche
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Or go to http://www.gnu.org/copyleft/lgpl.html
+ */
+
+#include "config.h"
+
+#include <cmath>
+#include <cstdlib>
+
+#include <algorithm>
+#include <functional>
+
+#include "alMain.h"
+#include "alcontext.h"
+#include "alAuxEffectSlot.h"
+#include "alError.h"
+#include "alu.h"
+#include "vecmat.h"
+
+
+namespace {
+
+#define MAX_UPDATE_SAMPLES 128
+#define Q_FACTOR 5.0f
+#define NUM_FORMANTS 4
+
+#define WAVEFORM_FRACBITS 24
+#define WAVEFORM_FRACONE (1<<WAVEFORM_FRACBITS)
+#define WAVEFORM_FRACMASK (WAVEFORM_FRACONE-1)
+
+inline ALfloat Sin(ALsizei index)
+{
+ return (std::sin(static_cast<ALfloat>(index) *
+ (al::MathDefs<float>::Tau() / ALfloat{WAVEFORM_FRACONE})))*0.5f+0.5f;
+}
+
+inline ALfloat Saw(ALsizei index)
+{
+ return (static_cast<ALfloat>(index)*(2.0f/WAVEFORM_FRACONE) - 1.0f)*0.5f+0.5f;
+}
+
+inline ALfloat Triangle(ALsizei index)
+{
+ return (std::fabs(static_cast<ALfloat>(index) * (al::MathDefs<float>::Tau() / WAVEFORM_FRACONE) -
+ al::MathDefs<float>::Pi()) / al::MathDefs<float>::Pi())*0.5f+0.5f;
+}
+
+inline ALfloat Half(ALsizei UNUSED(index))
+{
+ return 0.5f;
+}
+
+template<ALfloat func(ALsizei)>
+void Oscillate(ALfloat *RESTRICT dst, ALsizei index, const ALsizei step, ALsizei todo)
+{
+ for(ALsizei i{0};i < todo;i++)
+ {
+ index += step;
+ index &= WAVEFORM_FRACMASK;
+ dst[i] = func(index);
+ }
+}
+
+struct FormantFilter
+{
+ inline void process(const ALfloat* samplesIn, ALfloat* samplesOut, const ALsizei numInput)
+ {
+ const float g = std::tan(al::MathDefs<float>::Pi() * f0norm);
+ const float h = 1.0f / (1 + (g / Q_FACTOR) + (g * g));
+
+ for (ALsizei i{0};i < numInput;i++)
+ {
+ const float H = h * (samplesIn[i] - (1.0f / Q_FACTOR + g) * s1 - s2);
+ const float B = g * H + s1;
+ const float L = g * B + s2;
+
+ s1 = g * H + B;
+ s2 = g * B + L;
+
+ // Apply peak and accumulate samples.
+ samplesOut[i] += B * fGain;
+ }
+ }
+
+ inline void clear()
+ {
+ s1 = 0.0f;
+ s2 = 0.0f;
+ }
+
+ float f0norm;
+ float fGain;
+ float s1;
+ float s2;
+};
+
+struct VmorpherState final : public EffectState {
+ struct {
+ /* Effect parameters */
+ FormantFilter FormantsA[NUM_FORMANTS];
+ FormantFilter FormantsB[NUM_FORMANTS];
+
+ /* Effect gains for each channel */
+ ALfloat CurrentGains[MAX_OUTPUT_CHANNELS]{};
+ ALfloat TargetGains[MAX_OUTPUT_CHANNELS]{};
+ } mChans[MAX_AMBI_CHANNELS];
+
+ void (*mGetSamples)(ALfloat* RESTRICT, ALsizei, const ALsizei, ALsizei) {};
+
+ ALsizei mIndex{0};
+ ALsizei mStep{1};
+
+ ALfloat mSampleBufferA[MAX_UPDATE_SAMPLES]{};
+ ALfloat mSampleBufferB[MAX_UPDATE_SAMPLES]{};
+
+ ALboolean deviceUpdate(const ALCdevice *device) override;
+ void update(const ALCcontext *context, const ALeffectslot *slot, const EffectProps *props, const EffectTarget target) override;
+ void process(const ALsizei samplesToDo, const FloatBufferLine *RESTRICT samplesIn, const ALsizei numInput, const al::span<FloatBufferLine> samplesOut) override;
+
+ DEF_NEWDEL(VmorpherState)
+};
+
+ALboolean VmorpherState::deviceUpdate(const ALCdevice *UNUSED(device))
+{
+ for(auto &e : mChans)
+ {
+ std::for_each(std::begin(e.FormantsA), std::end(e.FormantsA),
+ std::mem_fn(&FormantFilter::clear));
+ std::for_each(std::begin(e.FormantsB), std::end(e.FormantsB),
+ std::mem_fn(&FormantFilter::clear));
+ std::fill(std::begin(e.CurrentGains), std::end(e.CurrentGains), 0.0f);
+ }
+ return AL_TRUE;
+}
+
+void VmorpherState::update(const ALCcontext *context, const ALeffectslot *slot, const EffectProps *props, const EffectTarget target)
+{
+ const ALCdevice *device = context->Device;
+ const ALfloat frequency = static_cast<ALfloat>(device->Frequency);
+
+ const float step{props->Vmorpher.Rate / static_cast<ALfloat>(device->Frequency)};
+ mStep = fastf2i(clampf(step*WAVEFORM_FRACONE, 0.0f, ALfloat{WAVEFORM_FRACONE-1}));
+
+ if(mStep == 0)
+ mGetSamples = Oscillate<Half>;
+ else if(props->Vmorpher.Waveform == AL_VOCAL_MORPHER_WAVEFORM_SINUSOID)
+ mGetSamples = Oscillate<Sin>;
+ else if(props->Vmorpher.Waveform == AL_VOCAL_MORPHER_WAVEFORM_SAWTOOTH)
+ mGetSamples = Oscillate<Saw>;
+ else /*if(props->Vmorpher.Waveform == AL_VOCAL_MORPHER_WAVEFORM_TRIANGLE)*/
+ mGetSamples = Oscillate<Triangle>;
+
+ /* Using soprano formant set of values to better match mid-range frequency space.
+ * See: https://www.classes.cs.uchicago.edu/archive/1999/spring/CS295/Computing_Resources/Csound/CsManual3.48b1.HTML/Appendices/table3.html
+ */
+ switch(props->Vmorpher.PhonemeA)
+ {
+ case AL_VOCAL_MORPHER_PHONEME_A:
+ mChans[0].FormantsA[0].f0norm = 800 / frequency;
+ mChans[0].FormantsA[1].f0norm = 1150 / frequency;
+ mChans[0].FormantsA[2].f0norm = 2900 / frequency;
+ mChans[0].FormantsA[3].f0norm = 3900 / frequency;
+
+ mChans[0].FormantsA[0].fGain = 1.000000f; /* std::pow(10.0f, 0 / 20.0f); */
+ mChans[0].FormantsA[1].fGain = 0.501187f; /* std::pow(10.0f, -6 / 20.0f); */
+ mChans[0].FormantsA[2].fGain = 0.025118f; /* std::pow(10.0f, -32 / 20.0f); */
+ mChans[0].FormantsA[3].fGain = 0.100000f; /* std::pow(10.0f, -20 / 20.0f); */
+ break;
+ case AL_VOCAL_MORPHER_PHONEME_E:
+ mChans[0].FormantsA[0].f0norm = 350 / frequency;
+ mChans[0].FormantsA[1].f0norm = 2000 / frequency;
+ mChans[0].FormantsA[2].f0norm = 2800 / frequency;
+ mChans[0].FormantsA[3].f0norm = 3600 / frequency;
+
+ mChans[0].FormantsA[0].fGain = 1.000000f; /* std::pow(10.0f, 0 / 20.0f); */
+ mChans[0].FormantsA[1].fGain = 0.100000f; /* std::pow(10.0f, -20 / 20.0f); */
+ mChans[0].FormantsA[2].fGain = 0.177827f; /* std::pow(10.0f, -15 / 20.0f); */
+ mChans[0].FormantsA[3].fGain = 0.009999f; /* std::pow(10.0f, -40 / 20.0f); */
+ break;
+ case AL_VOCAL_MORPHER_PHONEME_I:
+ mChans[0].FormantsA[0].f0norm = 270 / frequency;
+ mChans[0].FormantsA[1].f0norm = 2140 / frequency;
+ mChans[0].FormantsA[2].f0norm = 2950 / frequency;
+ mChans[0].FormantsA[3].f0norm = 3900 / frequency;
+
+ mChans[0].FormantsA[0].fGain = 1.000000f; /* std::pow(10.0f, 0 / 20.0f); */
+ mChans[0].FormantsA[1].fGain = 0.251188f; /* std::pow(10.0f, -12 / 20.0f); */
+ mChans[0].FormantsA[2].fGain = 0.050118f; /* std::pow(10.0f, -26 / 20.0f); */
+ mChans[0].FormantsA[3].fGain = 0.050118f; /* std::pow(10.0f, -26 / 20.0f); */
+ break;
+ case AL_VOCAL_MORPHER_PHONEME_O:
+ mChans[0].FormantsA[0].f0norm = 450 / frequency;
+ mChans[0].FormantsA[1].f0norm = 800 / frequency;
+ mChans[0].FormantsA[2].f0norm = 2830 / frequency;
+ mChans[0].FormantsA[3].f0norm = 3800 / frequency;
+
+ mChans[0].FormantsA[0].fGain = 1.000000f; /* std::pow(10.0f, 0 / 20.0f); */
+ mChans[0].FormantsA[1].fGain = 0.281838f; /* std::pow(10.0f, -11 / 20.0f); */
+ mChans[0].FormantsA[2].fGain = 0.079432f; /* std::pow(10.0f, -22 / 20.0f); */
+ mChans[0].FormantsA[3].fGain = 0.079432f; /* std::pow(10.0f, -22 / 20.0f); */
+ break;
+ case AL_VOCAL_MORPHER_PHONEME_U:
+ mChans[0].FormantsA[0].f0norm = 325 / frequency;
+ mChans[0].FormantsA[1].f0norm = 700 / frequency;
+ mChans[0].FormantsA[2].f0norm = 2700 / frequency;
+ mChans[0].FormantsA[3].f0norm = 3800 / frequency;
+
+ mChans[0].FormantsA[0].fGain = 1.000000f; /* std::pow(10.0f, 0 / 20.0f); */
+ mChans[0].FormantsA[1].fGain = 0.158489f; /* std::pow(10.0f, -16 / 20.0f); */
+ mChans[0].FormantsA[2].fGain = 0.017782f; /* std::pow(10.0f, -35 / 20.0f); */
+ mChans[0].FormantsA[3].fGain = 0.009999f; /* std::pow(10.0f, -40 / 20.0f); */
+ break;
+ }
+
+ switch(props->Vmorpher.PhonemeB)
+ {
+ case AL_VOCAL_MORPHER_PHONEME_A:
+ mChans[0].FormantsB[0].f0norm = 800 / frequency;
+ mChans[0].FormantsB[1].f0norm = 1150 / frequency;
+ mChans[0].FormantsB[2].f0norm = 2900 / frequency;
+ mChans[0].FormantsB[3].f0norm = 3900 / frequency;
+
+ mChans[0].FormantsB[0].fGain = 1.000000f; /* std::pow(10.0f, 0 / 20.0f); */
+ mChans[0].FormantsB[1].fGain = 0.501187f; /* std::pow(10.0f, -6 / 20.0f); */
+ mChans[0].FormantsB[2].fGain = 0.025118f; /* std::pow(10.0f, -32 / 20.0f); */
+ mChans[0].FormantsB[3].fGain = 0.100000f; /* std::pow(10.0f, -20 / 20.0f); */
+ break;
+ case AL_VOCAL_MORPHER_PHONEME_E:
+ mChans[0].FormantsB[0].f0norm = 350 / frequency;
+ mChans[0].FormantsB[1].f0norm = 2000 / frequency;
+ mChans[0].FormantsB[2].f0norm = 2800 / frequency;
+ mChans[0].FormantsB[3].f0norm = 3600 / frequency;
+
+ mChans[0].FormantsB[0].fGain = 1.000000f; /* std::pow(10.0f, 0 / 20.0f); */
+ mChans[0].FormantsB[1].fGain = 0.100000f; /* std::pow(10.0f, -20 / 20.0f); */
+ mChans[0].FormantsB[2].fGain = 0.177827f; /* std::pow(10.0f, -15 / 20.0f); */
+ mChans[0].FormantsB[3].fGain = 0.009999f; /* std::pow(10.0f, -40 / 20.0f); */
+ break;
+ case AL_VOCAL_MORPHER_PHONEME_I:
+ mChans[0].FormantsB[0].f0norm = 270 / frequency;
+ mChans[0].FormantsB[1].f0norm = 2140 / frequency;
+ mChans[0].FormantsB[2].f0norm = 2950 / frequency;
+ mChans[0].FormantsB[3].f0norm = 3900 / frequency;
+
+ mChans[0].FormantsB[0].fGain = 1.000000f; /* std::pow(10.0f, 0 / 20.0f); */
+ mChans[0].FormantsB[1].fGain = 0.251188f; /* std::pow(10.0f, -12 / 20.0f); */
+ mChans[0].FormantsB[2].fGain = 0.050118f; /* std::pow(10.0f, -26 / 20.0f); */
+ mChans[0].FormantsB[3].fGain = 0.050118f; /* std::pow(10.0f, -26 / 20.0f); */
+ break;
+ case AL_VOCAL_MORPHER_PHONEME_O:
+ mChans[0].FormantsB[0].f0norm = 450 / frequency;
+ mChans[0].FormantsB[1].f0norm = 800 / frequency;
+ mChans[0].FormantsB[2].f0norm = 2830 / frequency;
+ mChans[0].FormantsB[3].f0norm = 3800 / frequency;
+
+ mChans[0].FormantsB[0].fGain = 1.000000f; /* std::pow(10.0f, 0 / 20.0f); */
+ mChans[0].FormantsB[1].fGain = 0.281838f; /* std::pow(10.0f, -11 / 20.0f); */
+ mChans[0].FormantsB[2].fGain = 0.079432f; /* std::pow(10.0f, -22 / 20.0f); */
+ mChans[0].FormantsB[3].fGain = 0.079432f; /* std::pow(10.0f, -22 / 20.0f); */
+ break;
+ case AL_VOCAL_MORPHER_PHONEME_U:
+ mChans[0].FormantsB[0].f0norm = 325 / frequency;
+ mChans[0].FormantsB[1].f0norm = 700 / frequency;
+ mChans[0].FormantsB[2].f0norm = 2700 / frequency;
+ mChans[0].FormantsB[3].f0norm = 3800 / frequency;
+
+ mChans[0].FormantsB[0].fGain = 1.000000f; /* std::pow(10.0f, 0 / 20.0f); */
+ mChans[0].FormantsB[1].fGain = 0.158489f; /* std::pow(10.0f, -16 / 20.0f); */
+ mChans[0].FormantsB[2].fGain = 0.017782f; /* std::pow(10.0f, -35 / 20.0f); */
+ mChans[0].FormantsB[3].fGain = 0.009999f; /* std::pow(10.0f, -40 / 20.0f); */
+ break;
+ }
+
+ /* Copy the filter coefficients for the other input channels. */
+ for(ALuint i{1u};i < slot->Wet.Buffer.size();++i)
+ {
+ mChans[i].FormantsA[0] = mChans[0].FormantsA[0];
+ mChans[i].FormantsA[1] = mChans[0].FormantsA[0];
+ mChans[i].FormantsA[2] = mChans[0].FormantsA[0];
+ mChans[i].FormantsA[3] = mChans[0].FormantsA[0];
+
+ mChans[i].FormantsB[0] = mChans[0].FormantsB[0];
+ mChans[i].FormantsB[1] = mChans[0].FormantsB[0];
+ mChans[i].FormantsB[2] = mChans[0].FormantsB[0];
+ mChans[i].FormantsB[3] = mChans[0].FormantsB[0];
+ }
+
+ mOutTarget = target.Main->Buffer;
+ for(ALuint i{0u};i < slot->Wet.Buffer.size();++i)
+ {
+ auto coeffs = GetAmbiIdentityRow(i);
+ ComputePanGains(target.Main, coeffs.data(), slot->Params.Gain, mChans[i].TargetGains);
+ }
+}
+
+void VmorpherState::process(const ALsizei samplesToDo, const FloatBufferLine *RESTRICT samplesIn, const ALsizei numInput, const al::span<FloatBufferLine> samplesOut)
+{
+ /* Following the EFX specification for a conformant implementation which describes
+ * the effect as a pair of 4-band formant filters blended together using an LFO.
+ */
+ for(ALsizei base{0};base < samplesToDo;)
+ {
+ alignas(16) ALfloat lfo[MAX_UPDATE_SAMPLES];
+ const ALsizei td = mini(MAX_UPDATE_SAMPLES, samplesToDo-base);
+
+ mGetSamples(lfo, mIndex, mStep, td);
+ mIndex += (mStep * td) & WAVEFORM_FRACMASK;
+ mIndex &= WAVEFORM_FRACMASK;
+
+ ASSUME(numInput > 0);
+ for(ALsizei c{0};c < numInput;c++)
+ {
+ for (ALsizei i{0};i < td;i++)
+ {
+ mSampleBufferA[i] = 0.0f;
+ mSampleBufferB[i] = 0.0f;
+ }
+
+ /* Process first vowel. */
+ mChans[c].FormantsA[0].process(&samplesIn[c][base], mSampleBufferA, td);
+ mChans[c].FormantsA[1].process(&samplesIn[c][base], mSampleBufferA, td);
+ mChans[c].FormantsA[2].process(&samplesIn[c][base], mSampleBufferA, td);
+ mChans[c].FormantsA[3].process(&samplesIn[c][base], mSampleBufferA, td);
+
+ /* Process second vowel. */
+ mChans[c].FormantsB[0].process(&samplesIn[c][base], mSampleBufferB, td);
+ mChans[c].FormantsB[1].process(&samplesIn[c][base], mSampleBufferB, td);
+ mChans[c].FormantsB[2].process(&samplesIn[c][base], mSampleBufferB, td);
+ mChans[c].FormantsB[3].process(&samplesIn[c][base], mSampleBufferB, td);
+
+ alignas(16) ALfloat samplesBlended[MAX_UPDATE_SAMPLES];
+
+ for (ALsizei i{0};i < td;i++)
+ samplesBlended[i] = lerp(mSampleBufferA[i], mSampleBufferB[i], lfo[i]);
+
+ MixSamples(samplesBlended, samplesOut, mChans[c].CurrentGains, mChans[c].TargetGains,
+ samplesToDo-base, base, td);
+ }
+
+ base += td;
+ }
+}
+
+
+void Vmorpher_setParami(EffectProps* props, ALCcontext *context, ALenum param, ALint val)
+{
+ switch(param)
+ {
+ case AL_VOCAL_MORPHER_WAVEFORM:
+ if(val < AL_VOCAL_MORPHER_MIN_WAVEFORM || val > AL_VOCAL_MORPHER_MAX_WAVEFORM)
+ SETERR_RETURN(context, AL_INVALID_VALUE,, "Vocal morpher waveform out of range");
+ props->Vmorpher.Waveform = val;
+ break;
+
+ case AL_VOCAL_MORPHER_PHONEMEA:
+ if(val < AL_VOCAL_MORPHER_MIN_PHONEMEA || val > AL_VOCAL_MORPHER_MAX_PHONEMEA)
+ SETERR_RETURN(context, AL_INVALID_VALUE,, "Vocal morpher phoneme-a out of range");
+ props->Vmorpher.PhonemeA = val;
+ break;
+
+ case AL_VOCAL_MORPHER_PHONEMEB:
+ if(val < AL_VOCAL_MORPHER_MIN_PHONEMEB || val > AL_VOCAL_MORPHER_MAX_PHONEMEB)
+ SETERR_RETURN(context, AL_INVALID_VALUE,, "Vocal morpher phoneme-b out of range");
+ props->Vmorpher.PhonemeB = val;
+ break;
+
+ case AL_VOCAL_MORPHER_PHONEMEA_COARSE_TUNING:
+ if(val < AL_VOCAL_MORPHER_MIN_PHONEMEA_COARSE_TUNING || val > AL_VOCAL_MORPHER_MAX_PHONEMEA_COARSE_TUNING)
+ SETERR_RETURN(context, AL_INVALID_VALUE,, "Vocal morpher phoneme-a coarse tuning out of range");
+ props->Vmorpher.PhonemeACoarseTuning = val;
+ break;
+
+ case AL_VOCAL_MORPHER_PHONEMEB_COARSE_TUNING:
+ if(val < AL_VOCAL_MORPHER_MIN_PHONEMEB_COARSE_TUNING || val > AL_VOCAL_MORPHER_MAX_PHONEMEB_COARSE_TUNING)
+ SETERR_RETURN(context, AL_INVALID_VALUE,, "Vocal morpher phoneme-b coarse tuning out of range");
+ props->Vmorpher.PhonemeBCoarseTuning = val;
+ break;
+
+ default:
+ alSetError(context, AL_INVALID_ENUM, "Invalid vocal morpher integer property 0x%04x", param);
+ }
+}
+void Vmorpher_setParamiv(EffectProps*, ALCcontext *context, ALenum param, const ALint*)
+{ alSetError(context, AL_INVALID_ENUM, "Invalid vocal morpher integer-vector property 0x%04x", param); }
+void Vmorpher_setParamf(EffectProps *props, ALCcontext *context, ALenum param, ALfloat val)
+{
+ switch(param)
+ {
+ case AL_VOCAL_MORPHER_RATE:
+ if(val < AL_VOCAL_MORPHER_MIN_RATE || val > AL_VOCAL_MORPHER_MAX_RATE)
+ SETERR_RETURN(context, AL_INVALID_VALUE,, "Vocal morpher rate out of range");
+ props->Vmorpher.Rate = val;
+ break;
+
+ default:
+ alSetError(context, AL_INVALID_ENUM, "Invalid vocal morpher float property 0x%04x", param);
+ }
+}
+void Vmorpher_setParamfv(EffectProps *props, ALCcontext *context, ALenum param, const ALfloat *vals)
+{ Vmorpher_setParamf(props, context, param, vals[0]); }
+
+void Vmorpher_getParami(const EffectProps* props, ALCcontext *context, ALenum param, ALint* val)
+{
+ switch(param)
+ {
+ case AL_VOCAL_MORPHER_PHONEMEA:
+ *val = props->Vmorpher.PhonemeA;
+ break;
+
+ case AL_VOCAL_MORPHER_PHONEMEB:
+ *val = props->Vmorpher.PhonemeB;
+ break;
+
+ case AL_VOCAL_MORPHER_PHONEMEA_COARSE_TUNING:
+ *val = props->Vmorpher.PhonemeACoarseTuning;
+ break;
+
+ case AL_VOCAL_MORPHER_PHONEMEB_COARSE_TUNING:
+ *val = props->Vmorpher.PhonemeBCoarseTuning;
+ break;
+
+ case AL_VOCAL_MORPHER_WAVEFORM:
+ *val = props->Vmorpher.Waveform;
+ break;
+
+ default:
+ alSetError(context, AL_INVALID_ENUM, "Invalid vocal morpher integer property 0x%04x", param);
+ }
+}
+void Vmorpher_getParamiv(const EffectProps*, ALCcontext *context, ALenum param, ALint*)
+{ alSetError(context, AL_INVALID_ENUM, "Invalid vocal morpher integer-vector property 0x%04x", param); }
+void Vmorpher_getParamf(const EffectProps *props, ALCcontext *context, ALenum param, ALfloat *val)
+{
+ switch(param)
+ {
+ case AL_VOCAL_MORPHER_RATE:
+ *val = props->Vmorpher.Rate;
+ break;
+
+ default:
+ alSetError(context, AL_INVALID_ENUM, "Invalid vocal morpher float property 0x%04x", param);
+ }
+}
+void Vmorpher_getParamfv(const EffectProps *props, ALCcontext *context, ALenum param, ALfloat *vals)
+{ Vmorpher_getParamf(props, context, param, vals); }
+
+DEFINE_ALEFFECT_VTABLE(Vmorpher);
+
+
+struct VmorpherStateFactory final : public EffectStateFactory {
+ EffectState *create() override { return new VmorpherState{}; }
+ EffectProps getDefaultProps() const noexcept override;
+ const EffectVtable *getEffectVtable() const noexcept override { return &Vmorpher_vtable; }
+};
+
+EffectProps VmorpherStateFactory::getDefaultProps() const noexcept
+{
+ EffectProps props{};
+ props.Vmorpher.Rate = AL_VOCAL_MORPHER_DEFAULT_RATE;
+ props.Vmorpher.PhonemeA = AL_VOCAL_MORPHER_DEFAULT_PHONEMEA;
+ props.Vmorpher.PhonemeB = AL_VOCAL_MORPHER_DEFAULT_PHONEMEB;
+ props.Vmorpher.PhonemeACoarseTuning = AL_VOCAL_MORPHER_DEFAULT_PHONEMEA_COARSE_TUNING;
+ props.Vmorpher.PhonemeBCoarseTuning = AL_VOCAL_MORPHER_DEFAULT_PHONEMEB_COARSE_TUNING;
+ props.Vmorpher.Waveform = AL_VOCAL_MORPHER_DEFAULT_WAVEFORM;
+ return props;
+}
+
+} // namespace
+
+EffectStateFactory *VmorpherStateFactory_getFactory()
+{
+ static VmorpherStateFactory VmorpherFactory{};
+ return &VmorpherFactory;
+}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2150846..3614ec29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -697,6 +697,7 @@ SET(ALC_OBJS
Alc/effects/modulator.cpp
Alc/effects/null.cpp
Alc/effects/pshifter.cpp
+ Alc/effects/vmorpher.cpp
Alc/effects/reverb.cpp
Alc/filters/biquad.h
Alc/filters/biquad.cpp
diff --git a/OpenAL32/Include/alEffect.h b/OpenAL32/Include/alEffect.h
index 51d6a24f..d94317a4 100644
--- a/OpenAL32/Include/alEffect.h
+++ b/OpenAL32/Include/alEffect.h
@@ -18,6 +18,7 @@ enum {
FSHIFTER_EFFECT,
MODULATOR_EFFECT,
PSHIFTER_EFFECT,
+ VMORPHER_EFFECT,
DEDICATED_EFFECT,
MAX_EFFECTS
@@ -31,7 +32,7 @@ struct EffectList {
int type;
ALenum val;
};
-extern const EffectList gEffectList[14];
+extern const EffectList gEffectList[15];
struct ALeffect {
diff --git a/OpenAL32/alEffect.cpp b/OpenAL32/alEffect.cpp
index a2a40ac5..0c4f9e72 100644
--- a/OpenAL32/alEffect.cpp
+++ b/OpenAL32/alEffect.cpp
@@ -38,7 +38,7 @@
#include "effects/base.h"
-const EffectList gEffectList[14]{
+const EffectList gEffectList[15]{
{ "eaxreverb", EAXREVERB_EFFECT, AL_EFFECT_EAXREVERB },
{ "reverb", REVERB_EFFECT, AL_EFFECT_REVERB },
{ "autowah", AUTOWAH_EFFECT, AL_EFFECT_AUTOWAH },
@@ -51,6 +51,7 @@ const EffectList gEffectList[14]{
{ "fshifter", FSHIFTER_EFFECT, AL_EFFECT_FREQUENCY_SHIFTER },
{ "modulator", MODULATOR_EFFECT, AL_EFFECT_RING_MODULATOR },
{ "pshifter", PSHIFTER_EFFECT, AL_EFFECT_PITCH_SHIFTER },
+ { "vmorpher", VMORPHER_EFFECT, AL_EFFECT_VOCAL_MORPHER },
{ "dedicated", DEDICATED_EFFECT, AL_EFFECT_DEDICATED_LOW_FREQUENCY_EFFECT },
{ "dedicated", DEDICATED_EFFECT, AL_EFFECT_DEDICATED_DIALOGUE },
};
@@ -76,6 +77,7 @@ constexpr struct FactoryItem {
{ AL_EFFECT_FREQUENCY_SHIFTER, FshifterStateFactory_getFactory },
{ AL_EFFECT_RING_MODULATOR, ModulatorStateFactory_getFactory },
{ AL_EFFECT_PITCH_SHIFTER, PshifterStateFactory_getFactory},
+ { AL_EFFECT_VOCAL_MORPHER, VmorpherStateFactory_getFactory},
{ AL_EFFECT_DEDICATED_DIALOGUE, DedicatedStateFactory_getFactory },
{ AL_EFFECT_DEDICATED_LOW_FREQUENCY_EFFECT, DedicatedStateFactory_getFactory }
};