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

package/ios/audioapi/ios/core/AudioDecoder.mm

@@ -1,6 +1,9 @@
 #define MINIAUDIO_IMPLEMENTATION
 #import <audioapi/libs/miniaudio/miniaudio.h>
 
+#include <audioapi/libs/miniaudio/decoders/libopus/miniaudio_libopus.h>
+#include <audioapi/libs/miniaudio/decoders/libvorbis/miniaudio_libvorbis.h>
+
 #include <audioapi/core/utils/AudioDecoder.h>
 #include <audioapi/dsp/VectorMath.h>
 #include <audioapi/libs/audio-stretch/stretch.h>
@@ -10,89 +13,97 @@
 
 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_decoding_backend_vtable *customBackends[] = {ma_decoding_backend_libvorbis, ma_decoding_backend_libopus};
+
   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) {
-    NSLog(@"Failed to initialize decoder for file: %s", path.c_str());
+  config.ppCustomBackendVTables = customBackends;
+  config.customBackendCount = sizeof(customBackends) / sizeof(customBackends[0]);
 
+  if (ma_decoder_init_file(path.c_str(), &config, &decoder) != MA_SUCCESS) {
+    NSLog(@"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) {
     NSLog(@"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 (int 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(const void *data, size_t size) const
 {
+  ma_decoding_backend_vtable *customBackends[] = {ma_decoding_backend_libvorbis, ma_decoding_backend_libopus};
+
   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) {
-    NSLog(@"Failed to initialize decoder for memory block");
+  config.ppCustomBackendVTables = customBackends;
+  config.customBackendCount = sizeof(customBackends) / sizeof(customBackends[0]);
 
+  if (ma_decoder_init_memory(data, size, &config, &decoder) != MA_SUCCESS) {
+    NSLog(@"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) {
     NSLog(@"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 (int 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(const std::string &data, float playbackSpeed) const

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-audio-api",
-  "version": "0.7.1-nightly-5a218c6-20250810",
+  "version": "0.7.1-nightly-4d86c14-20250811",
   "description": "react-native-audio-api provides system for controlling audio in React Native environment compatible with Web Audio API specification",
   "bin": {
     "setup-rn-audio-api-web": "./scripts/setup-rn-audio-api-web.js"