Merge pull request #3745 from Atlante45/ignore_penumbra

Ignore penumbra

assignment-client/src/audio/AudioMixer.cpp

@@ -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;
         
@@ -400,15 +400,12 @@ int AudioMixer::addStreamToMixForListeningNodeWithStream(AudioMixerClientData* l
             penumbraFilterGainR += (1.f - penumbraFilterGainR) * (1.f - distanceBetween / RADIUS_OF_HEAD);
         }
 
-
-#if 0
-            qDebug() << "gainL="
-                     << penumbraFilterGainL
-                     << "gainR="
-                     << penumbraFilterGainR
-                     << "angle="
-                     << -bearingRelativeAngleToSource;
-#endif
+        bool wantDebug = false;
+        if (wantDebug) {
+            qDebug() << "gainL=" << penumbraFilterGainL
+                     << "gainR=" << penumbraFilterGainR
+                     << "angle=" << -bearingRelativeAngleToSource;
+        }
         
         // Get our per listener/source data so we can get our filter
         AudioFilterHSF1s& penumbraFilter = listenerNodeData->getListenerSourcePairData(streamUUID)->getPenumbraFilter();

libraries/audio/src/AudioInjector.cpp

@@ -102,6 +102,8 @@ void AudioInjector::injectAudio() {
         quint8 volume = MAX_INJECTOR_VOLUME * _options.getVolume();
         packetStream << volume;
         
+        packetStream << _options.ignorePenumbra();
+        
         QElapsedTimer timer;
         timer.start();
         int nextFrame = 0;

libraries/audio/src/AudioInjectorOptions.cpp

@@ -18,6 +18,7 @@ AudioInjectorOptions::AudioInjectorOptions(QObject* parent) :
     _loop(false),
     _orientation(glm::vec3(0.0f, 0.0f, 0.0f)),
     _isStereo(false),
+    _ignorePenumbra(false),
     _loopbackAudioInterface(NULL)
 {
 }
@@ -28,6 +29,7 @@ AudioInjectorOptions::AudioInjectorOptions(const AudioInjectorOptions& other) {
     _loop = other._loop;
     _orientation = other._orientation;
     _isStereo = other._isStereo;
+    _ignorePenumbra = other._ignorePenumbra;
     _loopbackAudioInterface = other._loopbackAudioInterface;
 }
 
@@ -37,5 +39,6 @@ void AudioInjectorOptions::operator=(const AudioInjectorOptions& other) {
     _loop = other._loop;
     _orientation = other._orientation;
     _isStereo = other._isStereo;
+    _ignorePenumbra = other._ignorePenumbra;
     _loopbackAudioInterface = other._loopbackAudioInterface;
 }

libraries/audio/src/AudioInjectorOptions.h

@@ -29,6 +29,7 @@ class AudioInjectorOptions : public QObject {
     Q_PROPERTY(float volume READ getVolume WRITE setVolume)
     Q_PROPERTY(bool loop READ getLoop WRITE setLoop)
     Q_PROPERTY(bool isStereo READ isStereo WRITE setIsStereo)
+    Q_PROPERTY(bool ignorePenumbra READ ignorePenumbra WRITE setIgnorePenumbra)
 public:
     AudioInjectorOptions(QObject* parent = 0);
     AudioInjectorOptions(const AudioInjectorOptions& other);
@@ -49,6 +50,9 @@ public:
     const bool isStereo() const { return _isStereo; }
     void setIsStereo(const bool isStereo) { _isStereo = isStereo; }
     
+    const bool ignorePenumbra() const {return _ignorePenumbra; }
+    void setIgnorePenumbra(bool ignorePenumbra) { _ignorePenumbra = ignorePenumbra; }
+    
     AbstractAudioInterface* getLoopbackAudioInterface() const { return _loopbackAudioInterface; }
     void setLoopbackAudioInterface(AbstractAudioInterface* loopbackAudioInterface)
         { _loopbackAudioInterface = loopbackAudioInterface; }
@@ -58,6 +62,7 @@ private:
     bool _loop;
     glm::quat _orientation;
     bool _isStereo;
+    bool _ignorePenumbra;
     AbstractAudioInterface* _loopbackAudioInterface;
 };
 

libraries/audio/src/InboundAudioStream.h

@@ -113,10 +113,8 @@ public:
     bool lastPopSucceeded() const { return _lastPopSucceeded; };
     const AudioRingBuffer::ConstIterator& getLastPopOutput() const { return _lastPopOutput; }
 
-
     void setToStarved();
 
-
     void setSettings(const Settings& settings);
 
     void setMaxFramesOverDesired(int maxFramesOverDesired) { _maxFramesOverDesired = maxFramesOverDesired; }
@@ -163,7 +161,7 @@ public:
     float getWetLevel() const { return _wetLevel; }
     void setReverb(float reverbTime, float wetLevel);
     void clearReverb() { _hasReverb = false; }
-
+    
 public slots:
     /// 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.

libraries/audio/src/InjectedAudioStream.cpp

@@ -63,7 +63,9 @@ int InjectedAudioStream::parseStreamProperties(PacketType type,
     quint8 attenuationByte = 0;
     packetStream >> attenuationByte;
     _attenuationRatio = attenuationByte / (float)MAX_INJECTOR_VOLUME;
-
+    
+    packetStream >> _ignorePenumbra;
+    
     int numAudioBytes = packetAfterSeqNum.size() - packetStream.device()->pos();
     numAudioSamples = numAudioBytes / sizeof(int16_t);
 

libraries/audio/src/PositionalAudioStream.cpp

@@ -29,6 +29,7 @@ PositionalAudioStream::PositionalAudioStream(PositionalAudioStream::Type type, b
     _orientation(0.0f, 0.0f, 0.0f, 0.0f),
     _shouldLoopbackForNode(false),
     _isStereo(isStereo),
+    _ignorePenumbra(false),
     _lastPopOutputTrailingLoudness(0.0f),
     _lastPopOutputLoudness(0.0f)
 {

libraries/audio/src/PositionalAudioStream.h

@@ -39,6 +39,7 @@ public:
 
     bool shouldLoopbackForNode() const { return _shouldLoopbackForNode; }
     bool isStereo() const { return _isStereo; }
+    bool ignorePenumbraFilter() { return _ignorePenumbra; }
     PositionalAudioStream::Type getType() const { return _type; }
     const glm::vec3& getPosition() const { return _position; }
     const glm::quat& getOrientation() const { return _orientation; }
@@ -57,6 +58,8 @@ protected:
 
     bool _shouldLoopbackForNode;
     bool _isStereo;
+    // Ignore penumbra filter
+    bool _ignorePenumbra;
 
     float _lastPopOutputTrailingLoudness;
     float _lastPopOutputLoudness;

libraries/networking/src/PacketHeaders.cpp

@@ -54,6 +54,8 @@ PacketVersion versionForPacketType(PacketType type) {
             return 4;
         case PacketTypeMixedAudio:
             return 1;
+        case PacketTypeInjectAudio:
+            return 1;
         case PacketTypeAvatarData:
             return 3;
         case PacketTypeAvatarIdentity: