Merge pull request #40 from software-mansion-labs/feat/android/panner…

…-node

Feat/android/panner node

android/CMakeLists.txt

@@ -18,6 +18,7 @@ include_directories(
         ../cpp/OscillatorNode
         ../cpp/AudioNode
         ../cpp/GainNode
+        ../cpp/StereoPannerNode
         src/main/cpp
         ../node_modules/react-native/ReactCommon/jsi
         ../node_modules/react-native/ReactAndroid/src/main/jni/react/jni
@@ -31,6 +32,7 @@ add_library(react-native-audio-context SHARED
         src/main/cpp/AudioDestinationNode.h
         src/main/cpp/AudioNode
         src/main/cpp/GainNode
+        src/main/cpp/StereoPannerNode
 
         ../cpp/AudioContext/AudioContextHostObject
         ../cpp/AudioContext/AudioContextWrapper.h
@@ -51,6 +53,10 @@ add_library(react-native-audio-context SHARED
         ../cpp/GainNode/GainNodeHostObject
         ../cpp/GainNode/GainNodeWrapper.h
         ../cpp/GainNode/android/GainNodeWrapper.cpp
+
+        ../cpp/StereoPannerNode/StereoPannerNodeHostObject
+        ../cpp/StereoPannerNode/StereoPannerNodeWrapper.h
+        ../cpp/StereoPannerNode/android/StereoPannerNodeWrapper.cpp
 )
 
 find_package(ReactAndroid REQUIRED CONFIG)

android/src/main/cpp/AudioContext.cpp

@@ -13,23 +13,23 @@ namespace audiocontext
         AudioContextHostObject::createAndInstallFromWrapper(audioContextWrapper, jsContext);
     }
 
-  std::shared_ptr<OscillatorNode> AudioContext::createOscillator()
-  {
-    static const auto method = javaClassLocal()->getMethod<OscillatorNode()>("createOscillator");
-    auto oscillator = method(javaObject_.get());
-    auto oscillatorCppInstance = oscillator->cthis();
+    std::shared_ptr<OscillatorNode> AudioContext::createOscillator()
+    {
+        static const auto method = javaClassLocal()->getMethod<OscillatorNode()>("createOscillator");
+        auto oscillator = method(javaObject_.get());
+        auto oscillatorCppInstance = oscillator->cthis();
 
-    return std::shared_ptr<OscillatorNode>(oscillatorCppInstance);
-  }
+        return std::shared_ptr<OscillatorNode>(oscillatorCppInstance);
+    }
 
-  std::shared_ptr<AudioDestinationNode> AudioContext::getDestination()
-  {
-    static const auto method = javaClassLocal()->getMethod<AudioDestinationNode()>("getDestination");
-    auto destination = method(javaObject_.get());
-    auto destinationCppInstance = destination->cthis();
+    std::shared_ptr<AudioDestinationNode> AudioContext::getDestination()
+    {
+        static const auto method = javaClassLocal()->getMethod<AudioDestinationNode()>("getDestination");
+        auto destination = method(javaObject_.get());
+        auto destinationCppInstance = destination->cthis();
 
-    return std::shared_ptr<AudioDestinationNode>(destinationCppInstance);
-  }
+        return std::shared_ptr<AudioDestinationNode>(destinationCppInstance);
+    }
 
     std::shared_ptr<GainNode> AudioContext::createGain()
     {
@@ -40,4 +40,12 @@ namespace audiocontext
         return std::shared_ptr<GainNode>(gainCppInstance);
     }
 
+    std::shared_ptr<StereoPannerNode> AudioContext::createStereoPanner()
+    {
+        static const auto method = javaClassLocal()->getMethod<StereoPannerNode()>("createStereoPanner");
+        auto stereoPanner = method(javaObject_.get());
+        auto stereoPannerCppInstance = stereoPanner->cthis();
+
+        return std::shared_ptr<StereoPannerNode>(stereoPannerCppInstance);
+    }
 } // namespace audiocontext

android/src/main/cpp/AudioContext.h

@@ -10,6 +10,7 @@
 #include "OscillatorNode.h"
 #include "AudioDestinationNode.h"
 #include "GainNode.h"
+#include "StereoPannerNode.h"
 
 namespace audiocontext
 {
@@ -38,9 +39,11 @@ namespace audiocontext
       });
     }
 
-    std::shared_ptr<OscillatorNode> createOscillator();
     std::shared_ptr<AudioDestinationNode> getDestination();
+    std::shared_ptr<OscillatorNode> createOscillator();
     std::shared_ptr<GainNode> createGain();
+    std::shared_ptr<StereoPannerNode> createStereoPanner();
+
 
     void install(jlong jsContext);
 

android/src/main/cpp/StereoPannerNode.cpp

@@ -0,0 +1,16 @@
+#include "StereoPannerNode.h"
+
+namespace audiocontext{
+
+    using namespace facebook::jni;
+
+    double StereoPannerNode::getPan(){
+        static const auto method = javaClassLocal()->getMethod<jdouble()>("getPan");
+        return method(javaObject_.get());
+    }
+
+    void StereoPannerNode::setPan(double pan){
+        static const auto method = javaClassLocal()->getMethod<void(jdouble)>("setPan");
+        method(javaObject_.get(), pan);
+    }
+}

android/src/main/cpp/StereoPannerNode.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <react/jni/CxxModuleWrapper.h>
+#include <react/jni/JMessageQueueThread.h>
+#include <memory>
+#include "AudioNode.h"
+
+namespace audiocontext {
+
+    using namespace facebook;
+    using namespace facebook::jni;
+
+    class StereoPannerNode : public jni::HybridClass<StereoPannerNode, AudioNode> {
+    public:
+        static auto constexpr kJavaDescriptor = "Lcom/audiocontext/nodes/StereoPannerNode;";
+
+        double getPan();
+
+        void setPan(double pan);
+    };
+
+} // namespace audiocontext

android/src/main/java/com/audiocontext/context/AudioContext.kt

@@ -2,6 +2,7 @@ package com.audiocontext.context
 
 import com.audiocontext.nodes.AudioDestinationNode
 import com.audiocontext.nodes.GainNode
+import com.audiocontext.nodes.StereoPannerNode
 import com.audiocontext.nodes.oscillator.OscillatorNode
 import com.facebook.jni.HybridData
 
@@ -32,4 +33,8 @@ class AudioContext() : BaseAudioContext {
   override fun createGain(): GainNode {
     return GainNode(this)
   }
+
+  override fun createStereoPanner(): StereoPannerNode {
+    return StereoPannerNode(this)
+  }
 }

android/src/main/java/com/audiocontext/context/BaseAudioContext.kt

@@ -2,6 +2,7 @@ package com.audiocontext.context
 
 import com.audiocontext.nodes.AudioDestinationNode
 import com.audiocontext.nodes.GainNode
+import com.audiocontext.nodes.StereoPannerNode
 import com.audiocontext.nodes.oscillator.OscillatorNode
 
 interface BaseAudioContext {
@@ -10,4 +11,5 @@ interface BaseAudioContext {
 
   abstract fun createOscillator(): OscillatorNode
   abstract fun createGain(): GainNode
+  abstract fun createStereoPanner(): StereoPannerNode
 }

android/src/main/java/com/audiocontext/nodes/AudioDestinationNode.kt

@@ -1,6 +1,5 @@
 package com.audiocontext.nodes
 
-import android.media.AudioTrack
 import com.audiocontext.context.BaseAudioContext
 import com.facebook.jni.HybridData
 
@@ -17,7 +16,14 @@ class AudioDestinationNode(context: BaseAudioContext): AudioNode(context) {
     }
   }
 
-  override fun process(buffer: ShortArray, audioTrack: AudioTrack) {
-    audioTrack.write(buffer, 0, buffer.size)
+  private fun setVolumeAndPanning(playbackParameters: PlaybackParameters) {
+    val leftPan = playbackParameters.gain * playbackParameters.leftPan
+    val rightPan = playbackParameters.gain * playbackParameters.rightPan
+    playbackParameters.audioTrack.setStereoVolume(leftPan.toFloat(), rightPan.toFloat())
+  }
+
+  override fun process(playbackParameters: PlaybackParameters) {
+    setVolumeAndPanning(playbackParameters)
+    playbackParameters.audioTrack.write(playbackParameters.buffer, 0, playbackParameters.buffer.size)
   }
 }

android/src/main/java/com/audiocontext/nodes/AudioNode.kt

@@ -1,7 +1,5 @@
 package com.audiocontext.nodes
 
-import android.media.AudioTrack
-import android.util.Log
 import com.audiocontext.context.BaseAudioContext
 import com.facebook.jni.HybridData
 
@@ -35,7 +33,7 @@ abstract class AudioNode(val context: BaseAudioContext) {
     connectedNodes.clear()
   }
 
-  open fun process(buffer: ShortArray, audioTrack: AudioTrack) {
-    connectedNodes.forEach { it.process(buffer, audioTrack) }
+  open fun process(playbackParameters: PlaybackParameters) {
+    connectedNodes.forEach { it.process(playbackParameters) }
   }
 }

android/src/main/java/com/audiocontext/nodes/GainNode.kt

@@ -1,6 +1,5 @@
 package com.audiocontext.nodes
 
-import android.media.AudioTrack
 import com.audiocontext.context.BaseAudioContext
 import com.facebook.jni.HybridData
 
@@ -15,8 +14,8 @@ class GainNode(context: BaseAudioContext): AudioNode(context) {
 
   private val mHybridData: HybridData? = initHybrid();
 
-  override fun process(buffer: ShortArray, audioTrack: AudioTrack) {
-    audioTrack.setVolume(gain.toFloat())
-    super.process(buffer, audioTrack)
+  override fun process(playbackParameters: PlaybackParameters) {
+    playbackParameters.gain = gain
+    super.process(playbackParameters)
   }
 }

android/src/main/java/com/audiocontext/nodes/PlaybackParameters.kt

@@ -0,0 +1,9 @@
+package com.audiocontext.nodes
+
+import android.media.AudioTrack
+
+class PlaybackParameters(val audioTrack: AudioTrack, var buffer: ShortArray) {
+  var leftPan = 1.0
+  var rightPan = 1.0
+  var gain = 1.0
+}

android/src/main/java/com/audiocontext/nodes/StereoPannerNode.kt

@@ -0,0 +1,23 @@
+package com.audiocontext.nodes
+
+import com.audiocontext.context.BaseAudioContext
+import com.facebook.jni.HybridData
+import kotlin.math.min
+
+class StereoPannerNode(context: BaseAudioContext): AudioNode(context) {
+  override val numberOfInputs: Int = 1
+  override val numberOfOutputs: Int = 1
+  private var pan: Double = 0.0
+    get() = field
+    set(value) {
+      field = value
+    }
+
+  private val mHybridData: HybridData? = initHybrid();
+
+  override fun process(playbackParameters: PlaybackParameters) {
+    playbackParameters.leftPan = min(1.0 - pan, 1.0)
+    playbackParameters.rightPan = min(1.0 + pan, 1.0)
+    super.process(playbackParameters)
+  }
+}

android/src/main/java/com/audiocontext/nodes/oscillator/OscillatorNode.kt

@@ -7,6 +7,7 @@ import android.media.AudioTrack
 import android.util.Log
 import com.audiocontext.context.BaseAudioContext
 import com.audiocontext.nodes.AudioScheduledSourceNode
+import com.audiocontext.nodes.PlaybackParameters
 import com.facebook.jni.HybridData
 import com.facebook.react.bridge.ReactApplicationContext
 import kotlin.math.abs
@@ -28,11 +29,10 @@ class OscillatorNode(context: BaseAudioContext) : AudioScheduledSourceNode(conte
     }
   private var waveType: WaveType = WaveType.SINE
 
-  private val audioTrack: AudioTrack
+  private var playbackParameters: PlaybackParameters
   @Volatile private var isPlaying: Boolean = false
   private var playbackThread: Thread? = null
   private var stopThread: Thread? = null
-  private var buffer: ShortArray = ShortArray(1024)
 
   private val mHybridData: HybridData? = initHybrid();
 
@@ -58,7 +58,10 @@ class OscillatorNode(context: BaseAudioContext) : AudioScheduledSourceNode(conte
       .setChannelMask(AudioFormat.CHANNEL_OUT_MONO)
       .build()
 
-    this.audioTrack = AudioTrack(audioAttributes, audioFormat, bufferSize, AudioTrack.MODE_STREAM, AudioManager.AUDIO_SESSION_ID_GENERATE)
+    val audioTrack = AudioTrack(audioAttributes, audioFormat, bufferSize, AudioTrack.MODE_STREAM, AudioManager.AUDIO_SESSION_ID_GENERATE)
+    val buffer = ShortArray(bufferSize)
+
+    this.playbackParameters = PlaybackParameters(audioTrack, buffer)
   }
 
   fun getWaveType(): String {
@@ -82,7 +85,7 @@ class OscillatorNode(context: BaseAudioContext) : AudioScheduledSourceNode(conte
       }
 
       isPlaying = true
-      audioTrack.play()
+      playbackParameters.audioTrack.play()
       generateSound()
     }.apply { start() }
   }
@@ -100,7 +103,7 @@ class OscillatorNode(context: BaseAudioContext) : AudioScheduledSourceNode(conte
       }
 
       isPlaying = false
-      audioTrack.stop()
+      playbackParameters.audioTrack.stop()
       playbackThread?.join()
     }.apply { start() }
 
@@ -114,12 +117,12 @@ class OscillatorNode(context: BaseAudioContext) : AudioScheduledSourceNode(conte
     while(isPlaying) {
       phaseChange = 2 * Math.PI * (frequency + detune) / context.sampleRate
 
-      for(i in buffer.indices) {
-        buffer[i] = WaveType.getWaveBufferElement(wavePhase, waveType)
+      for(i in playbackParameters.buffer.indices) {
+        playbackParameters.buffer[i] = WaveType.getWaveBufferElement(wavePhase, waveType)
         wavePhase += phaseChange
       }
-      process(buffer, audioTrack)
+      process(playbackParameters)
     }
-    audioTrack.flush()
+    playbackParameters.audioTrack.flush()
   }
 }

cpp/AudioContext/AudioContextHostObject.cpp

@@ -5,8 +5,10 @@ namespace audiocontext {
 
     std::vector<jsi::PropNameID> AudioContextHostObject::getPropertyNames(jsi::Runtime& runtime) {
         std::vector<jsi::PropNameID> propertyNames;
-        propertyNames.push_back(jsi::PropNameID::forUtf8(runtime, "createOscillator"));
         propertyNames.push_back(jsi::PropNameID::forUtf8(runtime, "destination"));
+        propertyNames.push_back(jsi::PropNameID::forUtf8(runtime, "createOscillator"));
+        propertyNames.push_back(jsi::PropNameID::forUtf8(runtime, "createGain"));
+        propertyNames.push_back(jsi::PropNameID::forUtf8(runtime, "createStereoPanner"));
         return propertyNames;
     }
 
@@ -35,6 +37,14 @@ namespace audiocontext {
             });
         }
 
+        if(propName == "createStereoPanner") {
+            return jsi::Function::createFromHostFunction(runtime, propNameId, 0, [this](jsi::Runtime& runtime, const jsi::Value& thisValue, const jsi::Value* arguments, size_t count) -> jsi::Value {
+                auto stereoPanner = wrapper_->createStereoPanner();
+                auto stereoPannerHostObject = StereoPannerNodeHostObject::createFromWrapper(stereoPanner);
+                return jsi::Object::createFromHostObject(runtime, stereoPannerHostObject);
+            });
+        }
+
         throw std::runtime_error("Not yet implemented!");
     }
 

cpp/AudioContext/AudioContextHostObject.h

@@ -7,6 +7,7 @@
 #include "OscillatorNodeHostObject.h"
 #include "AudioDestinationNodeHostObject.h"
 #include "GainNodeHostObject.h"
+#include "StereoPannerNodeHostObject.h"
 
 namespace audiocontext
 {

cpp/AudioContext/AudioContextWrapper.h

@@ -5,6 +5,7 @@
 #include "OscillatorNodeWrapper.h"
 #include "AudioDestinationNodeWrapper.h"
 #include "GainNodeWrapper.h"
+#include "StereoPannerNodeWrapper.h"
 
 #ifdef ANDROID
 #include "AudioContext.h"
@@ -38,5 +39,6 @@ namespace audiocontext {
         std::shared_ptr<OscillatorNodeWrapper> createOscillator();
         std::shared_ptr<AudioDestinationNodeWrapper> getDestination();
         std::shared_ptr<GainNodeWrapper> createGain();
+        std::shared_ptr<StereoPannerNodeWrapper> createStereoPanner();
     };
 } // namespace audiocontext

cpp/AudioContext/android/AudioContextWrapper.cpp

@@ -17,5 +17,10 @@ namespace audiocontext {
         auto gain = audiocontext_->createGain();
         return std::make_shared<GainNodeWrapper>(gain);
     }
+
+    std::shared_ptr<StereoPannerNodeWrapper> AudioContextWrapper::createStereoPanner() {
+        auto panner = audiocontext_->createStereoPanner();
+        return std::make_shared<StereoPannerNodeWrapper>(panner);
+    }
 } // namespace audiocontext
 #endif