react-native-audio-api 0.3.1 → 0.3.2

package/RNAudioAPI.podspec

@@ -1,46 +1,57 @@
 require "json"
+require_relative './scripts/audioapi_utils'
 
-package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+package_json = JSON.parse(File.read(File.join(__dir__, "package.json")))
+
+$config = find_config()
+assert_minimal_react_native_version($config)
+$new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+
+folly_flags = "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DREACT_NATIVE_MINOR_VERSION=#{$config[:react_native_minor_version]}"
+fabric_flags = $new_arch_enabled ? '-DRCT_NEW_ARCH_ENABLED' : ''
+version_flag = "-DAUDIOAPI_VERSION=#{package_json['version']}"
 
 Pod::Spec.new do |s|
   s.name         = "RNAudioAPI"
-  s.version      = package["version"]
-  s.summary      = package["description"]
-  s.homepage     = package["homepage"]
-  s.license      = package["license"]
-  s.authors      = package["author"]
+  s.version      = package_json["version"]
+  s.summary      = package_json["description"]
+  s.homepage     = package_json["homepage"]
+  s.license      = package_json["license"]
+  s.authors      = package_json["author"]
 
   s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://github.com/software-mansion-labs/react-native-audio-api.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm}", "common/cpp/**/*.{hpp,cpp,c,h}"
 
-  s.ios.frameworks = 'Accelerate'
+  s.ios.frameworks = 'CoreFoundation', 'CoreAudio', 'AudioToolbox', 'Accelerate'
+
+  s.pod_target_xcconfig    = {
+    "USE_HEADERMAP" => "YES",
+    "DEFINES_MODULE" => "YES",
+    "HEADER_SEARCH_PATHS" => '"$(PODS_TARGET_SRCROOT)/ReactCommon" "$(PODS_TARGET_SRCROOT)" "$(PODS_ROOT)/RCT-Folly" "$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native" "$(PODS_ROOT)/DoubleConversion" "$(PODS_ROOT)/Headers/Private/React-Core" "$(PODS_ROOT)/Headers/Private/Yoga"',
+    "FRAMEWORK_SEARCH_PATHS" => '"${PODS_CONFIGURATION_BUILD_DIR}/React-hermes"',
+    "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+    "GCC_PREPROCESSOR_DEFINITIONS" => '$(inherited) HAVE_ACCELERATE=1',
+  }
+  s.compiler_flags = "#{folly_flags}"
+
   s.xcconfig = {
-    'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) HAVE_ACCELERATE=1'
+    "HEADER_SEARCH_PATHS" => [
+      '"$(PODS_ROOT)/boost"',
+      '"$(PODS_ROOT)/boost-for-react-native"',
+      '"$(PODS_ROOT)/glog"',
+      '"$(PODS_ROOT)/RCT-Folly"',
+      '"$(PODS_ROOT)/Headers/Public/React-hermes"',
+      '"$(PODS_ROOT)/Headers/Public/hermes-engine"',
+      "\"$(PODS_ROOT)/#{$config[:react_native_common_dir]}\"",
+      "\"$(PODS_ROOT)/#{$config[:react_native_audioapi_dir_from_pods_root]}/ios\"",
+      "\"$(PODS_ROOT)/#{$config[:react_native_audioapi_dir_from_pods_root]}/common/cpp\"",
+    ].join(' '),
+    'OTHER_CFLAGS' => "$(inherited) #{folly_flags} #{fabric_flags} #{version_flag}"
   }
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
-  if respond_to?(:install_modules_dependencies, true)
-    install_modules_dependencies(s)
-  else
-    s.dependency "React-Core"
-
-    # Don't install the dependencies when we run `pod install` in the old architecture.
-    if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-      s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-      s.pod_target_xcconfig    = {
-          "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
-          "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
-          "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-      }
-      s.dependency "React-Codegen"
-      s.dependency "RCT-Folly"
-      s.dependency "RCTRequired"
-      s.dependency "RCTTypeSafety"
-      s.dependency "ReactCommon/turbomodule/core"
-    end
-  end
+  install_modules_dependencies(s, new_arch_enabled: true)
 end

package/android/CMakeLists.txt

@@ -14,33 +14,28 @@ endif()
 include("${REACT_NATIVE_DIR}/ReactAndroid/cmake-utils/folly-flags.cmake")
 add_compile_options(${folly_FLAGS})
 
-file(GLOB_RECURSE SOURCE_FILES
-  "src/main/cpp/*.cpp"
-  "src/main/cpp/*.h"
-  "../common/cpp/*.cpp"
-  "../common/cpp/*.h"
-  "../common/cpp/core/*.cpp"
-  "../common/cpp/core/*.h"
-  "../common/cpp/HostObjects/*.cpp"
-  "../common/cpp/HostObjects/*.h"
-  "../common/cpp/utils/*.cpp"
-  "../common/cpp/utils/*.h"
-  "../common/cpp/jsi/*.h"
-  "../common/cpp/jsi/*.cpp"
-  "../common/cpp/types/*.h"
-)
+file(GLOB_RECURSE ANDROID_CPP_SOURCES CONFIGURE_DEPENDS "src/main/cpp/*.cpp")
+file(GLOB_RECURSE COMMON_CPP_SOURCES CONFIGURE_DEPENDS "../common/cpp/*.cpp")
+
+add_library(react-native-audio-api SHARED ${ANDROID_CPP_SOURCES} ${COMMON_CPP_SOURCES})
 
-add_library(react-native-audio-api SHARED ${SOURCE_FILES})
+file(GLOB ANDROID_CPP_DIR CONFIGURE_DEPENDS "src/main/cpp/**")
+file(GLOB COMMON_CPP_DIR CONFIGURE_DEPENDS "../common/cpp/**")
 
-file(GLOB DIRS CONFIGURE_DEPENDS "src/main/cpp/**" "../common/cpp/**")
+target_include_directories(
+  react-native-audio-api
+  PUBLIC
+  ${ANDROID_CPP_DIR}
+  ${COMMON_CPP_DIR}
+)
 
 target_include_directories(
   react-native-audio-api
   PRIVATE
-  ${DIRS}
-  "${REACT_NATIVE_DIR}/ReactCommon/jsi"
-  "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/react/jni"
-  "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/third-party/folly"
+  "${REACT_NATIVE_DIR}/ReactCommon"
+  "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/react/turbomodule"
+  "${REACT_NATIVE_DIR}/ReactCommon/react/nativemodule/core/ReactCommon"
+  "${REACT_NATIVE_DIR}/ReactCommon/callinvoker"
   "${CMAKE_CURRENT_SOURCE_DIR}/libs/include"
 )
 
@@ -66,6 +61,7 @@ if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
 else()
   set(RN_VERSION_LINK_LIBRARIES
     ReactAndroid::folly_runtime
+    ReactAndroid::react_nativemodule_core
     ReactAndroid::glog
     ReactAndroid::reactnativejni
   )

package/android/build.gradle

@@ -1,5 +1,6 @@
 import com.android.Version
 import org.apache.tools.ant.taskdefs.condition.Os
+import com.android.build.gradle.tasks.ExternalNativeBuildJsonTask
 
 buildscript {
   repositories {
@@ -72,8 +73,6 @@ def toPlatformFileString(String path) {
   return path
 }
 
-def reactNativeRootDir = resolveReactNativeDirectory()
-
 static def supportsNamespace() {
   def parsed = Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
   def major = parsed[0].toInteger()
@@ -83,6 +82,15 @@ static def supportsNamespace() {
   return (major == 7 && minor >= 3) || major >= 8
 }
 
+def reactNativeRootDir = resolveReactNativeDirectory()
+
+def reactProperties = new Properties()
+file("$reactNativeRootDir/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
+
+def REACT_NATIVE_VERSION = reactProperties.getProperty("VERSION_NAME")
+def REACT_NATIVE_MINOR_VERSION = REACT_NATIVE_VERSION.startsWith("0.0.0-") ? 1000 : REACT_NATIVE_VERSION.split("\\.")[1].toInteger()
+def IS_NEW_ARCHITECTURE_ENABLED = isNewArchitectureEnabled()
+
 android {
   if (supportsNamespace()) {
     namespace "com.swmansion.audioapi"
@@ -107,7 +115,10 @@ android {
         cppFlags "-O2 -frtti -fexceptions -Wall -fstack-protector-all"
         abiFilters (*reactNativeArchitectures())
         arguments "-DANDROID_STL=c++_shared",
-                  "-DREACT_NATIVE_DIR=${toPlatformFileString(reactNativeRootDir.path)}"
+                  "-DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION}",
+                  "-DANDROID_TOOLCHAIN=clang",
+                  "-DREACT_NATIVE_DIR=${toPlatformFileString(reactNativeRootDir.path)}",
+                  "-DIS_NEW_ARCHITECTURE_ENABLED=${IS_NEW_ARCHITECTURE_ENABLED}"
       }
     }
   }
@@ -148,6 +159,7 @@ android {
         "**/libjsi.so",
         "**/libfolly_runtime.so",
         "**/libreactnativejni.so",
+        "**/libreactnative.so",
       ]
     }
   }
@@ -183,10 +195,15 @@ dependencies {
   implementation 'com.google.oboe:oboe:1.9.0'
 }
 
-if (isNewArchitectureEnabled()) {
-  react {
-    jsRootDir = file("../src/")
-    libraryName = "react-native-audio-api"
-    codegenJavaPackageName = "com.swmansion.audioapi"
-  }
+def assertMinimalReactNativeVersion = task assertMinimalReactNativeVersionTask {
+    // If you change the minimal React Native version remember to update Compatibility Table in docs
+    def minimalReactNativeVersion = 75
+    onlyIf { REACT_NATIVE_MINOR_VERSION < minimalReactNativeVersion }
+    doFirst {
+        throw new GradleException("[AudioAPI] Unsupported React Native version. Please use $minimalReactNativeVersion. or newer.")
+    }
+}
+
+tasks.preBuild {
+    dependsOn assertMinimalReactNativeVersion
 }

package/android/src/main/cpp/OnLoad.cpp

@@ -3,7 +3,7 @@
 
 using namespace audioapi;
 
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
   return facebook::jni::initialize(
       vm, [] { AudioAPIInstaller::registerNatives(); });
 }

package/android/src/main/cpp/core/AudioAPIInstaller.cpp

@@ -0,0 +1,37 @@
+#include "AudioAPIInstaller.h"
+
+namespace audioapi {
+
+using namespace facebook::jni;
+
+AudioAPIInstaller::AudioAPIInstaller(
+    jni::alias_ref<AudioAPIInstaller::jhybridobject> &jThis,
+    jsi::Runtime *jsiRuntime,
+    const std::shared_ptr<facebook::react::CallInvoker> &jsCallInvoker)
+    : javaPart_(make_global(jThis)),
+      jsiRuntime_(jsiRuntime),
+      jsCallInvoker_(jsCallInvoker) {}
+
+jni::local_ref<AudioAPIInstaller::jhybriddata> AudioAPIInstaller::initHybrid(
+    jni::alias_ref<jhybridobject> jThis,
+    jlong jsContext,
+    jni::alias_ref<facebook::react::CallInvokerHolder::javaobject>
+        jsCallInvokerHolder) {
+  auto jsCallInvoker = jsCallInvokerHolder->cthis()->getCallInvoker();
+  auto rnRuntime = reinterpret_cast<jsi::Runtime *>(jsContext);
+  return makeCxxInstance(jThis, rnRuntime, jsCallInvoker);
+}
+
+void AudioAPIInstaller::registerNatives() {
+  registerHybrid({
+      makeNativeMethod("initHybrid", AudioAPIInstaller::initHybrid),
+      makeNativeMethod("install", AudioAPIInstaller::install),
+  });
+}
+
+void AudioAPIInstaller::install() {
+  auto hostObject = std::make_shared<AudioAPIInstallerHostObject>(
+      jsiRuntime_, jsCallInvoker_);
+  hostObject->install();
+}
+} // namespace audioapi

package/android/src/main/cpp/{AudioAPIInstaller → core}/AudioAPIInstaller.h

@@ -24,18 +24,9 @@ class AudioAPIInstaller : public jni::HybridClass<AudioAPIInstaller> {
       jni::alias_ref<jhybridobject> jThis,
       jlong jsContext,
       jni::alias_ref<facebook::react::CallInvokerHolder::javaobject>
-          jsCallInvokerHolder) {
-    auto jsCallInvoker = jsCallInvokerHolder->cthis()->getCallInvoker();
-    auto rnRuntime = reinterpret_cast<jsi::Runtime *>(jsContext);
-    return makeCxxInstance(jThis, rnRuntime, jsCallInvoker);
-  }
-
-  static void registerNatives() {
-    registerHybrid({
-        makeNativeMethod("initHybrid", AudioAPIInstaller::initHybrid),
-        makeNativeMethod("install", AudioAPIInstaller::install),
-    });
-  }
+          jsCallInvokerHolder);
+
+  static void registerNatives();
 
   void install();
 
@@ -43,7 +34,7 @@ class AudioAPIInstaller : public jni::HybridClass<AudioAPIInstaller> {
   friend HybridBase;
 
   jni::global_ref<AudioAPIInstaller::javaobject> javaPart_;
-  jsi::Runtime *rnRuntime_;
+  jsi::Runtime *jsiRuntime_;
   std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker_;
 
   explicit AudioAPIInstaller(

package/android/src/main/cpp/{AudioDecoder → core}/AudioDecoder.cpp

@@ -9,8 +9,6 @@
 
 namespace audioapi {
 
-AudioDecoder::AudioDecoder(int sampleRate) : sampleRate_(sampleRate) {}
-
 AudioBus *AudioDecoder::decodeWithFilePath(const std::string &path) const {
   ma_decoder decoder;
   ma_decoder_config config =
@@ -55,10 +53,4 @@ AudioBus *AudioDecoder::decodeWithFilePath(const std::string &path) const {
 
   return audioBus;
 }
-
-AudioBus *AudioDecoder::decodeWithArrayBuffer() const {
-  // TODO: implement this
-  return new AudioBus(1, 1, 1);
-}
-
 } // namespace audioapi

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

@@ -3,9 +3,11 @@ package com.swmansion.audioapi
 import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.annotations.ReactModuleList
 import com.facebook.react.uimanager.ViewManager
 import com.swmansion.audioapi.nativemodules.AudioAPIModule
 
+@ReactModuleList(nativeModules = [AudioAPIModule::class])
 class AudioAPIPackage : ReactPackage {
   override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> =
     listOf<NativeModule>(AudioAPIModule(reactContext))

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

@@ -3,11 +3,17 @@ package com.swmansion.audioapi.nativemodules
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.module.annotations.ReactModule
 import com.swmansion.audioapi.module.AudioAPIInstaller
 
+@ReactModule(name = AudioAPIModule.NAME)
 class AudioAPIModule(
   private val reactContext: ReactApplicationContext,
 ) : ReactContextBaseJavaModule(reactContext) {
+  companion object {
+    const val NAME: String = "AudioAPIModule"
+  }
+
   override fun getName(): String = NAME
 
   @ReactMethod(isBlockingSynchronousMethod = true)
@@ -17,8 +23,4 @@ class AudioAPIModule(
 
     return true
   }
-
-  companion object {
-    const val NAME: String = "AudioAPIModule"
-  }
 }

package/common/cpp/HostObjects/AudioParamHostObject.h

@@ -23,8 +23,11 @@ class AudioParamHostObject : public JsiHostObject {
     addFunctions(
         JSI_EXPORT_FUNCTION(AudioParamHostObject, setValueAtTime),
         JSI_EXPORT_FUNCTION(AudioParamHostObject, linearRampToValueAtTime),
-        JSI_EXPORT_FUNCTION(
-            AudioParamHostObject, exponentialRampToValueAtTime));
+        JSI_EXPORT_FUNCTION(AudioParamHostObject, exponentialRampToValueAtTime),
+        JSI_EXPORT_FUNCTION(AudioParamHostObject, setTargetAtTime),
+        JSI_EXPORT_FUNCTION(AudioParamHostObject, setValueCurveAtTime),
+        JSI_EXPORT_FUNCTION(AudioParamHostObject, cancelScheduledValues),
+        JSI_EXPORT_FUNCTION(AudioParamHostObject, cancelAndHoldAtTime));
 
     addSetters(JSI_EXPORT_PROPERTY_SETTER(AudioParamHostObject, value));
   }
@@ -66,6 +69,40 @@ class AudioParamHostObject : public JsiHostObject {
     return jsi::Value::undefined();
   }
 
+  JSI_HOST_FUNCTION(setTargetAtTime) {
+    auto target = static_cast<float>(args[0].getNumber());
+    double startTime = args[1].getNumber();
+    double timeConstant = args[2].getNumber();
+    param_->setTargetAtTime(target, startTime, timeConstant);
+    return jsi::Value::undefined();
+  }
+
+  JSI_HOST_FUNCTION(setValueCurveAtTime) {
+    auto values = args[0].getObject(runtime).asArray(runtime);
+    auto length = static_cast<int>(values.length(runtime));
+    auto valuesData = new float[length];
+    for (size_t i = 0; i < values.length(runtime); i++) {
+      valuesData[i] =
+          static_cast<float>(values.getValueAtIndex(runtime, i).getNumber());
+    }
+    double startTime = args[1].getNumber();
+    double duration = args[2].getNumber();
+    param_->setValueCurveAtTime(valuesData, length, startTime, duration);
+    return jsi::Value::undefined();
+  }
+
+  JSI_HOST_FUNCTION(cancelScheduledValues) {
+    double cancelTime = args[0].getNumber();
+    param_->cancelScheduledValues(cancelTime);
+    return jsi::Value::undefined();
+  }
+
+  JSI_HOST_FUNCTION(cancelAndHoldAtTime) {
+    double cancelTime = args[0].getNumber();
+    param_->cancelAndHoldAtTime(cancelTime);
+    return jsi::Value::undefined();
+  }
+
   JSI_PROPERTY_SETTER(value) {
     param_->setValue(static_cast<float>(value.getNumber()));
   }

package/common/cpp/core/AudioBufferSourceNode.cpp

@@ -19,10 +19,9 @@ AudioBufferSourceNode::AudioBufferSourceNode(BaseAudioContext *context)
   numberOfInputs_ = 0;
   buffer_ = std::shared_ptr<AudioBuffer>(nullptr);
 
-  detuneParam_ =
-      std::make_shared<AudioParam>(context, 0.0, -MAX_DETUNE, MAX_DETUNE);
+  detuneParam_ = std::make_shared<AudioParam>(0.0, -MAX_DETUNE, MAX_DETUNE);
   playbackRateParam_ = std::make_shared<AudioParam>(
-      context, 1.0, MOST_NEGATIVE_SINGLE_FLOAT, MOST_POSITIVE_SINGLE_FLOAT);
+      1.0, MOST_NEGATIVE_SINGLE_FLOAT, MOST_POSITIVE_SINGLE_FLOAT);
 
   isInitialized_ = true;
 }
@@ -103,6 +102,8 @@ void AudioBufferSourceNode::processNode(
     processWithInterpolation(
         processingBus, startOffset, offsetLength, playbackRate);
   }
+
+  handleStopScheduled();
 }
 
 /**

package/{android/src/main/cpp/AudioDecoder → common/cpp/core}/AudioDecoder.h

@@ -8,11 +8,9 @@ class AudioBus;
 
 class AudioDecoder {
  public:
-  explicit AudioDecoder(int sampleRate);
+  explicit AudioDecoder(int sampleRate) : sampleRate_(sampleRate) {}
 
   [[nodiscard]] AudioBus *decodeWithFilePath(const std::string &path) const;
-  // TODO: implement this
-  [[nodiscard]] AudioBus *decodeWithArrayBuffer() const;
 
  private:
   int sampleRate_;