react-native-audio-api 0.6.5-rc.0 → 0.6.5

package/README.md

@@ -4,7 +4,10 @@
 
 [![NPM latest](https://img.shields.io/npm/v/react-native-audio-api/latest)](https://www.npmjs.com/package/react-native-audio-api)
 [![NPM next](https://img.shields.io/npm/v/react-native-audio-api/next)](https://www.npmjs.com/package/react-native-audio-api?activeTab=versions)
-[![github ci](https://img.shields.io/github/actions/workflow/status/software-mansion/react-native-audio-api/ci.yml)](https://github.com/software-mansion/react-native-audio-api/actions)
+[![NPM nightly](https://img.shields.io/npm/v/react-native-audio-api/audio-api-nightly)](https://www.npmjs.com/package/react-native-audio-api?activeTab=versions)
+[![github ci](https://github.com/software-mansion/react-native-audio-api/actions/workflows/ci.yml/badge.svg)](https://github.com/software-mansion/react-native-audio-api/actions/workflows/ci.yml)
+[![NPM Audio Api publish nightly](https://github.com/software-mansion/react-native-audio-api/actions/workflows/npm-publish-nightly.yml/badge.svg)](https://github.com/software-mansion/react-native-audio-api/actions/workflows/npm-publish-nightly.yml)
+[![Audio Api tests](https://github.com/software-mansion/react-native-audio-api/actions/workflows/tests.yml/badge.svg)](https://github.com/software-mansion/react-native-audio-api/actions/workflows/tests.yml)
 
 `react-native-audio-api` provides system for controlling audio in React Native environment compatible with Web Audio API specification,
 allowing developers to generate and modify audio in exact same way it is possible in browsers.

package/android/src/main/cpp/audioapi/android/AudioAPIModule.cpp

@@ -68,7 +68,9 @@ void AudioAPIModule::invokeHandlerWithEventNameAndEventBody(
     }
   }
 
-  audioEventHandlerRegistry_->invokeHandlerWithEventBody(
-      eventName->toStdString(), body);
+  if (audioEventHandlerRegistry_ != nullptr) {
+    audioEventHandlerRegistry_->invokeHandlerWithEventBody(
+        eventName->toStdString(), body);
+  }
 }
 } // namespace audioapi

package/android/src/main/cpp/audioapi/android/core/AudioDecoder.cpp

@@ -7,7 +7,7 @@
 #define MINIAUDIO_IMPLEMENTATION
 #include <audioapi/libs/miniaudio/miniaudio.h>
 
-#include <android/log.h>
+// #include <android/log.h>
 
 namespace audioapi {
 
@@ -18,12 +18,11 @@ std::shared_ptr<AudioBus> AudioDecoder::decodeWithFilePath(
       ma_decoder_config_init(ma_format_f32, 2, static_cast<int>(sampleRate_));
   ma_result result = ma_decoder_init_file(path.c_str(), &config, &decoder);
   if (result != MA_SUCCESS) {
-    __android_log_print(
-        ANDROID_LOG_ERROR,
-        "AudioDecoder",
-        "Failed to initialize decoder for file: %s",
-        path.c_str());
-
+    // __android_log_print(
+    //   ANDROID_LOG_ERROR,
+    //   "AudioDecoder",
+    //   "Failed to initialize decoder for file: %s",
+    //   path.c_str());
     ma_decoder_uninit(&decoder);
 
     return nullptr;
@@ -40,7 +39,7 @@ std::shared_ptr<AudioBus> AudioDecoder::decodeWithFilePath(
   ma_decoder_read_pcm_frames(&decoder, buffer, totalFrameCount, &framesDecoded);
 
   if (framesDecoded == 0) {
-    __android_log_print(ANDROID_LOG_ERROR, "AudioDecoder", "Failed to decode");
+    // __android_log_print(ANDROID_LOG_ERROR, "AudioDecoder", "Failed to decode");
 
     delete[] buffer;
     ma_decoder_uninit(&decoder);
@@ -70,11 +69,10 @@ std::shared_ptr<AudioBus> AudioDecoder::decodeWithMemoryBlock(
       ma_decoder_config_init(ma_format_f32, 2, static_cast<int>(sampleRate_));
   ma_result result = ma_decoder_init_memory(data, size, &config, &decoder);
   if (result != MA_SUCCESS) {
-    __android_log_print(
-        ANDROID_LOG_ERROR,
-        "AudioDecoder",
-        "Failed to initialize decoder for memory block");
-
+    // __android_log_print(
+    //   ANDROID_LOG_ERROR,
+    //   "AudioDecoder",
+    //   "Failed to initialize decoder for memory block");
     ma_decoder_uninit(&decoder);
 
     return nullptr;
@@ -90,7 +88,7 @@ std::shared_ptr<AudioBus> AudioDecoder::decodeWithMemoryBlock(
   ma_uint64 framesDecoded;
   ma_decoder_read_pcm_frames(&decoder, buffer, totalFrameCount, &framesDecoded);
   if (framesDecoded == 0) {
-    __android_log_print(ANDROID_LOG_ERROR, "AudioDecoder", "Failed to decode");
+    // __android_log_print(ANDROID_LOG_ERROR, "AudioDecoder", "Failed to decode");
 
     delete[] buffer;
     ma_decoder_uninit(&decoder);

package/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp

@@ -1,3 +1,4 @@
+#include <android/log.h>
 #include <audioapi/android/core/AudioPlayer.h>
 #include <audioapi/core/AudioContext.h>
 #include <audioapi/core/Constants.h>
@@ -8,23 +9,40 @@ namespace audioapi {
 
 AudioPlayer::AudioPlayer(
     const std::function<void(std::shared_ptr<AudioBus>, int)> &renderAudio,
-    float sampleRate)
-    : renderAudio_(renderAudio), channelCount_(2) {
+    float sampleRate,
+    int channelCount)
+    : renderAudio_(renderAudio),
+      sampleRate_(sampleRate),
+      channelCount_(channelCount) {
+  isInitialized_ = openAudioStream();
+}
+
+bool AudioPlayer::openAudioStream() {
   AudioStreamBuilder builder;
 
   builder.setSharingMode(SharingMode::Exclusive)
       ->setFormat(AudioFormat::Float)
       ->setFormatConversionAllowed(true)
       ->setPerformanceMode(PerformanceMode::None)
-      ->setChannelCount(2)
+      ->setChannelCount(channelCount_)
       ->setSampleRateConversionQuality(SampleRateConversionQuality::Medium)
       ->setDataCallback(this)
-      ->setSampleRate(static_cast<int>(sampleRate))
-      ->openStream(mStream_);
+      ->setSampleRate(static_cast<int>(sampleRate_))
+      ->setErrorCallback(this);
+
+  auto result = builder.openStream(mStream_);
+  if (result != oboe::Result::OK || mStream_ == nullptr) {
+    __android_log_print(
+        ANDROID_LOG_ERROR,
+        "AudioPlayer",
+        "Failed to open stream: %s",
+        oboe::convertToText(result));
+    return false;
+  }
 
-  sampleRate_ = sampleRate;
-  mBus_ = std::make_shared<AudioBus>(RENDER_QUANTUM_SIZE, 2, sampleRate_);
-  isInitialized_ = true;
+  mBus_ = std::make_shared<AudioBus>(
+      RENDER_QUANTUM_SIZE, channelCount_, sampleRate_);
+  return true;
 }
 
 void AudioPlayer::start() {
@@ -92,4 +110,16 @@ DataCallbackResult AudioPlayer::onAudioReady(
   return DataCallbackResult::Continue;
 }
 
+void AudioPlayer::onErrorAfterClose(
+    oboe::AudioStream *stream,
+    oboe::Result error) {
+  if (error == oboe::Result::ErrorDisconnected) {
+    cleanup();
+    if (openAudioStream()) {
+      isInitialized_ = true;
+      resume();
+    }
+  }
+}
+
 } // namespace audioapi

package/android/src/main/cpp/audioapi/android/core/AudioPlayer.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include <oboe/Oboe.h>
+#include <cassert>
 #include <functional>
 #include <memory>
-#include <cassert>
 
 namespace audioapi {
 
@@ -12,11 +12,12 @@ using namespace oboe;
 class AudioContext;
 class AudioBus;
 
-class AudioPlayer : public AudioStreamDataCallback {
+class AudioPlayer : public AudioStreamDataCallback, AudioStreamErrorCallback {
  public:
   AudioPlayer(
       const std::function<void(std::shared_ptr<AudioBus>, int)> &renderAudio,
-      float sampleRate);
+      float sampleRate,
+      int channelCount);
 
   void start();
   void stop();
@@ -29,6 +30,9 @@ class AudioPlayer : public AudioStreamDataCallback {
       void *audioData,
       int32_t numFrames) override;
 
+  void onErrorAfterClose(AudioStream * /* audioStream */, Result /* error */)
+      override;
+
  private:
   std::function<void(std::shared_ptr<AudioBus>, int)> renderAudio_;
   std::shared_ptr<AudioStream> mStream_;
@@ -36,6 +40,8 @@ class AudioPlayer : public AudioStreamDataCallback {
   bool isInitialized_ = false;
   float sampleRate_;
   int channelCount_;
+
+  bool openAudioStream();
 };
 
 } // namespace audioapi

package/android/src/main/java/com/swmansion/audioapi/AudioAPIModule.kt

@@ -60,7 +60,7 @@ class AudioAPIModule(
     enabled: Boolean,
     promise: Promise?,
   ) {
-    // noting to do here
+    promise?.resolve(true)
   }
 
   override fun setAudioSessionOptions(
@@ -103,4 +103,8 @@ class AudioAPIModule(
   override fun checkRecordingPermissions(promise: Promise) {
     promise.resolve(MediaSessionManager.checkRecordingPermissions())
   }
+
+  override fun getDevicesInfo(promise: Promise) {
+    promise.resolve(MediaSessionManager.getDevicesInfo())
+  }
 }

package/android/src/main/java/com/swmansion/audioapi/system/LockScreenManager.kt

@@ -211,7 +211,7 @@ class LockScreenManager(
           .Builder(
             "SkipBackward",
             "Skip Backward",
-            R.drawable.skip_backward_10,
+            R.drawable.skip_backward_15,
           ).build(),
       )
     }
@@ -224,7 +224,7 @@ class LockScreenManager(
           .Builder(
             "SkipForward",
             "Skip Forward",
-            R.drawable.skip_forward_10,
+            R.drawable.skip_forward_15,
           ).build(),
       )
     }

package/android/src/main/java/com/swmansion/audioapi/system/MediaNotificationManager.kt

@@ -144,8 +144,8 @@ class MediaNotificationManager(
     stop = createAction("stop", "Stop", mask, PlaybackStateCompat.ACTION_STOP, stop)
     next = createAction("next", "Next", mask, PlaybackStateCompat.ACTION_SKIP_TO_NEXT, next)
     previous = createAction("previous", "Previous", mask, PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS, previous)
-    skipForward = createAction("skip_forward_10", "Skip Forward", mask, PlaybackStateCompat.ACTION_FAST_FORWARD, skipForward)
-    skipBackward = createAction("skip_backward_10", "Skip Backward", mask, PlaybackStateCompat.ACTION_REWIND, skipBackward)
+    skipForward = createAction("skip_forward_15", "Skip Forward", mask, PlaybackStateCompat.ACTION_FAST_FORWARD, skipForward)
+    skipBackward = createAction("skip_backward_15", "Skip Backward", mask, PlaybackStateCompat.ACTION_REWIND, skipBackward)
   }
 
   private fun createAction(

package/android/src/main/java/com/swmansion/audioapi/system/MediaSessionManager.kt

@@ -9,6 +9,7 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.content.ServiceConnection
 import android.content.pm.PackageManager
+import android.media.AudioDeviceInfo
 import android.media.AudioManager
 import android.os.Build
 import android.os.IBinder
@@ -17,6 +18,7 @@ import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
+import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.modules.core.PermissionAwareActivity
@@ -186,4 +188,48 @@ object MediaSessionManager {
     mChannel.lockscreenVisibility = NotificationCompat.VISIBILITY_PUBLIC
     notificationManager.createNotificationChannel(mChannel)
   }
+
+  @RequiresApi(Build.VERSION_CODES.O)
+  fun getDevicesInfo(): ReadableMap {
+    val availableInputs = Arguments.createArray()
+    val availableOutputs = Arguments.createArray()
+
+    for (inputDevice in this.audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS)) {
+      val deviceInfo = Arguments.createMap()
+      deviceInfo.putString("name", inputDevice.productName.toString())
+      deviceInfo.putString("type", parseDeviceType(inputDevice))
+
+      availableInputs.pushMap(deviceInfo)
+    }
+
+    for (outputDevice in this.audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)) {
+      val deviceInfo = Arguments.createMap()
+      deviceInfo.putString("name", outputDevice.productName.toString())
+      deviceInfo.putString("type", parseDeviceType(outputDevice))
+
+      availableOutputs.pushMap(deviceInfo)
+    }
+
+    val devicesInfo = Arguments.createMap()
+
+    devicesInfo.putArray("currentInputs", Arguments.createArray())
+    devicesInfo.putArray("currentOutputs", Arguments.createArray())
+    devicesInfo.putArray("availableInputs", availableInputs)
+    devicesInfo.putArray("availableOutputs", availableOutputs)
+
+    return devicesInfo
+  }
+
+  @RequiresApi(Build.VERSION_CODES.O)
+  fun parseDeviceType(device: AudioDeviceInfo): String =
+    when (device.type) {
+      AudioDeviceInfo.TYPE_BUILTIN_MIC -> "Built-in Mic"
+      AudioDeviceInfo.TYPE_BUILTIN_EARPIECE -> "Built-in Earpiece"
+      AudioDeviceInfo.TYPE_BUILTIN_SPEAKER -> "Built-in Speaker"
+      AudioDeviceInfo.TYPE_WIRED_HEADSET -> "Wired Headset"
+      AudioDeviceInfo.TYPE_WIRED_HEADPHONES -> "Wired Headphones"
+      AudioDeviceInfo.TYPE_BLUETOOTH_A2DP -> "Bluetooth A2DP"
+      AudioDeviceInfo.TYPE_BLUETOOTH_SCO -> "Bluetooth SCO"
+      else -> "Other (${device.type})"
+    }
 }

package/android/src/main/res/drawable/skip_backward_15.xml

@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,6L12,2l-5,5l5,5L12,8c3.31,0 6,2.69 6,6s-2.69,6 -6,6s-6,-2.69 -6,-6h-2c0,4.42 3.58,8 8,8s8,-3.58 8,-8S16.42,6 12,6z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M10.9,17h-0.85v-3.26l-1.01,0.31v-0.69l1.77,-0.63h0.09L10.9,17z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M13.33,16.556C12.89,16.556 12.75,16.246 12.73,15.996L11.89,15.996C11.92,16.846 12.68,17.246 13.33,17.246C14.26,17.246 14.77,16.616 14.77,15.816C14.77,14.486 13.8,14.376 13.47,14.376C13.27,14.376 13.04,14.426 12.83,14.536L12.94,13.616L14.64,13.616L14.64,12.906L12.25,12.906L12,15.076L12.67,15.246C12.8,15.116 12.95,15.016 13.24,15.016C13.64,15.016 13.93,15.246 13.93,15.766C13.92,15.816 13.95,16.556 13.33,16.556Z"
+      android:strokeWidth="1"
+      android:fillColor="#FFFFFF"/>
+</vector>

package/android/src/main/res/drawable/skip_forward_15.xml

@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18,14c0,3.31 -2.69,6 -6,6s-6,-2.69 -6,-6s2.69,-6 6,-6v4l5,-5l-5,-5v4c-4.42,0 -8,3.58 -8,8c0,4.42 3.58,8 8,8s8,-3.58 8,-8L18,14z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M10.86,16.94l0,-4.27l-0.09,0l-1.77,0.63l0,0.69l1.01,-0.31l0,3.26z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M13.212,16.452C12.772,16.452 12.632,16.142 12.612,15.892L11.772,15.892C11.802,16.742 12.562,17.142 13.212,17.142C14.142,17.142 14.652,16.512 14.652,15.712C14.652,14.382 13.682,14.272 13.352,14.272C13.152,14.272 12.922,14.322 12.712,14.432L12.822,13.512L14.522,13.512L14.522,12.802L12.132,12.802L11.882,14.972L12.552,15.142C12.682,15.012 12.832,14.912 13.122,14.912C13.522,14.912 13.812,15.142 13.812,15.662C13.802,15.712 13.832,16.452 13.212,16.452Z"
+      android:strokeWidth="1"
+      android:fillColor="#FFFFFF"/>
+</vector>

package/android/src/oldarch/NativeAudioAPIModuleSpec.java

@@ -77,4 +77,8 @@
    @ReactMethod
    @DoNotStrip
    public abstract void checkRecordingPermissions(Promise promise);
+
+   @ReactMethod
+   @DoNotStrip
+   public abstract void getDevicesInfo(Promise promise);
  }

package/common/cpp/audioapi/HostObjects/AudioBufferBaseSourceNodeHostObject.h

@@ -18,13 +18,23 @@ class AudioBufferBaseSourceNodeHostObject
             : AudioScheduledSourceNodeHostObject(node) {
         addGetters(
                 JSI_EXPORT_PROPERTY_GETTER(AudioBufferBaseSourceNodeHostObject, detune),
-                JSI_EXPORT_PROPERTY_GETTER(AudioBufferBaseSourceNodeHostObject, playbackRate));
+                JSI_EXPORT_PROPERTY_GETTER(AudioBufferBaseSourceNodeHostObject, playbackRate),
+                JSI_EXPORT_PROPERTY_GETTER(AudioBufferBaseSourceNodeHostObject, onPositionChangedInterval));
 
         addSetters(
                 JSI_EXPORT_PROPERTY_SETTER(AudioBufferBaseSourceNodeHostObject, onPositionChanged),
                 JSI_EXPORT_PROPERTY_SETTER(AudioBufferBaseSourceNodeHostObject, onPositionChangedInterval));
     }
 
+    ~AudioBufferBaseSourceNodeHostObject() {
+        auto sourceNode =
+                std::static_pointer_cast<AudioBufferBaseSourceNode>(node_);
+
+      // When JSI object is garbage collected (together with the eventual callback),
+      // underlying source node might still be active and try to call the non-existing callback.
+      sourceNode->clearOnPositionChangedCallback();
+    }
+
     JSI_PROPERTY_GETTER(detune) {
         auto sourceNode =
                 std::static_pointer_cast<AudioBufferBaseSourceNode>(node_);
@@ -49,6 +59,12 @@ class AudioBufferBaseSourceNodeHostObject
         sourceNode->setOnPositionChangedCallbackId(std::stoull(value.getString(runtime).utf8(runtime)));
     }
 
+    JSI_PROPERTY_GETTER(onPositionChangedInterval) {
+        auto sourceNode =
+                std::static_pointer_cast<AudioBufferBaseSourceNode>(node_);
+        return jsi::Value(sourceNode->getOnPositionChangedInterval());
+    }
+
     JSI_PROPERTY_SETTER(onPositionChangedInterval) {
         auto sourceNode =
                 std::static_pointer_cast<AudioBufferBaseSourceNode>(node_);

package/common/cpp/audioapi/HostObjects/AudioBufferSourceNodeHostObject.h

@@ -125,16 +125,14 @@ class AudioBufferSourceNodeHostObject
     auto audioBufferSourceNode =
         std::static_pointer_cast<AudioBufferSourceNode>(node_);
 
-    auto audioBufferSourceNodeJsiObject = args[0].getObject(runtime);
-
-    if (args[1].isNull()) {
+    if (args[0].isNull()) {
       audioBufferSourceNode->setBuffer(std::shared_ptr<AudioBuffer>(nullptr));
       return jsi::Value::undefined();
     }
 
     auto bufferHostObject =
-        args[1].getObject(runtime).asHostObject<AudioBufferHostObject>(runtime);
-    audioBufferSourceNodeJsiObject.setExternalMemoryPressure(runtime,
+        args[0].getObject(runtime).asHostObject<AudioBufferHostObject>(runtime);
+    thisValue.asObject(runtime).setExternalMemoryPressure(runtime,
         bufferHostObject->getSizeInBytes() + 16);
     audioBufferSourceNode->setBuffer(bufferHostObject->audioBuffer_);
     return jsi::Value::undefined();

package/common/cpp/audioapi/HostObjects/AudioScheduledSourceNodeHostObject.h

@@ -15,13 +15,22 @@ class AudioScheduledSourceNodeHostObject : public AudioNodeHostObject {
       const std::shared_ptr<AudioScheduledSourceNode> &node)
       : AudioNodeHostObject(node) {
     addSetters(
-      JSI_EXPORT_PROPERTY_SETTER(AudioScheduledSourceNodeHostObject, onended));
+      JSI_EXPORT_PROPERTY_SETTER(AudioScheduledSourceNodeHostObject, onEnded));
     addFunctions(
         JSI_EXPORT_FUNCTION(AudioScheduledSourceNodeHostObject, start),
         JSI_EXPORT_FUNCTION(AudioScheduledSourceNodeHostObject, stop));
   }
 
-  JSI_PROPERTY_SETTER(onended) {
+  ~AudioScheduledSourceNodeHostObject() {
+    auto audioScheduledSourceNode =
+        std::static_pointer_cast<AudioScheduledSourceNode>(node_);
+
+    // When JSI object is garbage collected (together with the eventual callback),
+    // underlying source node might still be active and try to call the non-existing callback.
+    audioScheduledSourceNode->clearOnEndedCallback();
+  }
+
+  JSI_PROPERTY_SETTER(onEnded) {
     auto audioScheduleSourceNode =
             std::static_pointer_cast<AudioScheduledSourceNode>(node_);
 

package/common/cpp/audioapi/core/AudioContext.cpp

@@ -13,13 +13,15 @@ namespace audioapi {
 AudioContext::AudioContext(
     float sampleRate,
     bool initSuspended,
-    const std::shared_ptr<AudioEventHandlerRegistry> &audioEventHandlerRegistry)
+    const std::shared_ptr<IAudioEventHandlerRegistry>
+        &audioEventHandlerRegistry)
     : BaseAudioContext(audioEventHandlerRegistry) {
 #ifdef ANDROID
-  audioPlayer_ = std::make_shared<AudioPlayer>(this->renderAudio(), sampleRate);
+  audioPlayer_ = std::make_shared<AudioPlayer>(
+      this->renderAudio(), sampleRate, destination_->getChannelCount());
 #else
-  audioPlayer_ =
-      std::make_shared<IOSAudioPlayer>(this->renderAudio(), sampleRate);
+  audioPlayer_ = std::make_shared<IOSAudioPlayer>(
+      this->renderAudio(), sampleRate, destination_->getChannelCount());
 #endif
 
   sampleRate_ = sampleRate;

package/common/cpp/audioapi/core/AudioContext.h

@@ -14,7 +14,7 @@ class IOSAudioPlayer;
 
 class AudioContext : public BaseAudioContext {
  public:
-  explicit AudioContext(float sampleRate, bool initSuspended, const std::shared_ptr<AudioEventHandlerRegistry> &audioEventHandlerRegistry);
+  explicit AudioContext(float sampleRate, bool initSuspended, const std::shared_ptr<IAudioEventHandlerRegistry> &audioEventHandlerRegistry);
   ~AudioContext() override;
 
   void close();

package/common/cpp/audioapi/core/AudioParam.cpp

@@ -1,5 +1,6 @@
 #include <audioapi/core/AudioParam.h>
 #include <audioapi/core/BaseAudioContext.h>
+#include <audioapi/core/utils/Locker.h>
 #include <audioapi/dsp/AudioUtils.h>
 #include <audioapi/dsp/VectorMath.h>
 #include <audioapi/utils/AudioArray.h>
@@ -17,11 +18,10 @@ AudioParam::AudioParam(
       minValue_(minValue),
       maxValue_(maxValue),
       context_(context),
-      audioBus_(
-          std::make_shared<AudioBus>(
-              RENDER_QUANTUM_SIZE,
-              1,
-              context->getSampleRate())) {
+      audioBus_(std::make_shared<AudioBus>(
+          RENDER_QUANTUM_SIZE,
+          1,
+          context->getSampleRate())) {
   startTime_ = 0;
   endTime_ = 0;
   startValue_ = value_;
@@ -47,11 +47,16 @@ float AudioParam::getMaxValue() const {
   return maxValue_;
 }
 
+std::mutex &AudioParam::getQueueLock() {
+  return queueLock_;
+}
+
 void AudioParam::setValue(float value) {
   value_ = std::clamp(value, minValue_, maxValue_);
 }
 
 float AudioParam::getValueAtTime(double time) {
+  Locker lock(getQueueLock());
   if (endTime_ < time && !eventsQueue_.empty()) {
     auto event = eventsQueue_.front();
     startTime_ = event.getStartTime();
@@ -84,6 +89,7 @@ void AudioParam::setValueAtTime(float value, double startTime) {
     return endValue;
   };
 
+  Locker lock(getQueueLock());
   auto event = ParamChangeEvent(
       startTime,
       startTime,
@@ -117,6 +123,7 @@ void AudioParam::linearRampToValueAtTime(float value, double endTime) {
     return endValue;
   };
 
+  Locker lock(getQueueLock());
   auto event = ParamChangeEvent(
       getQueueEndTime(),
       endTime,
@@ -151,6 +158,7 @@ void AudioParam::exponentialRampToValueAtTime(float value, double endTime) {
     return endValue;
   };
 
+  Locker lock(getQueueLock());
   auto event = ParamChangeEvent(
       getQueueEndTime(),
       endTime,
@@ -181,6 +189,7 @@ void AudioParam::setTargetAtTime(
             (startValue - target) * exp(-(time - startTime) / timeConstant));
       };
 
+  Locker lock(getQueueLock());
   auto event = ParamChangeEvent(
       startTime,
       startTime,
@@ -225,6 +234,7 @@ void AudioParam::setValueCurveAtTime(
     return endValue;
   };
 
+  Locker lock(getQueueLock());
   auto event = ParamChangeEvent(
       startTime,
       startTime + duration,
@@ -236,6 +246,7 @@ void AudioParam::setValueCurveAtTime(
 }
 
 void AudioParam::cancelScheduledValues(double cancelTime) {
+  Locker lock(getQueueLock());
   auto it = eventsQueue_.rbegin();
   while (it->getEndTime() >= cancelTime) {
     if (it->getStartTime() >= cancelTime ||
@@ -248,6 +259,7 @@ void AudioParam::cancelScheduledValues(double cancelTime) {
 }
 
 void AudioParam::cancelAndHoldAtTime(double cancelTime) {
+  Locker lock(getQueueLock());
   auto it = eventsQueue_.rbegin();
   while (it->getEndTime() >= cancelTime) {
     if (it->getStartTime() >= cancelTime) {

package/common/cpp/audioapi/core/AudioParam.h

@@ -10,6 +10,7 @@
 #include <vector>
 #include <unordered_set>
 #include <cstddef>
+#include <mutex>
 
 namespace audioapi {
 
@@ -50,6 +51,7 @@ class AudioParam {
   std::deque<ParamChangeEvent> eventsQueue_;
   std::unordered_set<AudioNode *> inputNodes_;
   std::shared_ptr<AudioBus> audioBus_;
+  std::mutex queueLock_;
 
   double startTime_;
   double endTime_;
@@ -58,6 +60,7 @@ class AudioParam {
   std::function<float(double, double, float, float, double)> calculateValue_;
   std::vector<std::shared_ptr<AudioBus>> inputBuses_ = {};
 
+  std::mutex &getQueueLock();
   double getQueueEndTime();
   float getQueueEndValue();
   void updateQueue(ParamChangeEvent &event);

package/common/cpp/audioapi/core/BaseAudioContext.cpp

@@ -19,7 +19,7 @@
 namespace audioapi {
 
 BaseAudioContext::BaseAudioContext(
-    const std::shared_ptr<AudioEventHandlerRegistry>
+    const std::shared_ptr<IAudioEventHandlerRegistry>
         &audioEventHandlerRegistry) {
   nodeManager_ = std::make_shared<AudioNodeManager>();
   destination_ = std::make_shared<AudioDestinationNode>(this);

package/common/cpp/audioapi/core/BaseAudioContext.h

@@ -29,10 +29,11 @@ class AudioBufferQueueSourceNode;
 class AudioDecoder;
 class AnalyserNode;
 class AudioEventHandlerRegistry;
+class IAudioEventHandlerRegistry;
 
 class BaseAudioContext {
  public:
-  explicit BaseAudioContext(const std::shared_ptr<AudioEventHandlerRegistry> &audioEventHandlerRegistry);
+  explicit BaseAudioContext(const std::shared_ptr<IAudioEventHandlerRegistry> &audioEventHandlerRegistry);
   virtual ~BaseAudioContext() = default;
 
   std::string getState();
@@ -86,7 +87,7 @@ class BaseAudioContext {
   std::shared_ptr<PeriodicWave> cachedTriangleWave_ = nullptr;
 
  public:
-    std::shared_ptr<AudioEventHandlerRegistry> audioEventHandlerRegistry_;
+    std::shared_ptr<IAudioEventHandlerRegistry> audioEventHandlerRegistry_;
 };
 
 } // namespace audioapi

package/common/cpp/audioapi/core/OfflineAudioContext.cpp

@@ -22,7 +22,8 @@ OfflineAudioContext::OfflineAudioContext(
     int numberOfChannels,
     size_t length,
     float sampleRate,
-    const std::shared_ptr<AudioEventHandlerRegistry> &audioEventHandlerRegistry)
+    const std::shared_ptr<IAudioEventHandlerRegistry>
+        &audioEventHandlerRegistry)
     : BaseAudioContext(audioEventHandlerRegistry),
       length_(length),
       numberOfChannels_(numberOfChannels),

package/common/cpp/audioapi/core/OfflineAudioContext.h

@@ -14,7 +14,7 @@ using OfflineAudioContextResultCallback = std::function<void(std::shared_ptr<Aud
 
 class OfflineAudioContext : public BaseAudioContext {
  public:
-  explicit OfflineAudioContext(int numberOfChannels, size_t length, float sampleRate, const std::shared_ptr<AudioEventHandlerRegistry> &audioEventHandlerRegistry);
+  explicit OfflineAudioContext(int numberOfChannels, size_t length, float sampleRate, const std::shared_ptr<IAudioEventHandlerRegistry> &audioEventHandlerRegistry);
   ~OfflineAudioContext() override;
 
   void resume();

package/common/cpp/audioapi/core/effects/PeriodicWave.cpp

@@ -118,7 +118,7 @@ int PeriodicWave::getNumberOfPartialsPerRange(int rangeIndex) const {
   auto centsToCull = static_cast<float>(rangeIndex) * CentsPerRange;
 
   // A value from 0 -> 1 representing what fraction of the partials to keep.
-  auto cullingScale = std::powf(2, -centsToCull / 1200);
+  auto cullingScale = std::pow(2, -centsToCull / 1200);
 
   // The very top range will have all the partials culled.
   int numberOfPartials =