react-native-audio-api 0.11.0-alpha.1 → 0.11.0-alpha.2

package/README.md

@@ -19,19 +19,8 @@ check out the [Getting Started](https://docs.swmansion.com/react-native-audio-ap
 
 ### Planned
 
-### <img src="https://img.shields.io/badge/Coming_in-0.9.0-orange" />
-
-- **JS Audio Worklets V1 🐎**<br />
-  Receive events and data callbacks from audio thread to synchronize with UI on UI thread.
-
 ### <img src="https://img.shields.io/badge/Coming_in-x.x.x-orange" />
 
-- **Convolver Node 🐐**<br />
-  Realistic reverb and spatial effects in the browser by applying impulse responses. It makes audio sound like it’s being played in real spaces, from small rooms to cathedrals, or through hardware like amps and speakers
-
-- **Decoding and utility modules 🔧**<br />
-  Decode and modify audio data without the need to create AudioContext first through a set of utility classes
-
 - **DynamicCompressorNode 〽️**<br />
   Reduce the volume of loud sounds and boost quieter nodes to balance the audio signal, avoid clipping or distorted sounds
 
@@ -47,9 +36,22 @@ check out the [Getting Started](https://docs.swmansion.com/react-native-audio-ap
 - **Noise Cancellation 🦇**<br />
   System-based active noise and echo cancellation support
 
+### <a href="https://github.com/software-mansion/react-native-audio-api/releases/tag/0.10.0"><img src="https://img.shields.io/badge/Released_in-0.10.0-green" /></a>
+
+- **Decoding and utility modules 🔧**<br />
+  Decode and modify audio data without the need to create AudioContext first through a set of utility classes
+
+- **Convolver Node 🐐**<br />
+  Realistic reverb and spatial effects in the browser by applying impulse responses. It makes audio sound like it’s being played in real spaces, from small rooms to cathedrals, or through hardware like amps and speakers
+
 - **JS Audio Worklets V2 🐎**<br />
   Customize the process pipeline with JS functions running on audio thread.
 
+### <a href="https://github.com/software-mansion/react-native-audio-api/releases/tag/0.9.0"><img src="https://img.shields.io/badge/Released_in-0.9.0-green" /></a>
+
+- **JS Audio Worklets V1 🐎**<br />
+  Receive events and data callbacks from audio thread to synchronize with UI on UI thread.
+
 ### <a href="https://github.com/software-mansion/react-native-audio-api/releases/tag/0.8.0"><img src="https://img.shields.io/badge/Released_in-0.8.0-green" /></a>
 
 - **Decoding support for m4a/mp4/aac/ogg/opus 📁** <br />

package/RNAudioAPI.podspec

@@ -1,13 +1,18 @@
 require "json"
+require_relative './scripts/rnaa_utils'
 
 package_json = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
 $new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+$RN_AUDIO_API_FFMPEG_DISABLED = ENV['DISABLE_AUDIOAPI_FFMPEG'].nil? ? false : ENV['DISABLE_AUDIOAPI_FFMPEG'] == '1' # false by default
 
 folly_flags = "-DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32"
 fabric_flags = $new_arch_enabled ? '-DRCT_NEW_ARCH_ENABLED' : ''
 version_flag = "-DAUDIOAPI_VERSION=#{package_json['version']}"
 
+worklets_preprocessor_flag = check_if_worklets_enabled() ? '-DRN_AUDIO_API_ENABLE_WORKLETS=1' : ''
+ffmpeg_flag = $RN_AUDIO_API_FFMPEG_DISABLED ? '-DRN_AUDIO_API_FFMPEG_DISABLED=1' : ''
+
 Pod::Spec.new do |s|
   s.name         = "RNAudioAPI"
   s.version      = package_json["version"]
@@ -21,6 +26,7 @@ Pod::Spec.new do |s|
 
   s.subspec "audioapi" do |ss|
     ss.source_files = "common/cpp/audioapi/**/*.{cpp,c,h,hpp}"
+    ss.exclude_files = $RN_AUDIO_API_FFMPEG_DISABLED ? ["common/cpp/audioapi/libs/ffmpeg/**"] : []
     ss.header_dir = "audioapi"
     ss.header_mappings_dir = "common/cpp/audioapi"
 
@@ -29,15 +35,23 @@ Pod::Spec.new do |s|
       sss.header_dir = "audioapi"
       sss.header_mappings_dir = "ios/audioapi"
     end
+
+    ss.subspec "audioapi_dsp" do |sss|
+      sss.source_files = "common/cpp/audioapi/dsp/**/*.{cpp}"
+      sss.header_dir = "audioapi/dsp"
+      sss.header_mappings_dir = "common/cpp/audioapi/dsp"
+      sss.compiler_flags = "-O3"
+    end
   end
 
   s.ios.frameworks = 'CoreFoundation', 'CoreAudio', 'AudioToolbox', 'Accelerate', 'MediaPlayer', 'AVFoundation'
 
   s.compiler_flags = "#{folly_flags}"
 
-  # s.prepare_command = <<-CMD TODO: re-add when we have prebuilt libs put somewhere public
-  #   ruby -r './scripts/download-audioapi-libs.rb'
-  # CMD
+  s.prepare_command = <<-CMD
+    chmod +x scripts/download-prebuilt-binaries.sh
+    scripts/download-prebuilt-binaries.sh ios
+  CMD
 
   # Assumes Pods dir is nested under ios project dir
   ios_dir = File.join(Pod::Config.instance.project_pods_root, '..')
@@ -46,13 +60,11 @@ Pod::Spec.new do |s|
   external_dir_relative = "common/cpp/audioapi/external"
   lib_dir = "$(PROJECT_DIR)/#{rn_audio_dir_relative}/#{external_dir_relative}/$(PLATFORM_NAME)"
 
-  external_dir = File.join(__dir__, "common/cpp/audioapi/external")
-
-  s.ios.vendored_frameworks = [
-    'common/cpp/audioapi/external/libavcodec.xcframework',
-    'common/cpp/audioapi/external/libavformat.xcframework',
-    'common/cpp/audioapi/external/libavutil.xcframework',
-    'common/cpp/audioapi/external/libswresample.xcframework'
+  s.ios.vendored_frameworks = $RN_AUDIO_API_FFMPEG_DISABLED ? [] : [
+    'common/cpp/audioapi/external/ffmpeg_ios/libavcodec.xcframework',
+    'common/cpp/audioapi/external/ffmpeg_ios/libavformat.xcframework',
+    'common/cpp/audioapi/external/ffmpeg_ios/libavutil.xcframework',
+    'common/cpp/audioapi/external/ffmpeg_ios/libswresample.xcframework'
   ]
 s.pod_target_xcconfig = {
   "USE_HEADERMAP" => "YES",
@@ -66,10 +78,9 @@ s.pod_target_xcconfig = {
     $(PODS_TARGET_SRCROOT)/#{external_dir_relative}/include
     $(PODS_TARGET_SRCROOT)/#{external_dir_relative}/include/opus
     $(PODS_TARGET_SRCROOT)/#{external_dir_relative}/include/vorbis
-    $(PODS_TARGET_SRCROOT)/#{external_dir_relative}/ffmpeg_include
-  ].join(" "),
-  'OTHER_CFLAGS' => "$(inherited) #{folly_flags} #{fabric_flags} #{version_flag}",
-  'OTHER_CPLUSPLUSFLAGS' => "$(inherited) #{folly_flags} #{fabric_flags} #{version_flag}"
+  ].concat($RN_AUDIO_API_FFMPEG_DISABLED ? [] : ["$(PODS_TARGET_SRCROOT)/#{external_dir_relative}/ffmpeg_include"]).join(" "),
+  'OTHER_CFLAGS' => "$(inherited) #{folly_flags} #{fabric_flags} #{version_flag} #{worklets_preprocessor_flag} #{ffmpeg_flag}",
+  'OTHER_CPLUSPLUSFLAGS' => "$(inherited) #{folly_flags} #{fabric_flags} #{version_flag} #{worklets_preprocessor_flag} #{ffmpeg_flag}",
 }
 
 s.user_target_xcconfig = {
@@ -88,10 +99,6 @@ s.user_target_xcconfig = {
     $(inherited)
     $(PODS_ROOT)/Headers/Public/RNAudioAPI
     $(PODS_TARGET_SRCROOT)/common/cpp
-    #{external_dir}/include
-    #{external_dir}/include/opus
-    #{external_dir}/include/vorbis
-    #{external_dir}/ffmpeg_include
   ].join(' ')
 }
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.

package/android/build.gradle

@@ -21,6 +21,10 @@ def isNewArchitectureEnabled() {
   return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
 }
 
+def isFFmpegDisabled() {
+  return rootProject.hasProperty("disableAudioapiFFmpeg") && rootProject.getProperty("disableAudioapiFFmpeg") == "true"
+}
+
 apply plugin: "com.android.library"
 apply plugin: 'org.jetbrains.kotlin.android'
 
@@ -74,6 +78,30 @@ def resolveReactNativeWorkletsDirectory() {
   return null;
 }
 
+def validateWorkletsVersion() {
+  def validationScript = file("${projectDir}/../scripts/validate-worklets-version.js")
+  if (!validationScript.exists()) {
+    logger.error("[AudioAPI] Worklets validation script not found at ${validationScript.absolutePath}")
+    return false
+  }
+
+  try {
+    def process = ["node", validationScript.absolutePath].execute()
+    process.waitForProcessOutput(System.out, System.err)
+    def exitCode = process.exitValue()
+
+    if (exitCode == 0) {
+      return true
+    } else {
+      logger.warn("[AudioAPI] Worklets version validation failed")
+      return false
+    }
+  } catch (Exception e) {
+    logger.error("[AudioAPI] Failed to validate worklets version: ${e.message}")
+    return false
+  }
+}
+
 def toPlatformFileString(String path) {
   if (Os.isFamily(Os.FAMILY_WINDOWS)) {
       path = path.replace(File.separatorChar, '/' as char)
@@ -92,7 +120,7 @@ static def supportsNamespace() {
 
 def reactNativeRootDir = resolveReactNativeDirectory()
 def reactNativeWorkletsRootDir = resolveReactNativeWorkletsDirectory()
-def isWorkletsAvailable = reactNativeWorkletsRootDir != null
+def isWorkletsAvailable = reactNativeWorkletsRootDir != null && validateWorkletsVersion()
 
 def reactProperties = new Properties()
 file("$reactNativeRootDir/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
@@ -100,6 +128,7 @@ file("$reactNativeRootDir/ReactAndroid/gradle.properties").withInputStream { rea
 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()
+def IS_RN_AUDIO_API_FFMPEG_DISABLED = isFFmpegDisabled()
 
 android {
   sourceSets {
@@ -123,7 +152,7 @@ android {
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
-    
+
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
     buildConfigField "boolean", "RN_AUDIO_API_ENABLE_WORKLETS", "${isWorkletsAvailable}"
 
@@ -139,8 +168,9 @@ android {
           "-DANDROID_TOOLCHAIN=clang",
           "-DREACT_NATIVE_DIR=${toPlatformFileString(reactNativeRootDir.path)}",
           "-DRN_AUDIO_API_WORKLETS_ENABLED=${isWorkletsAvailable}",
-                  "-DIS_NEW_ARCHITECTURE_ENABLED=${IS_NEW_ARCHITECTURE_ENABLED}",
-                  "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
+          "-DIS_NEW_ARCHITECTURE_ENABLED=${IS_NEW_ARCHITECTURE_ENABLED}",
+          "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON",
+          "-DRN_AUDIO_API_FFMPEG_DISABLED=${IS_RN_AUDIO_API_FFMPEG_DISABLED}"
         ]
 
         if (isWorkletsAvailable) {
@@ -277,10 +307,16 @@ def assertMinimalReactNativeVersion = task assertMinimalReactNativeVersionTask {
     }
 }
 
+task downloadPrebuiltBinaries(type: Exec) {
+  commandLine 'chmod', '+x', '../scripts/download-prebuilt-binaries.sh'
+  commandLine 'bash', '../scripts/download-prebuilt-binaries.sh'
+  args 'android'
+}
+
 // Make preBuild depend on the download task
 tasks.preBuild {
     dependsOn assertMinimalReactNativeVersion
-    // dependsOn downloadStaticPrebuiltLibraries TODO: re-add when we have prebuilt libs put somewhere public
+    dependsOn downloadPrebuiltBinaries
 }
 
 task cleanCmakeCache() {

package/android/src/main/cpp/audioapi/CMakeLists.txt

@@ -3,14 +3,17 @@ cmake_minimum_required(VERSION 3.12.0)
 file(GLOB_RECURSE ANDROID_CPP_SOURCES CONFIGURE_DEPENDS "${ANDROID_CPP_DIR}/audioapi/*.cpp")
 file(GLOB_RECURSE COMMON_CPP_SOURCES CONFIGURE_DEPENDS "${COMMON_CPP_DIR}/audioapi/*.cpp" "${COMMON_CPP_DIR}/audioapi/*.c")
 
+set_source_files_properties(
+  ${COMMON_CPP_SOURCES}/dsp/*.cpp
+  PROPERTIES
+  COMPILE_FLAGS "-O3"
+)
+
 set(INCLUDE_DIR ${COMMON_CPP_DIR}/audioapi/external/include)
 set(FFMPEG_INCLUDE_DIR ${COMMON_CPP_DIR}/audioapi/external/ffmpeg_include)
 set(EXTERNAL_DIR ${COMMON_CPP_DIR}/audioapi/external)
 set(JNI_LIBS_DIR ${COMMON_CPP_DIR}/../../android/src/main/jniLibs)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-Bsymbolic")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-Bsymbolic")
-
 add_library(react-native-audio-api SHARED ${ANDROID_CPP_SOURCES} ${COMMON_CPP_SOURCES})
 
 foreach(lib IN ITEMS opus opusfile ogg vorbis vorbisenc vorbisfile crypto ssl)

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

@@ -1,4 +1,7 @@
 #include <audioapi/android/AudioAPIModule.h>
+#include <memory>
+#include <string>
+#include <unordered_map>
 
 namespace audioapi {
 
@@ -25,20 +28,16 @@ jni::local_ref<AudioAPIModule::jhybriddata> AudioAPIModule::initHybrid(
     jni::alias_ref<jhybridobject> jThis,
     jni::alias_ref<jni::JObject> jWorkletsModule,
     jlong jsContext,
-    jni::alias_ref<facebook::react::CallInvokerHolder::javaobject>
-        jsCallInvokerHolder) {
+    jni::alias_ref<facebook::react::CallInvokerHolder::javaobject> jsCallInvokerHolder) {
   auto jsCallInvoker = jsCallInvokerHolder->cthis()->getCallInvoker();
   auto rnRuntime = reinterpret_cast<jsi::Runtime *>(jsContext);
 #if RN_AUDIO_API_ENABLE_WORKLETS
   if (jWorkletsModule) {
-    auto castedModule =
-        jni::static_ref_cast<WorkletsModule::javaobject>(jWorkletsModule);
+    auto castedModule = jni::static_ref_cast<WorkletsModule::javaobject>(jWorkletsModule);
     auto workletsModuleProxy = castedModule->cthis()->getWorkletsModuleProxy();
-    return makeCxxInstance(
-        jThis, workletsModuleProxy, rnRuntime, jsCallInvoker);
+    return makeCxxInstance(jThis, workletsModuleProxy, rnRuntime, jsCallInvoker);
   }
-  throw std::runtime_error(
-      "Worklets module is required but not provided from Java/Kotlin side");
+  throw std::runtime_error("Worklets module is required but not provided from Java/Kotlin side");
 #else
   return makeCxxInstance(jThis, rnRuntime, jsCallInvoker);
 #endif
@@ -56,16 +55,12 @@ void AudioAPIModule::registerNatives() {
 
 void AudioAPIModule::injectJSIBindings() {
 #if RN_AUDIO_API_ENABLE_WORKLETS
-  auto uiWorkletRuntime =
-      weakWorkletsModuleProxy_.lock()->getUIWorkletRuntime();
+  auto uiWorkletRuntime = weakWorkletsModuleProxy_.lock()->getUIWorkletRuntime();
 #else
   auto uiWorkletRuntime = nullptr;
 #endif
   AudioAPIModuleInstaller::injectJSIBindings(
-      jsiRuntime_,
-      jsCallInvoker_,
-      audioEventHandlerRegistry_,
-      uiWorkletRuntime);
+      jsiRuntime_, jsCallInvoker_, audioEventHandlerRegistry_, uiWorkletRuntime);
 }
 
 void AudioAPIModule::invokeHandlerWithEventNameAndEventBody(
@@ -97,8 +92,7 @@ void AudioAPIModule::invokeHandlerWithEventNameAndEventBody(
   }
 
   if (audioEventHandlerRegistry_ != nullptr) {
-    audioEventHandlerRegistry_->invokeHandlerWithEventBody(
-        eventName->toStdString(), body);
+    audioEventHandlerRegistry_->invokeHandlerWithEventBody(eventName->toStdString(), body);
   }
 }
 } // namespace audioapi

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

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