react-native-audio-api 0.8.0-nightly-daaceff-20250902 → 0.8.0

package/android/build.gradle

@@ -230,7 +230,7 @@ dependencies {
 
 def assertMinimalReactNativeVersion = task assertMinimalReactNativeVersionTask {
     // If you change the minimal React Native version remember to update Compatibility Table in docs
-    def minimalReactNativeVersion = 75
+    def minimalReactNativeVersion = 76
     onlyIf { REACT_NATIVE_MINOR_VERSION < minimalReactNativeVersion }
     doFirst {
         throw new GradleException("[AudioAPI] Unsupported React Native version. Please use $minimalReactNativeVersion. or newer.")

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

@@ -48,18 +48,9 @@ set(LINK_LIBRARIES
   oboe::oboe
 )
 
-if(ReactAndroid_VERSION_MINOR GREATER_EQUAL 76)
-  set(RN_VERSION_LINK_LIBRARIES
-    ReactAndroid::reactnative
-  )
-else()
-  set(RN_VERSION_LINK_LIBRARIES
-    ReactAndroid::folly_runtime
-    ReactAndroid::react_nativemodule_core
-    ReactAndroid::glog
-    ReactAndroid::reactnativejni
-  )
-endif()
+set(RN_VERSION_LINK_LIBRARIES
+  ReactAndroid::reactnative
+)
 
 target_link_libraries(react-native-audio-api
   ${LINK_LIBRARIES}

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

@@ -7,11 +7,13 @@
 #define MINIAUDIO_IMPLEMENTATION
 #include <audioapi/libs/miniaudio/miniaudio.h>
 
+#ifndef AUDIO_API_TEST_SUITE
+#include <android/log.h>
+#include <audioapi/libs/ffmpeg/FFmpegDecoding.h>
+#endif
 #include <audioapi/libs/miniaudio/decoders/libopus/miniaudio_libopus.h>
 #include <audioapi/libs/miniaudio/decoders/libvorbis/miniaudio_libvorbis.h>
 
-// #include <android/log.h>
-
 namespace audioapi {
 
 // Decoding audio in fixed-size chunks because total frame count can't be
@@ -62,77 +64,105 @@ std::shared_ptr<AudioBus> AudioDecoder::makeAudioBusFromInt16Buffer(
 
 std::shared_ptr<AudioBus> AudioDecoder::decodeWithFilePath(
     const std::string &path) const {
+#ifndef AUDIO_API_TEST_SUITE
+  std::vector<int16_t> buffer;
+  if (AudioDecoder::pathHasExtension(path, {".mp4", ".m4a", ".aac"})) {
+    buffer =
+        ffmpegdecoding::decodeWithFilePath(path, static_cast<int>(sampleRate_));
+    if (buffer.empty()) {
+      __android_log_print(
+          ANDROID_LOG_ERROR,
+          "AudioDecoder",
+          "Failed to decode with FFmpeg: %s",
+          path.c_str());
+      return nullptr;
+    }
+    return makeAudioBusFromInt16Buffer(buffer, numChannels_, sampleRate_);
+  }
   ma_decoder decoder;
   ma_decoder_config config = ma_decoder_config_init(
       ma_format_s16, numChannels_, static_cast<int>(sampleRate_));
-#ifndef AUDIO_API_TEST_SUITE
   ma_decoding_backend_vtable *customBackends[] = {
       ma_decoding_backend_libvorbis, ma_decoding_backend_libopus};
 
   config.ppCustomBackendVTables = customBackends;
   config.customBackendCount =
       sizeof(customBackends) / sizeof(customBackends[0]);
-#endif
 
   if (ma_decoder_init_file(path.c_str(), &config, &decoder) != 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;
   }
 
   ma_uint64 framesRead = 0;
-  auto buffer = readAllPcmFrames(decoder, numChannels_, framesRead);
+  buffer = readAllPcmFrames(decoder, numChannels_, framesRead);
   if (framesRead == 0) {
-    // __android_log_print(ANDROID_LOG_ERROR, "AudioDecoder", "Failed to
-    // decode");
+    __android_log_print(ANDROID_LOG_ERROR, "AudioDecoder", "Failed to decode");
     ma_decoder_uninit(&decoder);
     return nullptr;
   }
 
   ma_decoder_uninit(&decoder);
   return makeAudioBusFromInt16Buffer(buffer, numChannels_, sampleRate_);
+#else
+  return nullptr;
+#endif
 }
 
 std::shared_ptr<AudioBus> AudioDecoder::decodeWithMemoryBlock(
     const void *data,
     size_t size) const {
+#ifndef AUDIO_API_TEST_SUITE
+  std::vector<int16_t> buffer;
+  const AudioFormat format = AudioDecoder::detectAudioFormat(data, size);
+  if (format == AudioFormat::MP4 || format == AudioFormat::M4A ||
+      format == AudioFormat::AAC) {
+    buffer = ffmpegdecoding::decodeWithMemoryBlock(data, size, sampleRate_);
+    if (buffer.empty()) {
+      __android_log_print(
+          ANDROID_LOG_ERROR, "AudioDecoder", "Failed to decode with FFmpeg");
+      return nullptr;
+    }
+    return makeAudioBusFromInt16Buffer(buffer, numChannels_, sampleRate_);
+  }
   ma_decoder decoder;
   ma_decoder_config config = ma_decoder_config_init(
       ma_format_s16, numChannels_, static_cast<int>(sampleRate_));
 
-#ifndef AUDIO_API_TEST_SUITE
   ma_decoding_backend_vtable *customBackends[] = {
       ma_decoding_backend_libvorbis, ma_decoding_backend_libopus};
 
   config.ppCustomBackendVTables = customBackends;
   config.customBackendCount =
       sizeof(customBackends) / sizeof(customBackends[0]);
-#endif
 
   if (ma_decoder_init_memory(data, size, &config, &decoder) != 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;
   }
 
   ma_uint64 framesRead = 0;
-  auto buffer = readAllPcmFrames(decoder, numChannels_, framesRead);
+  buffer = readAllPcmFrames(decoder, numChannels_, framesRead);
   if (framesRead == 0) {
-    // __android_log_print(ANDROID_LOG_ERROR, "AudioDecoder", "Failed to
-    // decode");
+    __android_log_print(ANDROID_LOG_ERROR, "AudioDecoder", "Failed to decode");
     ma_decoder_uninit(&decoder);
     return nullptr;
   }
 
   ma_decoder_uninit(&decoder);
   return makeAudioBusFromInt16Buffer(buffer, numChannels_, sampleRate_);
+#else
+  return nullptr;
+#endif
 }
 
 std::shared_ptr<AudioBus> AudioDecoder::decodeWithPCMInBase64(

package/common/cpp/audioapi/core/utils/AudioDecoder.h

@@ -5,9 +5,23 @@
 #include <memory>
 #include <string>
 #include <vector>
+#include <cstring>
+#include <algorithm>
 
 namespace audioapi {
 
+enum class AudioFormat {
+  UNKNOWN,
+  WAV,
+  OGG,
+  FLAC,
+  AAC,
+  MP3,
+  M4A,
+  MP4,
+  MOV
+};
+
 class AudioBus;
 
 static constexpr int CHUNK_SIZE = 4096;
@@ -73,6 +87,53 @@ class AudioDecoder {
     stretch_deinit(stretcher);
   }
 
+  static AudioFormat detectAudioFormat(const void* data, size_t size) {
+    if (size < 12) return AudioFormat::UNKNOWN;
+    const auto* bytes = static_cast<const unsigned char*>(data);
+
+    // WAV/RIFF
+    if (std::memcmp(bytes, "RIFF", 4) == 0 && std::memcmp(bytes + 8, "WAVE", 4) == 0)
+        return AudioFormat::WAV;
+
+    // OGG
+    if (std::memcmp(bytes, "OggS", 4) == 0)
+        return AudioFormat::OGG;
+
+    // FLAC
+    if (std::memcmp(bytes, "fLaC", 4) == 0)
+        return AudioFormat::FLAC;
+
+    // AAC starts with 0xFF 0xF1 or 0xFF 0xF9
+    if (bytes[0] == 0xFF && (bytes[1] & 0xF6) == 0xF0)
+        return AudioFormat::AAC;
+
+    // MP3: "ID3" or 11-bit frame sync (0xFF 0xE0)
+    if (std::memcmp(bytes, "ID3", 3) == 0)
+        return AudioFormat::MP3;
+    if (bytes[0] == 0xFF && (bytes[1] & 0xE0) == 0xE0)
+        return AudioFormat::MP3;
+
+    if (std::memcmp(bytes + 4, "ftyp", 4) == 0) {
+        if (std::memcmp(bytes + 8, "M4A ", 4) == 0)
+            return AudioFormat::M4A;
+        else if (std::memcmp(bytes + 8, "qt  ", 4) == 0)
+            return AudioFormat::MOV;
+        return AudioFormat::MP4;
+    }
+    return AudioFormat::UNKNOWN;
+  }
+
+  static inline bool pathHasExtension(const std::string &path, const std::vector<std::string> &extensions) {
+    std::string pathLower = path;
+    std::transform(pathLower.begin(), pathLower.end(), pathLower.begin(), ::tolower);
+    for (const auto& ext : extensions) {
+        if (pathLower.ends_with(ext))
+            return true;
+    }
+    return false;
+  }
+
+
   [[nodiscard]] static inline int16_t floatToInt16(float sample) {
     return static_cast<int16_t>(sample * 32768.0f);
   }

package/common/cpp/audioapi/core/utils/AudioNodeManager.cpp

@@ -213,6 +213,18 @@ void AudioNodeManager::handleAddToDeconstructionEvent(
   }
 }
 
+template <typename U>
+inline bool AudioNodeManager::nodeCanBeDestructed(
+    std::shared_ptr<U> const &node) {
+  // If the node is an AudioScheduledSourceNode, we need to check if it is
+  // playing
+  if constexpr (std::is_base_of_v<AudioScheduledSourceNode, U>) {
+    return node.use_count() == 1 &&
+        (node->isUnscheduled() || node->isFinished());
+  }
+  return node.use_count() == 1;
+}
+
 template <typename U>
 void AudioNodeManager::prepareNodesForDestruction(
     std::vector<std::shared_ptr<U>> &vec) {
@@ -238,10 +250,10 @@ void AudioNodeManager::prepareNodesForDestruction(
   // nodes in range [begin, vec.size()) should be deleted
   // so new size of the vector will be `begin`
   while (begin <= end) {
-    while (begin < end && vec[end].use_count() == 1) {
+    while (begin < end && AudioNodeManager::nodeCanBeDestructed(vec[end])) {
       end--;
     }
-    if (vec[begin].use_count() == 1) {
+    if (AudioNodeManager::nodeCanBeDestructed(vec[begin])) {
       std::swap(vec[begin], vec[end]);
       end--;
     }

package/common/cpp/audioapi/core/utils/AudioNodeManager.h

@@ -126,6 +126,9 @@ class AudioNodeManager {
 
   template <typename U>
   void prepareNodesForDestruction(std::vector<std::shared_ptr<U>> &vec);
+
+  template <typename U>
+  inline static bool nodeCanBeDestructed(std::shared_ptr<U> const& node);
 };
 
 #undef AUDIO_NODE_MANAGER_SPSC_OPTIONS

package/common/cpp/audioapi/external/libavcodec.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>libavcodec.framework/libavcodec</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libavcodec.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libavcodec.framework/libavcodec</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libavcodec.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/common/cpp/audioapi/external/libavformat.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>libavformat.framework/libavformat</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libavformat.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libavformat.framework/libavformat</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libavformat.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/common/cpp/audioapi/external/libavutil.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>libavutil.framework/libavutil</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libavutil.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libavutil.framework/libavutil</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libavutil.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>