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

ignore penumbra member variable

Browse source
This commit is contained in:
Atlante45 2014-11-04 16:44:39 +01:00
parent c7b8f7a792
commit fb33634171
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -353,7 +353,7 @@ int AudioMixer::addStreamToMixForListeningNodeWithStream(AudioMixerClientData* l
} }
} }
if (!sourceIsSelf && _enableFilter) { if (!sourceIsSelf && _enableFilter && !streamToAdd->ignorePenumbraFilter()) {
const float TWO_OVER_PI = 2.0f / PI; const float TWO_OVER_PI = 2.0f / PI;

3
libraries/audio/src/InboundAudioStream.cpp
View file

@ -45,7 +45,8 @@ InboundAudioStream::InboundAudioStream(int numFrameSamples, int numFramesCapacit
_currentJitterBufferFrames(0), _currentJitterBufferFrames(0),
_timeGapStatsForStatsPacket(0, STATS_FOR_STATS_PACKET_WINDOW_SECONDS), _timeGapStatsForStatsPacket(0, STATS_FOR_STATS_PACKET_WINDOW_SECONDS),
_repetitionWithFade(settings._repetitionWithFade), _repetitionWithFade(settings._repetitionWithFade),
_hasReverb(false) _hasReverb(false),
_ignorePenumbra(false)
{ {
} }

8
libraries/audio/src/InboundAudioStream.h
View file

@ -47,6 +47,7 @@ const bool DEFAULT_REPETITION_WITH_FADE = true;
// Audio Env bitset // Audio Env bitset
const int HAS_REVERB_BIT = 0; // 1st bit const int HAS_REVERB_BIT = 0; // 1st bit
const int IGNORE_PENUMBRA = 1; // 2nd bit
class InboundAudioStream : public NodeData { class InboundAudioStream : public NodeData {
Q_OBJECT Q_OBJECT
@ -113,10 +114,8 @@ public:
bool lastPopSucceeded() const { return _lastPopSucceeded; }; bool lastPopSucceeded() const { return _lastPopSucceeded; };
const AudioRingBuffer::ConstIterator& getLastPopOutput() const { return _lastPopOutput; } const AudioRingBuffer::ConstIterator& getLastPopOutput() const { return _lastPopOutput; }
void setToStarved(); void setToStarved();
void setSettings(const Settings& settings); void setSettings(const Settings& settings);
void setMaxFramesOverDesired(int maxFramesOverDesired) { _maxFramesOverDesired = maxFramesOverDesired; } void setMaxFramesOverDesired(int maxFramesOverDesired) { _maxFramesOverDesired = maxFramesOverDesired; }
@ -164,6 +163,8 @@ public:
void setReverb(float reverbTime, float wetLevel); void setReverb(float reverbTime, float wetLevel);
void clearReverb() { _hasReverb = false; } void clearReverb() { _hasReverb = false; }
bool ignorePenumbraFilter() { return _ignorePenumbra; }
public slots: public slots:
/// This function should be called every second for all the stats to function properly. If dynamic jitter buffers /// This function should be called every second for all the stats to function properly. If dynamic jitter buffers
/// is enabled, those stats are used to calculate _desiredJitterBufferFrames. /// is enabled, those stats are used to calculate _desiredJitterBufferFrames.
@ -257,6 +258,9 @@ protected:
bool _hasReverb; bool _hasReverb;
float _reverbTime; float _reverbTime;
float _wetLevel; float _wetLevel;
// Ignore penumbra filter
bool _ignorePenumbra;
}; };
float calculateRepeatedFrameFadeFactor(int indexOfRepeat); float calculateRepeatedFrameFadeFactor(int indexOfRepeat);