Merge branch 'main' into feat/iir-filter-node

Author: vltkv

packages/react-native-audio-api/.clang-format

@@ -1,5 +1,5 @@
 ---
-ColumnLimit: 80
+ColumnLimit: 100
 AccessModifierOffset: -1
 AlignAfterOpenBracket: AlwaysBreak
 AlignConsecutiveAssignments: false

packages/react-native-audio-api/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
@@ -57,16 +56,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(
@@ -98,8 +93,7 @@ void AudioAPIModule::invokeHandlerWithEventNameAndEventBody(
   }
 
   if (audioEventHandlerRegistry_ != nullptr) {
-    audioEventHandlerRegistry_->invokeHandlerWithEventBody(
-        eventName->toStdString(), body);
+    audioEventHandlerRegistry_->invokeHandlerWithEventBody(eventName->toStdString(), body);
   }
 }
 

packages/react-native-audio-api/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(); });
 }

packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AndroidAudioRecorder.cpp

@@ -7,6 +7,8 @@
 #include <audioapi/utils/CircularAudioArray.h>
 #include <audioapi/utils/CircularOverflowableAudioArray.h>
 
+#include <memory>
+
 namespace audioapi {
 
 AndroidAudioRecorder::AndroidAudioRecorder(
@@ -45,8 +47,7 @@ void AndroidAudioRecorder::start() {
   }
 
   if (mStream_) {
-    jni::ThreadScope::WithClassLoader(
-        [this]() { nativeAudioRecorder_->start(); });
+    jni::ThreadScope::WithClassLoader([this]() { nativeAudioRecorder_->start(); });
     mStream_->requestStart();
   }
 
@@ -61,8 +62,7 @@ void AndroidAudioRecorder::stop() {
   isRunning_.store(false);
 
   if (mStream_) {
-    jni::ThreadScope::WithClassLoader(
-        [this]() { nativeAudioRecorder_->stop(); });
+    jni::ThreadScope::WithClassLoader([this]() { nativeAudioRecorder_->stop(); });
     mStream_->requestStop();
   }
 

packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp

@@ -6,15 +6,16 @@
 #include <audioapi/utils/AudioBus.h>
 #include <jni.h>
 
+#include <algorithm>
+#include <memory>
+
 namespace audioapi {
 
 AudioPlayer::AudioPlayer(
     const std::function<void(std::shared_ptr<AudioBus>, int)> &renderAudio,
     float sampleRate,
     int channelCount)
-    : renderAudio_(renderAudio),
-      sampleRate_(sampleRate),
-      channelCount_(channelCount) {
+    : renderAudio_(renderAudio), sampleRate_(sampleRate), channelCount_(channelCount) {
   isInitialized_ = openAudioStream();
 
   nativeAudioPlayer_ = jni::make_global(NativeAudioPlayer::create());
@@ -36,22 +37,17 @@ bool AudioPlayer::openAudioStream() {
   auto result = builder.openStream(mStream_);
   if (result != oboe::Result::OK || mStream_ == nullptr) {
     __android_log_print(
-        ANDROID_LOG_ERROR,
-        "AudioPlayer",
-        "Failed to open stream: %s",
-        oboe::convertToText(result));
+        ANDROID_LOG_ERROR, "AudioPlayer", "Failed to open stream: %s", oboe::convertToText(result));
     return false;
   }
 
-  mBus_ = std::make_shared<AudioBus>(
-      RENDER_QUANTUM_SIZE, channelCount_, sampleRate_);
+  mBus_ = std::make_shared<AudioBus>(RENDER_QUANTUM_SIZE, channelCount_, sampleRate_);
   return true;
 }
 
 bool AudioPlayer::start() {
   if (mStream_) {
-    jni::ThreadScope::WithClassLoader(
-        [this]() { nativeAudioPlayer_->start(); });
+    jni::ThreadScope::WithClassLoader([this]() { nativeAudioPlayer_->start(); });
     auto result = mStream_->requestStart();
     return result == oboe::Result::OK;
   }
@@ -94,10 +90,8 @@ bool AudioPlayer::isRunning() const {
   return mStream_ && mStream_->getState() == oboe::StreamState::Started;
 }
 
-DataCallbackResult AudioPlayer::onAudioReady(
-    AudioStream *oboeStream,
-    void *audioData,
-    int32_t numFrames) {
+DataCallbackResult
+AudioPlayer::onAudioReady(AudioStream *oboeStream, void *audioData, int32_t numFrames) {
   if (!isInitialized_) {
     return DataCallbackResult::Continue;
   }
@@ -108,8 +102,7 @@ DataCallbackResult AudioPlayer::onAudioReady(
   assert(buffer != nullptr);
 
   while (processedFrames < numFrames) {
-    int framesToProcess =
-        std::min(numFrames - processedFrames, RENDER_QUANTUM_SIZE);
+    int framesToProcess = std::min(numFrames - processedFrames, RENDER_QUANTUM_SIZE);
     renderAudio_(mBus_, framesToProcess);
 
     // TODO: optimize this with SIMD?
@@ -126,9 +119,7 @@ DataCallbackResult AudioPlayer::onAudioReady(
   return DataCallbackResult::Continue;
 }
 
-void AudioPlayer::onErrorAfterClose(
-    oboe::AudioStream *stream,
-    oboe::Result error) {
+void AudioPlayer::onErrorAfterClose(oboe::AudioStream *stream, oboe::Result error) {
   if (error == oboe::Result::ErrorDisconnected) {
     cleanup();
     if (openAudioStream()) {

packages/react-native-audio-api/android/src/main/cpp/audioapi/android/core/utils/AudioDecoder.cpp

@@ -15,31 +15,29 @@
 #include <audioapi/libs/ffmpeg/FFmpegDecoding.h>
 #endif
 
+#include <memory>
+#include <string>
+#include <vector>
+
 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<float> AudioDecoder::readAllPcmFrames(
-    ma_decoder &decoder,
-    int outputChannels) {
+std::vector<float> AudioDecoder::readAllPcmFrames(ma_decoder &decoder, int outputChannels) {
   std::vector<float> buffer;
   std::vector<float> temp(CHUNK_SIZE * outputChannels);
   ma_uint64 outFramesRead = 0;
 
 #ifndef AUDIO_API_TEST_SUITE
   while (true) {
     ma_uint64 tempFramesDecoded = 0;
-    ma_decoder_read_pcm_frames(
-        &decoder, temp.data(), CHUNK_SIZE, &tempFramesDecoded);
+    ma_decoder_read_pcm_frames(&decoder, temp.data(), CHUNK_SIZE, &tempFramesDecoded);
     if (tempFramesDecoded == 0) {
       break;
     }
 
-    buffer.insert(
-        buffer.end(),
-        temp.data(),
-        temp.data() + tempFramesDecoded * outputChannels);
+    buffer.insert(buffer.end(), temp.data(), temp.data() + tempFramesDecoded * outputChannels);
     outFramesRead += tempFramesDecoded;
   }
 
@@ -59,8 +57,7 @@ std::shared_ptr<AudioBuffer> AudioDecoder::makeAudioBufferFromFloatBuffer(
   }
 
   auto outputFrames = buffer.size() / outputChannels;
-  auto audioBus = std::make_shared<AudioBus>(
-      outputFrames, outputChannels, outputSampleRate);
+  auto audioBus = std::make_shared<AudioBus>(outputFrames, outputChannels, outputSampleRate);
 
   for (int ch = 0; ch < outputChannels; ++ch) {
     auto channelData = audioBus->getChannel(ch)->getData();
@@ -76,27 +73,21 @@ std::shared_ptr<AudioBuffer> AudioDecoder::decodeWithFilePath(
     float sampleRate) {
 #ifndef AUDIO_API_TEST_SUITE
   if (AudioDecoder::pathHasExtension(path, {".mp4", ".m4a", ".aac"})) {
-    auto buffer =
-        ffmpegdecoder::decodeWithFilePath(path, static_cast<int>(sampleRate));
+    auto buffer = ffmpegdecoder::decodeWithFilePath(path, static_cast<int>(sampleRate));
     if (buffer == nullptr) {
       __android_log_print(
-          ANDROID_LOG_ERROR,
-          "AudioDecoder",
-          "Failed to decode with FFmpeg: %s",
-          path.c_str());
+          ANDROID_LOG_ERROR, "AudioDecoder", "Failed to decode with FFmpeg: %s", path.c_str());
       return nullptr;
     }
     return buffer;
   }
   ma_decoder decoder;
-  ma_decoder_config config =
-      ma_decoder_config_init(ma_format_f32, 0, static_cast<int>(sampleRate));
+  ma_decoder_config config = ma_decoder_config_init(ma_format_f32, 0, static_cast<int>(sampleRate));
   ma_decoding_backend_vtable *customBackends[] = {
       ma_decoding_backend_libvorbis, ma_decoding_backend_libopus};
 
   config.ppCustomBackendVTables = customBackends;
-  config.customBackendCount =
-      sizeof(customBackends) / sizeof(customBackends[0]);
+  config.customBackendCount = sizeof(customBackends) / sizeof(customBackends[0]);
 
   if (ma_decoder_init_file(path.c_str(), &config, &decoder) != MA_SUCCESS) {
     __android_log_print(
@@ -113,46 +104,36 @@ std::shared_ptr<AudioBuffer> AudioDecoder::decodeWithFilePath(
 
   std::vector<float> buffer = readAllPcmFrames(decoder, outputChannels);
   ma_decoder_uninit(&decoder);
-  return makeAudioBufferFromFloatBuffer(
-      buffer, outputSampleRate, outputChannels);
+  return makeAudioBufferFromFloatBuffer(buffer, outputSampleRate, outputChannels);
 #else
   return nullptr;
 #endif
 }
 
-std::shared_ptr<AudioBuffer> AudioDecoder::decodeWithMemoryBlock(
-    const void *data,
-    size_t size,
-    float sampleRate) {
+std::shared_ptr<AudioBuffer>
+AudioDecoder::decodeWithMemoryBlock(const void *data, size_t size, float sampleRate) {
 #ifndef AUDIO_API_TEST_SUITE
   const AudioFormat format = AudioDecoder::detectAudioFormat(data, size);
-  if (format == AudioFormat::MP4 || format == AudioFormat::M4A ||
-      format == AudioFormat::AAC) {
-    auto buffer = ffmpegdecoder::decodeWithMemoryBlock(
-        data, size, static_cast<int>(sampleRate));
+  if (format == AudioFormat::MP4 || format == AudioFormat::M4A || format == AudioFormat::AAC) {
+    auto buffer = ffmpegdecoder::decodeWithMemoryBlock(data, size, static_cast<int>(sampleRate));
     if (buffer == nullptr) {
-      __android_log_print(
-          ANDROID_LOG_ERROR, "AudioDecoder", "Failed to decode with FFmpeg");
+      __android_log_print(ANDROID_LOG_ERROR, "AudioDecoder", "Failed to decode with FFmpeg");
       return nullptr;
     }
     return buffer;
   }
   ma_decoder decoder;
-  ma_decoder_config config =
-      ma_decoder_config_init(ma_format_f32, 0, static_cast<int>(sampleRate));
+  ma_decoder_config config = ma_decoder_config_init(ma_format_f32, 0, static_cast<int>(sampleRate));
 
   ma_decoding_backend_vtable *customBackends[] = {
       ma_decoding_backend_libvorbis, ma_decoding_backend_libopus};
 
   config.ppCustomBackendVTables = customBackends;
-  config.customBackendCount =
-      sizeof(customBackends) / sizeof(customBackends[0]);
+  config.customBackendCount = sizeof(customBackends) / sizeof(customBackends[0]);
 
   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;
   }
@@ -162,8 +143,7 @@ std::shared_ptr<AudioBuffer> AudioDecoder::decodeWithMemoryBlock(
 
   std::vector<float> buffer = readAllPcmFrames(decoder, outputChannels);
   ma_decoder_uninit(&decoder);
-  return makeAudioBufferFromFloatBuffer(
-      buffer, outputSampleRate, outputChannels);
+  return makeAudioBufferFromFloatBuffer(buffer, outputSampleRate, outputChannels);
 #else
   return nullptr;
 #endif
@@ -176,11 +156,9 @@ std::shared_ptr<AudioBuffer> AudioDecoder::decodeWithPCMInBase64(
     bool interleaved) {
   auto decodedData = base64_decode(data, false);
   const auto uint8Data = reinterpret_cast<uint8_t *>(decodedData.data());
-  size_t numFramesDecoded =
-      decodedData.size() / (inputChannelCount * sizeof(int16_t));
+  size_t numFramesDecoded = decodedData.size() / (inputChannelCount * sizeof(int16_t));
 
-  auto audioBus = std::make_shared<AudioBus>(
-      numFramesDecoded, inputChannelCount, inputSampleRate);
+  auto audioBus = std::make_shared<AudioBus>(numFramesDecoded, inputChannelCount, inputSampleRate);
 
   for (int ch = 0; ch < inputChannelCount; ++ch) {
     auto channelData = audioBus->getChannel(ch)->getData();