react-native-audio-api 0.7.1-nightly-5a218c6-20250810 → 0.7.1-nightly-4d86c14-20250811

package/RNAudioAPI.podspec

@@ -35,15 +35,39 @@ Pod::Spec.new do |s|
 
   s.compiler_flags = "#{folly_flags}"
 
-  s.pod_target_xcconfig = {
-    "USE_HEADERMAP" => "YES",
-    "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
-    "GCC_PREPROCESSOR_DEFINITIONS" => '$(inherited) HAVE_ACCELERATE=1',
-    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/common/cpp\" \"$(PODS_TARGET_SRCROOT)/ios\"",
-    'OTHER_CFLAGS' => "$(inherited) #{folly_flags} #{fabric_flags} #{version_flag}"
-  }
+external_dir = "$(PODS_TARGET_SRCROOT)/common/cpp/audioapi/external"
+# lib_dir = "$(PODS_TARGET_SRCROOT)/common/cpp/audioapi/external/$(PLATFORM_NAME)"
+lib_dir = "$(SRCROOT)/../../../packages/react-native-audio-api/common/cpp/audioapi/external/$(PLATFORM_NAME)"
 
+
+s.pod_target_xcconfig = {
+  "USE_HEADERMAP" => "YES",
+  "CLANG_CXX_LANGUAGE_STANDARD" => "c++20",
+  "GCC_PREPROCESSOR_DEFINITIONS" => '$(inherited) HAVE_ACCELERATE=1',
+  "HEADER_SEARCH_PATHS" => %W[
+    $(PODS_TARGET_SRCROOT)/common/cpp
+    $(PODS_TARGET_SRCROOT)/ios
+    #{external_dir}/include
+    #{external_dir}/include/opus
+    #{external_dir}/include/vorbis
+  ].join(" "),
+  'OTHER_CFLAGS' => "$(inherited) #{folly_flags} #{fabric_flags} #{version_flag}"
+}
+
+s.user_target_xcconfig = {
+  'OTHER_LDFLAGS' => %W[
+    $(inherited)
+    -force_load #{lib_dir}/libopusfile.a
+    -force_load #{lib_dir}/libopus.a
+    -force_load #{lib_dir}/libogg.a
+    -force_load #{lib_dir}/libvorbis.a
+    -force_load #{lib_dir}/libvorbisenc.a
+    -force_load #{lib_dir}/libvorbisfile.a
+  ].join(" ")
+}
   # 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.
   install_modules_dependencies(s)
 end
+
+

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

@@ -3,8 +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(EXTERNAL_DIR ${COMMON_CPP_DIR}/audioapi/external)
+set(ARCH_LIB_DIR ${EXTERNAL_DIR}/${ANDROID_ABI})
+set(INCLUDE_DIR ${EXTERNAL_DIR}/include)
+
 add_library(react-native-audio-api SHARED ${ANDROID_CPP_SOURCES} ${COMMON_CPP_SOURCES})
 
+foreach(lib IN ITEMS opus opusfile ogg vorbis vorbisenc vorbisfile)
+  add_library(${lib} STATIC IMPORTED)
+  set_target_properties(${lib} PROPERTIES IMPORTED_LOCATION ${ARCH_LIB_DIR}/lib${lib}.a)
+endforeach()
+
 find_package(ReactAndroid REQUIRED CONFIG)
 find_package(fbjni REQUIRED CONFIG)
 find_package(oboe REQUIRED CONFIG)
@@ -14,6 +23,9 @@ target_include_directories(
   PRIVATE
   "${COMMON_CPP_DIR}"
   "${ANDROID_CPP_DIR}"
+  "${INCLUDE_DIR}"
+  "${INCLUDE_DIR}/opus"
+  "${INCLUDE_DIR}/vorbis"
   "${REACT_NATIVE_DIR}/ReactCommon"
   "${REACT_NATIVE_DIR}/ReactAndroid/src/main/jni/react/turbomodule"
   "${REACT_NATIVE_DIR}/ReactCommon/callinvoker"
@@ -40,4 +52,13 @@ else()
   )
 endif()
 
-target_link_libraries(react-native-audio-api ${LINK_LIBRARIES} ${RN_VERSION_LINK_LIBRARIES})
+target_link_libraries(react-native-audio-api
+  ${LINK_LIBRARIES}
+  ${RN_VERSION_LINK_LIBRARIES}
+  opusfile
+  opus
+  ogg
+  vorbis
+  vorbisenc
+  vorbisfile
+)

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

@@ -7,59 +7,90 @@
 #define MINIAUDIO_IMPLEMENTATION
 #include <audioapi/libs/miniaudio/miniaudio.h>
 
+#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
+// determined in advance. Note: ma_decoder_get_length_in_pcm_frames() always
+// returns 0 for Vorbis decoders.
+std::vector<int16_t> AudioDecoder::readAllPcmFrames(
+    ma_decoder &decoder,
+    int numChannels,
+    ma_uint64 &outFramesRead) const {
+  std::vector<int16_t> buffer;
+  int16_t temp[CHUNK_SIZE * numChannels];
+  outFramesRead = 0;
+
+  while (true) {
+    ma_uint64 tempFramesDecoded = 0;
+    ma_decoder_read_pcm_frames(&decoder, temp, CHUNK_SIZE, &tempFramesDecoded);
+    if (tempFramesDecoded == 0) {
+      break;
+    }
+
+    buffer.insert(buffer.end(), temp, temp + tempFramesDecoded * numChannels);
+    outFramesRead += tempFramesDecoded;
+  }
+
+  return buffer;
+}
+
+std::shared_ptr<AudioBus> AudioDecoder::makeAudioBusFromInt16Buffer(
+    const std::vector<int16_t> &buffer,
+    int numChannels,
+    float sampleRate) const {
+  auto outputFrames = buffer.size() / numChannels;
+  auto audioBus =
+      std::make_shared<AudioBus>(outputFrames, numChannels, sampleRate);
+
+  for (int ch = 0; ch < numChannels; ++ch) {
+    auto channelData = audioBus->getChannel(ch)->getData();
+    for (int i = 0; i < outputFrames; ++i) {
+      channelData[i] = int16ToFloat(buffer[i * numChannels + ch]);
+    }
+  }
+  return audioBus;
+}
+
 std::shared_ptr<AudioBus> AudioDecoder::decodeWithFilePath(
     const std::string &path) const {
   ma_decoder decoder;
   ma_decoder_config config = ma_decoder_config_init(
       ma_format_s16, numChannels_, static_cast<int>(sampleRate_));
-  ma_result result = ma_decoder_init_file(path.c_str(), &config, &decoder);
-  if (result != MA_SUCCESS) {
+#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_ERROR,
+    //     "AudioDecoder",
+    //     "Failed to initialize decoder for file: %s",
+    //     path.c_str());
     ma_decoder_uninit(&decoder);
-
     return nullptr;
   }
 
-  ma_uint64 totalFrameCount;
-  ma_decoder_get_length_in_pcm_frames(&decoder, &totalFrameCount);
-
-  std::vector<int16_t> buffer(totalFrameCount * numChannels_);
-
-  ma_uint64 framesDecoded;
-  ma_decoder_read_pcm_frames(
-      &decoder, buffer.data(), totalFrameCount, &framesDecoded);
-
-  if (framesDecoded == 0) {
+  ma_uint64 framesRead = 0;
+  auto buffer = readAllPcmFrames(decoder, numChannels_, framesRead);
+  if (framesRead == 0) {
     // __android_log_print(ANDROID_LOG_ERROR, "AudioDecoder", "Failed to
     // decode");
-
     ma_decoder_uninit(&decoder);
     return nullptr;
   }
 
-  auto outputFrames = buffer.size() / numChannels_;
-  auto audioBus =
-      std::make_shared<AudioBus>(outputFrames, numChannels_, sampleRate_);
-
-  for (int i = 0; i < numChannels_; ++i) {
-    auto channelData = audioBus->getChannel(i)->getData();
-
-    for (ma_uint64 j = 0; j < outputFrames; ++j) {
-      channelData[j] = int16ToFloat(buffer[j * numChannels_ + i]);
-    }
-  }
-
   ma_decoder_uninit(&decoder);
-
-  return audioBus;
+  return makeAudioBusFromInt16Buffer(buffer, numChannels_, sampleRate_);
 }
 
 std::shared_ptr<AudioBus> AudioDecoder::decodeWithMemoryBlock(
@@ -68,49 +99,36 @@ std::shared_ptr<AudioBus> AudioDecoder::decodeWithMemoryBlock(
   ma_decoder decoder;
   ma_decoder_config config = ma_decoder_config_init(
       ma_format_s16, numChannels_, static_cast<int>(sampleRate_));
-  ma_result result = ma_decoder_init_memory(data, size, &config, &decoder);
-  if (result != MA_SUCCESS) {
+
+#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_ERROR,
+    //     "AudioDecoder",
+    //     "Failed to initialize decoder for memory block");
     ma_decoder_uninit(&decoder);
-
     return nullptr;
   }
 
-  ma_uint64 totalFrameCount;
-  ma_decoder_get_length_in_pcm_frames(&decoder, &totalFrameCount);
-
-  std::vector<int16_t> buffer(totalFrameCount * numChannels_);
-
-  ma_uint64 framesDecoded;
-  ma_decoder_read_pcm_frames(
-      &decoder, buffer.data(), totalFrameCount, &framesDecoded);
-
-  if (framesDecoded == 0) {
+  ma_uint64 framesRead = 0;
+  auto buffer = readAllPcmFrames(decoder, numChannels_, framesRead);
+  if (framesRead == 0) {
     // __android_log_print(ANDROID_LOG_ERROR, "AudioDecoder", "Failed to
     // decode");
-
     ma_decoder_uninit(&decoder);
     return nullptr;
   }
 
-  auto outputFrames = buffer.size() / numChannels_;
-  auto audioBus =
-      std::make_shared<AudioBus>(outputFrames, numChannels_, sampleRate_);
-
-  for (int i = 0; i < numChannels_; ++i) {
-    auto channelData = audioBus->getChannel(i)->getData();
-
-    for (ma_uint64 j = 0; j < outputFrames; ++j) {
-      channelData[j] = int16ToFloat(buffer[j * numChannels_ + i]);
-    }
-  }
-
   ma_decoder_uninit(&decoder);
-
-  return audioBus;
+  return makeAudioBusFromInt16Buffer(buffer, numChannels_, sampleRate_);
 }
 
 std::shared_ptr<AudioBus> AudioDecoder::decodeWithPCMInBase64(

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

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <audioapi/libs/audio-stretch/stretch.h>
+#include <audioapi/libs/miniaudio/miniaudio.h>
 #include <memory>
 #include <string>
 #include <vector>
@@ -9,48 +10,72 @@ namespace audioapi {
 
 class AudioBus;
 
+static constexpr int CHUNK_SIZE = 4096;
+
 class AudioDecoder {
  public:
-  explicit AudioDecoder(float sampleRate): sampleRate_(sampleRate) {}
+  explicit AudioDecoder(float sampleRate) : sampleRate_(sampleRate) {}
 
-  [[nodiscard]] std::shared_ptr<AudioBus> decodeWithFilePath(const std::string &path) const;
-  [[nodiscard]] std::shared_ptr<AudioBus> decodeWithMemoryBlock(const void *data, size_t size) const;
-  [[nodiscard]] std::shared_ptr<AudioBus> decodeWithPCMInBase64(const std::string &data, float playbackSpeed) const;
+  [[nodiscard]] std::shared_ptr<AudioBus> decodeWithFilePath(
+      const std::string &path) const;
+  [[nodiscard]] std::shared_ptr<AudioBus> decodeWithMemoryBlock(
+      const void *data,
+      size_t size) const;
+  [[nodiscard]] std::shared_ptr<AudioBus> decodeWithPCMInBase64(
+      const std::string &data,
+      float playbackSpeed) const;
 
  private:
   float sampleRate_;
   int numChannels_ = 2;
 
-  void changePlaybackSpeedIfNeeded(std::vector<int16_t> &buffer, size_t framesDecoded, int numChannels, float playbackSpeed) const {
-      if (playbackSpeed == 1.0f) {
-          return;
-      }
-
-      auto stretcher = stretch_init(static_cast<int>(sampleRate_ / 333.0f), static_cast<int>(sampleRate_ / 55.0f), numChannels,  0x1);
-
-      int maxOutputFrames = stretch_output_capacity(stretcher, static_cast<int>(framesDecoded), 1 / playbackSpeed);
-      std::vector<int16_t> stretchedBuffer(maxOutputFrames);
-
-      int outputFrames = stretch_samples(
-              stretcher,
-              buffer.data(),
-              static_cast<int>(framesDecoded),
-              stretchedBuffer.data(),
-              1 / playbackSpeed
-      );
-
-      outputFrames += stretch_flush(stretcher, stretchedBuffer.data() + (outputFrames));
-      stretchedBuffer.resize(outputFrames);
-
-      buffer = stretchedBuffer;
-
-      stretch_deinit(stretcher);
+  std::vector<int16_t> readAllPcmFrames(
+      ma_decoder &decoder,
+      int numChannels,
+      ma_uint64 &outFramesRead) const;
+  std::shared_ptr<AudioBus> makeAudioBusFromInt16Buffer(
+      const std::vector<int16_t> &buffer,
+      int numChannels,
+      float sampleRate) const;
+
+  void changePlaybackSpeedIfNeeded(
+      std::vector<int16_t> &buffer,
+      size_t framesDecoded,
+      int numChannels,
+      float playbackSpeed) const {
+    if (playbackSpeed == 1.0f) {
+      return;
+    }
+
+    auto stretcher = stretch_init(
+        static_cast<int>(sampleRate_ / 333.0f),
+        static_cast<int>(sampleRate_ / 55.0f),
+        numChannels,
+        0x1);
+
+    int maxOutputFrames = stretch_output_capacity(
+        stretcher, static_cast<int>(framesDecoded), 1 / playbackSpeed);
+    std::vector<int16_t> stretchedBuffer(maxOutputFrames);
+
+    int outputFrames = stretch_samples(
+        stretcher,
+        buffer.data(),
+        static_cast<int>(framesDecoded),
+        stretchedBuffer.data(),
+        1 / playbackSpeed);
+
+    outputFrames +=
+        stretch_flush(stretcher, stretchedBuffer.data() + (outputFrames));
+    stretchedBuffer.resize(outputFrames);
+
+    buffer = stretchedBuffer;
+
+    stretch_deinit(stretcher);
   }
 
   [[nodiscard]] static inline int16_t floatToInt16(float sample) {
     return static_cast<int16_t>(sample * 32768.0f);
   }
-
   [[nodiscard]] static inline float int16ToFloat(int16_t sample) {
     return static_cast<float>(sample) / 32768.0f;
   }

package/common/cpp/audioapi/external/include/ogg/config_types.h

@@ -0,0 +1,26 @@
+#ifndef __CONFIG_TYPES_H__
+#define __CONFIG_TYPES_H__
+
+/* these are filled in by configure or cmake*/
+#define INCLUDE_INTTYPES_H 1
+#define INCLUDE_STDINT_H 1
+#define INCLUDE_SYS_TYPES_H 1
+
+#if INCLUDE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#if INCLUDE_STDINT_H
+#include <stdint.h>
+#endif
+#if INCLUDE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+typedef int16_t ogg_int16_t;
+typedef uint16_t ogg_uint16_t;
+typedef int32_t ogg_int32_t;
+typedef uint32_t ogg_uint32_t;
+typedef int64_t ogg_int64_t;
+typedef uint64_t ogg_uint64_t;
+
+#endif

package/common/cpp/audioapi/external/include/ogg/config_types.h.in

@@ -0,0 +1,26 @@
+#ifndef __CONFIG_TYPES_H__
+#define __CONFIG_TYPES_H__
+
+/* these are filled in by configure or cmake*/
+#define INCLUDE_INTTYPES_H @INCLUDE_INTTYPES_H @
+#define INCLUDE_STDINT_H @INCLUDE_STDINT_H @
+#define INCLUDE_SYS_TYPES_H @INCLUDE_SYS_TYPES_H @
+
+#if INCLUDE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#if INCLUDE_STDINT_H
+#include <stdint.h>
+#endif
+#if INCLUDE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+typedef @SIZE16 @ogg_int16_t;
+typedef @USIZE16 @ogg_uint16_t;
+typedef @SIZE32 @ogg_int32_t;
+typedef @USIZE32 @ogg_uint32_t;
+typedef @SIZE64 @ogg_int64_t;
+typedef @USIZE64 @ogg_uint64_t;
+
+#endif