diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp index e1d118a11d..1fe3ddbbe9 100644 --- a/assignment-client/src/audio/AudioMixer.cpp +++ b/assignment-client/src/audio/AudioMixer.cpp @@ -270,10 +270,10 @@ void AudioMixer::addStreamToMixForListeningNodeWithStream(PositionalAudioStream* } } - if ( _enableFilter && shouldAttenuate ) { + if (_enableFilter && shouldAttenuate) { glm::vec3 relativePosition = streamToAdd->getPosition() - listeningNodeStream->getPosition(); - if ( relativePosition.z < 0 ) { // if the source is behind us + if (relativePosition.z < 0) { // if the source is behind us AudioFilterPEQ1s& penumbraFilter = streamToAdd->getFilter(); @@ -297,13 +297,13 @@ void AudioMixer::addStreamToMixForListeningNodeWithStream(PositionalAudioStream* penumbraFilterFrequency = 2000.0f; penumbraFilterSlope = 1.0f; // gentle slope -// printf("gain=%f,angle=%f\n",penumbraFilterGain,headPenumbraAngle); - + qDebug() << "penumbra gain=" << penumbraFilterGain << ", penumbraAngle=" << normalizedHeadPenumbraAngle; + // set the gain on both filter channels - penumbraFilter.setParameters(0,0,SAMPLE_RATE,penumbraFilterFrequency,penumbraFilterGain,penumbraFilterSlope); - penumbraFilter.setParameters(0,1,SAMPLE_RATE,penumbraFilterFrequency,penumbraFilterGain,penumbraFilterSlope); + penumbraFilter.setParameters(0, 0, SAMPLE_RATE, penumbraFilterFrequency, penumbraFilterGain, penumbraFilterSlope); + penumbraFilter.setParameters(0, 1, SAMPLE_RATE, penumbraFilterFrequency, penumbraFilterGain, penumbraFilterSlope); - penumbraFilter.render( _clientSamples, _clientSamples, NETWORK_BUFFER_LENGTH_SAMPLES_STEREO / 2); + penumbraFilter.render(_clientSamples, _clientSamples, NETWORK_BUFFER_LENGTH_SAMPLES_STEREO / 2); } } } diff --git a/libraries/audio/src/AudioFilter.h b/libraries/audio/src/AudioFilter.h index 3907e3e378..2be88322af 100644 --- a/libraries/audio/src/AudioFilter.h +++ b/libraries/audio/src/AudioFilter.h @@ -12,7 +12,7 @@ #ifndef hifi_AudioFilter_h #define hifi_AudioFilter_h -//////////////////////////////////////////////////////////////////////////////////////////// +// // Implements a standard biquad filter in "Direct Form 1" // Reference http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt // @@ -91,7 +91,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////////////////// +// // Implements common base class interface for all Audio Filter Objects // template< class T > @@ -152,7 +152,7 @@ public: } }; -//////////////////////////////////////////////////////////////////////////////////////////// +// // Implements a low-shelf filter using a biquad // class AudioFilterLSF : @@ -168,7 +168,7 @@ public: } }; -//////////////////////////////////////////////////////////////////////////////////////////// +// // Implements a hi-shelf filter using a biquad // class AudioFilterHSF : @@ -184,7 +184,7 @@ public: } }; -//////////////////////////////////////////////////////////////////////////////////////////// +// // Implements a single-band parametric EQ using a biquad "peaking EQ" configuration // class AudioFilterPEQ : diff --git a/libraries/audio/src/AudioFilterBank.cpp b/libraries/audio/src/AudioFilterBank.cpp index e46195b5b9..a2cf008fc9 100644 --- a/libraries/audio/src/AudioFilterBank.cpp +++ b/libraries/audio/src/AudioFilterBank.cpp @@ -10,7 +10,6 @@ // #include -#include #include #include "AudioRingBuffer.h" #include "AudioFilter.h" diff --git a/libraries/audio/src/AudioFilterBank.h b/libraries/audio/src/AudioFilterBank.h index c995a87b63..6721d077f7 100644 --- a/libraries/audio/src/AudioFilterBank.h +++ b/libraries/audio/src/AudioFilterBank.h @@ -12,7 +12,7 @@ #ifndef hifi_AudioFilterBank_h #define hifi_AudioFilterBank_h -//////////////////////////////////////////////////////////////////////////////////////////// +// // Helper/convenience class that implements a bank of Filter objects // template< typename T, const int N, const int C > @@ -150,7 +150,7 @@ public: }; -//////////////////////////////////////////////////////////////////////////////////////////// +// // Specializations of AudioFilterBank // typedef AudioFilterBank< AudioFilterLSF, 1, 1> AudioFilterLSF1m; // mono bank with one band of LSF