react-native-audio-api 0.4.8-rc2 → 0.4.9

package/android/CMakeLists.txt

@@ -15,9 +15,10 @@ include("${REACT_NATIVE_DIR}/ReactAndroid/cmake-utils/folly-flags.cmake")
 add_compile_options(${folly_FLAGS})
 
 file(GLOB_RECURSE ANDROID_CPP_SOURCES CONFIGURE_DEPENDS "src/main/cpp/*.cpp")
+file(GLOB_RECURSE ANDROID_C_SOURCES CONFIGURE_DEPENDS "src/main/cpp/*.c")
 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 ${ANDROID_CPP_SOURCES} ${ANDROID_C_SOURCES} ${COMMON_CPP_SOURCES})
 
 file(GLOB ANDROID_CPP_DIR CONFIGURE_DEPENDS "src/main/cpp/**")
 file(GLOB COMMON_CPP_DIR CONFIGURE_DEPENDS "../common/cpp/**")
@@ -36,11 +37,8 @@ target_include_directories(
   "${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"
 )
 
-set(fftw3 ${CMAKE_CURRENT_SOURCE_DIR}/libs/${ANDROID_ABI}/libfftw3.a)
-
 find_package(ReactAndroid REQUIRED CONFIG)
 find_package(fbjni REQUIRED CONFIG)
 find_package(oboe REQUIRED CONFIG)
@@ -51,7 +49,6 @@ set(LINK_LIBRARIES
   android
   log
   oboe::oboe
-  ${fftw3}
 )
 
 if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)

package/android/build.gradle

@@ -118,13 +118,36 @@ android {
                   "-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}"
+                  "-DIS_NEW_ARCHITECTURE_ENABLED=${IS_NEW_ARCHITECTURE_ENABLED}",
+                  "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
       }
     }
   }
 
   packagingOptions {
-    excludes = ["**/libc++_shared.so", "**/libfbjni.so", "**/libjsi.so", "**/libreactnativejni.so", "**/libfolly_json.so", "**/libreanimated.so", "**/libjscexecutor.so", "**/libhermes.so"]
+    excludes = [
+      "META-INF",
+      "META-INF/**",
+      "**/libc++_shared.so",
+      "**/libfbjni.so",
+      "**/libjsi.so",
+      "**/libfolly_json.so",
+      "**/libfolly_runtime.so",
+      "**/libglog.so",
+      "**/libhermes.so",
+      "**/libhermes-executor-debug.so",
+      "**/libhermes_executor.so",
+      "**/libhermestooling.so",
+      "**/libreactnativejni.so",
+      "**/libturbomodulejsijni.so",
+      "**/libreactnative.so",
+      "**/libreact_nativemodule_core.so",
+      "**/libreact_render*.so",
+      "**/librrc_root.so",
+      "**/libjscexecutor.so",
+      "**/libv8executor.so",
+      "**/libreanimated.so"
+    ]
   }
 
   externalNativeBuild {

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

@@ -20,6 +20,9 @@ AudioBus *AudioDecoder::decodeWithFilePath(const std::string &path) const {
         "AudioDecoder",
         "Failed to initialize decoder for file: %s",
         path.c_str());
+
+    ma_decoder_uninit(&decoder);
+
     return nullptr;
   }
 
@@ -27,7 +30,7 @@ AudioBus *AudioDecoder::decodeWithFilePath(const std::string &path) const {
   ma_decoder_get_length_in_pcm_frames(&decoder, &totalFrameCount);
 
   auto *audioBus =
-      new AudioBus(sampleRate_, static_cast<int>(totalFrameCount), 2);
+      new AudioBus(static_cast<int>(totalFrameCount), 2, sampleRate_);
   auto *buffer = new float[totalFrameCount * 2];
 
   ma_uint64 framesDecoded;
@@ -38,6 +41,12 @@ AudioBus *AudioDecoder::decodeWithFilePath(const std::string &path) const {
         "AudioDecoder",
         "Failed to decode audio file: %s",
         path.c_str());
+
+    delete[] buffer;
+    delete audioBus;
+    ma_decoder_uninit(&decoder);
+
+    return nullptr;
   }
 
   for (int i = 0; i < decoder.outputChannels; ++i) {

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

@@ -1,8 +1,9 @@
+#include <cassert>
 
-#include "AudioPlayer.h"
 #include "AudioArray.h"
 #include "AudioBus.h"
 #include "AudioContext.h"
+#include "AudioPlayer.h"
 #include "Constants.h"
 
 namespace audioapi {
@@ -23,7 +24,7 @@ AudioPlayer::AudioPlayer(
 
   sampleRate_ = static_cast<float>(mStream_->getSampleRate());
   mBus_ = std::make_shared<AudioBus>(
-      sampleRate_, RENDER_QUANTUM_SIZE, CHANNEL_COUNT);
+      RENDER_QUANTUM_SIZE, CHANNEL_COUNT, sampleRate_);
   isInitialized_ = true;
 }
 
@@ -45,7 +46,7 @@ AudioPlayer::AudioPlayer(
 
   sampleRate_ = sampleRate;
   mBus_ = std::make_shared<AudioBus>(
-      sampleRate_, RENDER_QUANTUM_SIZE, CHANNEL_COUNT);
+      RENDER_QUANTUM_SIZE, CHANNEL_COUNT, sampleRate_);
   isInitialized_ = true;
 }
 
@@ -80,6 +81,8 @@ DataCallbackResult AudioPlayer::onAudioReady(
   auto buffer = static_cast<float *>(audioData);
   int processedFrames = 0;
 
+  assert(buffer != nullptr);
+
   while (processedFrames < numFrames) {
     int framesToProcess =
         std::min(numFrames - processedFrames, RENDER_QUANTUM_SIZE);