Fix/android/audio recorder/missing last audio chunk (#437)

* feat: added core audio event handler class

* feat: added more core for audio event handler

* fix: removed almost all singleton classes

* ci: yarn format

* fix: merged AudioAPIModule with AudioManagerModule

* ci: yarn format

* refactor: refactored android modules structure

* ci: yarn format

* fix: refactored oldArch java specs

* feat: added core audio event handler class

* feat: added more core for audio event handler

* refactor: small refactoring of responsibilities

* ci: yarn format

* fix: removed trash changes

* feat: sth works

* feat: implemented removeAudioEventListener

* ci: yarn format

* refactor: huge refactoring

* fix: small fix

* feat: added event subscription class

* refactor: removed unused checks

* refactor: removed onError and onStatusChange from recorder

* ci: yarn format

* fix: removed unused prop

* feat: base for audio events emitter on android

* feat: passing value to events almost done

* feat: events form native works

* fix: fixed package json lint:ios command

* feat: new recorder api works on android

* ci: yarn format

* feat: new recorder api works

* ci: yarn format

* refactor: refactored duplicated code

* fix: fixed bug

* ci: yarn format

---------

Co-authored-by: Maciej Makowski <[email protected]>

Author: maciejmakowski2003

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

@@ -3,6 +3,7 @@
 #include <audioapi/events/AudioEventHandlerRegistry.h>
 #include <audioapi/utils/AudioArray.h>
 #include <audioapi/utils/AudioBus.h>
+#include <audioapi/utils/CircularAudioArray.h>
 
 namespace audioapi {
 
@@ -21,7 +22,6 @@ AndroidAudioRecorder::AndroidAudioRecorder(
       ->setSampleRateConversionQuality(SampleRateConversionQuality::Medium)
       ->setDataCallback(this)
       ->setSampleRate(static_cast<int>(sampleRate))
-      ->setFramesPerDataCallback(bufferLength)
       ->openStream(mStream_);
 }
 
@@ -36,29 +36,50 @@ AndroidAudioRecorder::~AndroidAudioRecorder() {
 }
 
 void AndroidAudioRecorder::start() {
+  if (isRunning_.load()) {
+    return;
+  }
+
   if (mStream_) {
     mStream_->requestStart();
   }
+
+  isRunning_.store(true);
 }
 
 void AndroidAudioRecorder::stop() {
+  if (!isRunning_.load()) {
+    return;
+  }
+
+  isRunning_.store(false);
+
   if (mStream_) {
     mStream_->requestStop();
   }
+
+  sendRemainingData();
 }
 
 DataCallbackResult AndroidAudioRecorder::onAudioReady(
     oboe::AudioStream *oboeStream,
     void *audioData,
     int32_t numFrames) {
-  auto buffer = static_cast<float *>(audioData);
+  if (isRunning_.load()) {
+    auto *inputChannel = static_cast<float *>(audioData);
+    circularBuffer_->push_back(inputChannel, numFrames);
+  }
 
-  auto bus = std::make_shared<AudioBus>(bufferLength_, 1, sampleRate_);
-  memcpy(bus->getChannel(0)->getData(), buffer, numFrames * sizeof(float));
-  auto when = static_cast<double>(
-      oboeStream->getTimestamp(CLOCK_MONOTONIC).value().timestamp);
+  while (circularBuffer_->getNumberOfAvailableFrames() >= bufferLength_) {
+    auto bus = std::make_shared<AudioBus>(bufferLength_, 1, sampleRate_);
+    auto *outputChannel = bus->getChannel(0)->getData();
 
-  invokeOnAudioReadyCallback(bus, numFrames, when);
+    circularBuffer_->pop_front(outputChannel, bufferLength_);
+    auto when = static_cast<double>(
+        oboeStream->getTimestamp(CLOCK_MONOTONIC).value().timestamp);
+
+    invokeOnAudioReadyCallback(bus, bufferLength_, when);
+  }
 
   return DataCallbackResult::Continue;
 }

packages/react-native-audio-api/android/src/main/java/com/swmansion/audioapi/system/AudioFocusListener.kt

@@ -15,6 +15,7 @@ class AudioFocusListener(
 ) : AudioManager.OnAudioFocusChangeListener {
   private var playOnAudioFocus = false
   private var focusRequest: AudioFocusRequest? = null
+  private val audioAPIModule: WeakReference<AudioAPIModule> = WeakReference(audioAPIModule)
 
   override fun onAudioFocusChange(focusChange: Int) {
     Log.d("AudioFocusListener", "onAudioFocusChange: $focusChange")

packages/react-native-audio-api/android/src/main/java/com/swmansion/audioapi/system/MediaSessionCallback.kt

@@ -13,6 +13,8 @@ class MediaSessionCallback(
   private val audioAPIModule: WeakReference<AudioAPIModule>,
   private val lockScreenManager: WeakReference<LockScreenManager>,
 ) : MediaSessionCompat.Callback() {
+  private val audioAPIModule: WeakReference<AudioAPIModule> = WeakReference(audioAPIModule)
+
   override fun onPlay() {
     lockScreenManager.get()?.updatePlaybackState(PlaybackStateCompat.STATE_PLAYING)
     audioAPIModule.get()?.invokeHandlerWithEventNameAndEventBody("remotePlay", mapOf())

packages/react-native-audio-api/android/src/main/java/com/swmansion/audioapi/system/VolumeChangeListener.kt

@@ -13,6 +13,8 @@ class VolumeChangeListener(
   private val audioManager: WeakReference<AudioManager>,
   private val audioAPIModule: WeakReference<AudioAPIModule>,
 ) : BroadcastReceiver() {
+  private val audioAPIModule: WeakReference<AudioAPIModule> = WeakReference(audioAPIModule)
+
   override fun onReceive(
     context: Context?,
     intent: Intent?,

packages/react-native-audio-api/common/cpp/audioapi/core/inputs/AudioRecorder.cpp

@@ -2,6 +2,8 @@
 #include <audioapi/core/inputs/AudioRecorder.h>
 #include <audioapi/core/sources/AudioBuffer.h>
 #include <audioapi/events/AudioEventHandlerRegistry.h>
+#include <audioapi/utils/AudioBus.h>
+#include <audioapi/utils/CircularAudioArray.h>
 
 namespace audioapi {
 
@@ -11,7 +13,11 @@ AudioRecorder::AudioRecorder(
     const std::shared_ptr<AudioEventHandlerRegistry> &audioEventHandlerRegistry)
     : sampleRate_(sampleRate),
       bufferLength_(bufferLength),
-      audioEventHandlerRegistry_(audioEventHandlerRegistry) {}
+      audioEventHandlerRegistry_(audioEventHandlerRegistry) {
+  circularBuffer_ =
+      std::make_shared<CircularAudioArray>(std::max(2 * bufferLength, 2048));
+  isRunning_.store(false);
+}
 
 void AudioRecorder::setOnAudioReadyCallbackId(uint64_t callbackId) {
   onAudioReadyCallbackId_ = callbackId;
@@ -34,4 +40,17 @@ void AudioRecorder::invokeOnAudioReadyCallback(
       "audioReady", onAudioReadyCallbackId_, body);
 }
 
+void AudioRecorder::sendRemainingData() {
+  auto bus = std::make_shared<AudioBus>(
+      circularBuffer_->getNumberOfAvailableFrames(), 1, sampleRate_);
+  auto *outputChannel = bus->getChannel(0)->getData();
+  auto availableFrames =
+      static_cast<int>(circularBuffer_->getNumberOfAvailableFrames());
+
+  circularBuffer_->pop_front(
+      outputChannel, circularBuffer_->getNumberOfAvailableFrames());
+
+  invokeOnAudioReadyCallback(bus, availableFrames, 0);
+}
+
 } // namespace audioapi

packages/react-native-audio-api/common/cpp/audioapi/core/inputs/AudioRecorder.h

@@ -4,6 +4,7 @@
 
 namespace audioapi {
 class AudioBus;
+class CircularAudioArray;
 class AudioEventHandlerRegistry;
 
 class AudioRecorder {
@@ -18,6 +19,7 @@ class AudioRecorder {
 
   void setOnAudioReadyCallbackId(uint64_t callbackId);
   void invokeOnAudioReadyCallback(const std::shared_ptr<AudioBus> &bus, int numFrames, double when);
+  void sendRemainingData();
 
   virtual void start() = 0;
   virtual void stop() = 0;
@@ -26,6 +28,9 @@ class AudioRecorder {
   float sampleRate_;
   int bufferLength_;
 
+  std::atomic<bool> isRunning_;
+  std::shared_ptr<CircularAudioArray> circularBuffer_;
+
   std::shared_ptr<AudioEventHandlerRegistry> audioEventHandlerRegistry_;
   uint64_t onAudioReadyCallbackId_ = 0;
 };

packages/react-native-audio-api/common/cpp/audioapi/core/sources/OscillatorNode.cpp

@@ -70,7 +70,8 @@ void OscillatorNode::processNode(
   for (size_t i = startOffset; i < offsetLength; i += 1) {
     auto detuneRatio = std::pow(
         2.0f, detuneParamValues->getChannel(0)->getData()[i] / 1200.0f);
-    auto detunedFrequency = frequencyParamValues->getChannel(0)->getData()[i] * detuneRatio;
+    auto detunedFrequency =
+        frequencyParamValues->getChannel(0)->getData()[i] * detuneRatio;
     auto phaseIncrement = detunedFrequency * periodicWave_->getScale();
 
     float sample =

packages/react-native-audio-api/ios/audioapi/ios/core/IOSAudioRecorder.h

@@ -28,11 +28,6 @@ class IOSAudioRecorder : public AudioRecorder {
 
  private:
   NativeAudioRecorder *audioRecorder_;
-  std::atomic<bool> isRunning_;
-
-  std::shared_ptr<CircularAudioArray> circularBuffer_;
-
-  void sendRemainingData();
 };
 
 } // namespace audioapi

packages/react-native-audio-api/ios/audioapi/ios/core/IOSAudioRecorder.mm

@@ -17,8 +17,6 @@
     const std::shared_ptr<AudioEventHandlerRegistry> &audioEventHandlerRegistry)
     : AudioRecorder(sampleRate, bufferLength, audioEventHandlerRegistry)
 {
-  circularBuffer_ = std::make_shared<CircularAudioArray>(std::max(2 * bufferLength, 2048));
-
   AudioReceiverBlock audioReceiverBlock = ^(const AudioBufferList *inputBuffer, int numFrames, AVAudioTime *when) {
     if (isRunning_.load()) {
       auto *inputChannel = static_cast<float *>(inputBuffer->mBuffers[0].mData);
@@ -70,15 +68,4 @@
   sendRemainingData();
 }
 
-void IOSAudioRecorder::sendRemainingData()
-{
-  auto bus = std::make_shared<AudioBus>(circularBuffer_->getNumberOfAvailableFrames(), 1, sampleRate_);
-  auto *outputChannel = bus->getChannel(0)->getData();
-  auto availableFrames = static_cast<int>(circularBuffer_->getNumberOfAvailableFrames());
-
-  circularBuffer_->pop_front(outputChannel, circularBuffer_->getNumberOfAvailableFrames());
-
-  invokeOnAudioReadyCallback(bus, availableFrames, 0);
-}
-
 } // namespace audioapi

packages/react-native-audio-api/ios/audioapi/ios/events/IOSAudioEventHandlerRegistry.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#import <Foundation/Foundation.h>
+
+@interface IOSAudioEventHandlerRegistry : NSObject
+
+-