Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 13:58:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

windows/linux build break + addresses zappoman review comments

Browse source
This commit is contained in:
Craig Hansen-Sturm 2014-08-25 11:43:49 -07:00
parent fd5e3d61dc
commit bf6d34b6f3
4 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
assignment-client/src/audio/AudioMixer.cpp
View file

@ -270,10 +270,10 @@ void AudioMixer::addStreamToMixForListeningNodeWithStream(PositionalAudioStream*
} }
} }
if ( _enableFilter && shouldAttenuate ) { if (_enableFilter && shouldAttenuate) {
glm::vec3 relativePosition = streamToAdd->getPosition() - listeningNodeStream->getPosition(); 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(); AudioFilterPEQ1s& penumbraFilter = streamToAdd->getFilter();
@ -297,13 +297,13 @@ void AudioMixer::addStreamToMixForListeningNodeWithStream(PositionalAudioStream*
penumbraFilterFrequency = 2000.0f; penumbraFilterFrequency = 2000.0f;
penumbraFilterSlope = 1.0f; // gentle slope 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 // set the gain on both filter channels
penumbraFilter.setParameters(0,0,SAMPLE_RATE,penumbraFilterFrequency,penumbraFilterGain,penumbraFilterSlope); penumbraFilter.setParameters(0, 0, SAMPLE_RATE, penumbraFilterFrequency, penumbraFilterGain, penumbraFilterSlope);
penumbraFilter.setParameters(0,1,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);
} }
} }
} }

10
libraries/audio/src/AudioFilter.h
View file

@ -12,7 +12,7 @@
#ifndef hifi_AudioFilter_h #ifndef hifi_AudioFilter_h
#define hifi_AudioFilter_h #define hifi_AudioFilter_h
//////////////////////////////////////////////////////////////////////////////////////////// //
// Implements a standard biquad filter in "Direct Form 1" // Implements a standard biquad filter in "Direct Form 1"
// Reference http://www.musicdsp.org/files/Audio-EQ-Cookbook.txt // 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 // Implements common base class interface for all Audio Filter Objects
// //
template< class T > template< class T >
@ -152,7 +152,7 @@ public:
} }
}; };
//////////////////////////////////////////////////////////////////////////////////////////// //
// Implements a low-shelf filter using a biquad // Implements a low-shelf filter using a biquad
// //
class AudioFilterLSF : class AudioFilterLSF :
@ -168,7 +168,7 @@ public:
} }
}; };
//////////////////////////////////////////////////////////////////////////////////////////// //
// Implements a hi-shelf filter using a biquad // Implements a hi-shelf filter using a biquad
// //
class AudioFilterHSF : class AudioFilterHSF :
@ -184,7 +184,7 @@ public:
} }
}; };
//////////////////////////////////////////////////////////////////////////////////////////// //
// Implements a single-band parametric EQ using a biquad "peaking EQ" configuration // Implements a single-band parametric EQ using a biquad "peaking EQ" configuration
// //
class AudioFilterPEQ : class AudioFilterPEQ :

1
libraries/audio/src/AudioFilterBank.cpp
View file

@ -10,7 +10,6 @@
// //
#include <math.h> #include <math.h>
#include <vector.h>
#include <SharedUtil.h> #include <SharedUtil.h>
#include "AudioRingBuffer.h" #include "AudioRingBuffer.h"
#include "AudioFilter.h" #include "AudioFilter.h"

4
libraries/audio/src/AudioFilterBank.h
View file

@ -12,7 +12,7 @@
#ifndef hifi_AudioFilterBank_h #ifndef hifi_AudioFilterBank_h
#define hifi_AudioFilterBank_h #define hifi_AudioFilterBank_h
//////////////////////////////////////////////////////////////////////////////////////////// //
// Helper/convenience class that implements a bank of Filter objects // Helper/convenience class that implements a bank of Filter objects
// //
template< typename T, const int N, const int C > template< typename T, const int N, const int C >
@ -150,7 +150,7 @@ public:
}; };
//////////////////////////////////////////////////////////////////////////////////////////// //
// Specializations of AudioFilterBank // Specializations of AudioFilterBank
// //
typedef AudioFilterBank< AudioFilterLSF, 1, 1> AudioFilterLSF1m; // mono bank with one band of LSF typedef AudioFilterBank< AudioFilterLSF, 1, 1> AudioFilterLSF1m; // mono bank with one band of LSF