fix: correct recorder revive after connecting different source

apps/fabric-example/ios/FabricExampleTests/AudioEngineTests.mm

@@ -422,7 +422,8 @@ - (void)testDetachSourceNodeRemovesTrackedNodeAndClearsGraphWhenEmpty {
 - (void)testDetachSourceNodeKeepsGraphNeedsRebuildWhenInputRemains {
   NSString *sourceNodeId = [self attachSourceNodeToAudioEngine];
   [self.audioEngine
-      attachInputNodeWithReceiverBlock:[self testInputReceiverBlock]];
+      attachInputNodeWithReceiverBlock:[self testInputReceiverBlock]
+             onInputConfigurationChange:nil];
   self.audioEngine.graphNeedsRebuild = YES;
 
   [self.audioEngine detachSourceNodeWithId:sourceNodeId];
@@ -435,7 +436,8 @@ - (void)testDetachSourceNodeKeepsGraphNeedsRebuildWhenInputRemains {
 - (void)testAttachInputNodeStoresAndConnectsInput {
   FakeAudioEngine *fakeEngine = self.audioEngine.currentFakeAudioEngine;
   [self.audioEngine
-      attachInputNodeWithReceiverBlock:[self testInputReceiverBlock]];
+      attachInputNodeWithReceiverBlock:[self testInputReceiverBlock]
+             onInputConfigurationChange:nil];
 
   AVAudioSinkNode *inputNode = self.audioEngine.inputNode;
   XCTAssertNotNil(inputNode);
@@ -455,7 +457,8 @@ - (void)testAttachInputNodeDefersConnectionUntilLiveInputFormatIsAvailable {
   fakeEngine.fakeInputNode.outputFormat = nil;
 
   [self.audioEngine
-      attachInputNodeWithReceiverBlock:[self testInputReceiverBlock]];
+      attachInputNodeWithReceiverBlock:[self testInputReceiverBlock]
+             onInputConfigurationChange:nil];
 
   XCTAssertNil(self.audioEngine.inputNode);
   XCTAssertEqual(fakeEngine.attachNodeCallCount, 0);
@@ -483,7 +486,8 @@ - (void)testDetachInputNodeWithoutInputDoesNothing {
 
 - (void)testDetachInputNodeClearsGraphOnlyWhenNoSourcesRemain {
   [self.audioEngine
-      attachInputNodeWithReceiverBlock:[self testInputReceiverBlock]];
+      attachInputNodeWithReceiverBlock:[self testInputReceiverBlock]
+             onInputConfigurationChange:nil];
   self.audioEngine.graphNeedsRebuild = YES;
 
   [self.audioEngine detachInputNode];
@@ -493,7 +497,8 @@ - (void)testDetachInputNodeClearsGraphOnlyWhenNoSourcesRemain {
 
   [self attachSourceNodeToAudioEngine];
   [self.audioEngine
-      attachInputNodeWithReceiverBlock:[self testInputReceiverBlock]];
+      attachInputNodeWithReceiverBlock:[self testInputReceiverBlock]
+             onInputConfigurationChange:nil];
   self.audioEngine.graphNeedsRebuild = YES;
 
   [self.audioEngine detachInputNode];
@@ -507,7 +512,8 @@ - (void)testDetachInputNodePreservesSessionDeactivationInvalidation {
   fakeEngine.fakeRunning = YES;
   self.audioEngine.state = AudioEngineStateRunning;
   [self.audioEngine
-      attachInputNodeWithReceiverBlock:[self testInputReceiverBlock]];
+      attachInputNodeWithReceiverBlock:[self testInputReceiverBlock]
+             onInputConfigurationChange:nil];
 
   [self.audioEngine onSessionDeactivated];
   [self.audioEngine detachInputNode];
@@ -730,7 +736,8 @@ - (void)testStartIfNecessaryRebuildsWhenGraphNeedsRebuild {
 - (void)
     testStartIfNecessaryRebuildsAfterSessionDeactivationEvenWhenTeardownClearsGraph {
   [self.audioEngine
-      attachInputNodeWithReceiverBlock:[self testInputReceiverBlock]];
+      attachInputNodeWithReceiverBlock:[self testInputReceiverBlock]
+             onInputConfigurationChange:nil];
 
   FakeAudioEngine *oldEngine = self.audioEngine.currentFakeAudioEngine;
   oldEngine.fakeRunning = YES;
@@ -748,7 +755,8 @@ - (void)testStartIfNecessaryRebuildsWhenGraphNeedsRebuild {
       [self testInputFormatWithSampleRate:48000 channelCount:1];
   self.audioEngine.nextCreatedEngineInputFormat = recoveredInputFormat;
   [self.audioEngine
-      attachInputNodeWithReceiverBlock:[self testInputReceiverBlock]];
+      attachInputNodeWithReceiverBlock:[self testInputReceiverBlock]
+             onInputConfigurationChange:nil];
   AVAudioSinkNode *recoveredInputNode = self.audioEngine.inputNode;
 
   XCTAssertTrue([self.audioEngine startIfNecessary]);
@@ -770,7 +778,8 @@ - (void)testStartIfNecessaryRebuildsWhenGraphNeedsRebuild {
 
 - (void)testStartIfNecessaryRebuildsInputNodeWithFreshInstance {
   [self.audioEngine
-      attachInputNodeWithReceiverBlock:[self testInputReceiverBlock]];
+      attachInputNodeWithReceiverBlock:[self testInputReceiverBlock]
+             onInputConfigurationChange:nil];
   FakeAudioEngine *oldEngine = self.audioEngine.currentFakeAudioEngine;
   AVAudioSinkNode *oldInputNode = self.audioEngine.inputNode;
   AVAudioFormat *replacementInputFormat =
@@ -991,7 +1000,8 @@ - (void)testConcurrentRecordAndPlayPathsDoNotCrash {
   for (NSInteger index = 0; index < 10; index += 1) {
     dispatch_group_enter(group);
     dispatch_async(queue, ^{
-      [self.audioEngine attachInputNodeWithReceiverBlock:[self testInputReceiverBlock]];
+      [self.audioEngine attachInputNodeWithReceiverBlock:[self testInputReceiverBlock]
+             onInputConfigurationChange:nil];
       [self.audioEngine startIfNecessary];
       dispatch_group_leave(group);
     });

apps/fabric-example/ios/FabricExampleTests/AudioPlayerTests.mm

@@ -36,6 +36,9 @@
 
   [[nodiscard]] bool isRunning() const override;
 
+  [[nodiscard]] double getBaseLatency() const override;
+  [[nodiscard]] double getOutputLatency() const override;
+
  protected:
   std::shared_ptr<DSPAudioBuffer> audioBuffer_;
   NativeAudioPlayer *audioPlayer_;

apps/fabric-example/ios/FabricExampleTests/IOSAudioRecorderTests.mm

@@ -1,6 +1,7 @@
 #import <XCTest/XCTest.h>
 
 #import <audioapi/core/OfflineAudioContext.h>
+#import <audioapi/ios/core/IOSAudioRecorder.h>
 #import <audioapi/ios/core/NativeAudioRecorder.h>
 #import <audioapi/ios/system/AudioEngine.h>
 #import <audioapi/ios/system/AudioSessionManager.h>
@@ -22,41 +23,6 @@
 
 namespace audioapi {
 
-class IAudioEventHandlerRegistry;
-
-class IOSAudioRecorder : public AudioRecorder {
- public:
-  IOSAudioRecorder(const std::shared_ptr<IAudioEventHandlerRegistry> &audioEventHandlerRegistry);
-  ~IOSAudioRecorder() override;
-
-  Result<NoneType, std::string> start(const std::string &fileNameOverride = "") override;
-  Result<std::tuple<std::vector<std::string>, double, double>, std::string> stop() override;
-
-  Result<NoneType, std::string> enableFileOutput(
-      std::shared_ptr<AudioFileProperties> properties) override;
-  void disableFileOutput() override;
-
-  void connect(const std::shared_ptr<utils::graph::NodeHandle> &node) override;
-  void disconnect() override;
-
-  void pause() override;
-  void resume() override;
-
-  bool isRecording() const override;
-  bool isPaused() const override;
-  bool isIdle() const override;
-
-  Result<NoneType, std::string> setOnAudioReadyCallback(
-      float sampleRate,
-      size_t bufferLength,
-      int channelCount,
-      uint64_t callbackId) override;
-  void clearOnAudioReadyCallback() override;
-
- protected:
-  NativeAudioRecorder *nativeRecorder_;
-};
-
 struct RecorderAdapterTestFixture {
   std::shared_ptr<OfflineAudioContext> context;
   std::shared_ptr<utils::graph::NodeHandle> handle;
@@ -317,6 +283,7 @@ - (void)setUp
 
   _recorder = std::make_unique<TestableIOSAudioRecorder>(std::shared_ptr<IAudioEventHandlerRegistry>());
   self.originalNativeRecorder = _recorder->replaceNativeRecorder(self.nativeRecorder);
+  self.nativeRecorder.onInputConfigurationChange = self.originalNativeRecorder.onInputConfigurationChange;
 }
 
 - (void)tearDown

apps/fabric-example/ios/FabricExampleTests/NativeAudioRecorderTests.mm

@@ -113,11 +113,13 @@ - (void)stopIfNecessary
 }
 
 - (void)attachInputNodeWithReceiverBlock:(AVAudioSinkNodeReceiverBlock)receiverBlock
+             onInputConfigurationChange:(void (^)(void))onInputConfigurationChange
 {
   self.attachInputNodeCallCount += 1;
   self.inputNode = [[AVAudioSinkNode alloc] initWithReceiverBlock:receiverBlock];
   self.lastAttachedInputNode = self.inputNode;
   self.lastAttachedReceiverBlock = receiverBlock;
+  (void)onInputConfigurationChange;
 }
 
 - (bool)startIfNecessary

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

@@ -2,12 +2,14 @@
 #include <audioapi/core/sources/RecorderAdapterNode.h>
 #include <audioapi/core/types/ChannelInterpretation.h>
 #include <audioapi/core/utils/Constants.h>
+#include <audioapi/core/utils/CurrentRenderScope.h>
 #include <audioapi/utils/AudioArray.hpp>
 
 #include <algorithm>
 #include <cmath>
 #include <cstring>
 #include <memory>
+#include <thread>
 #include <vector>
 
 namespace audioapi {
@@ -59,15 +61,24 @@ void RecorderAdapterNode::init(size_t bufferSize, int channelCount, float sample
 }
 
 void RecorderAdapterNode::adapterCleanup() {
+  isInitialized_.store(false, std::memory_order_release);
+  waitForProcessQuiescence();
+
   needsResampling_ = false;
   buff_.clear();
   resampler_.reset();
   overflowSize_ = 0;
+}
 
-  isInitialized_.store(false, std::memory_order_release);
+void RecorderAdapterNode::waitForProcessQuiescence() const {
+  while (currentProcesses_.load(std::memory_order_acquire) != 0) {
+    std::this_thread::yield();
+  }
 }
 
 void RecorderAdapterNode::processNode(int framesToProcess) {
+  const CurrentRenderScope processScope(currentProcesses_);
+
   if (!isInitialized_.load(std::memory_order_acquire)) {
     audioBuffer_->zero();
     return;

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

@@ -7,6 +7,8 @@
 #include <audioapi/dsp/r8brain/Resampler.hpp>
 #include <audioapi/utils/AudioBuffer.hpp>
 #include <audioapi/utils/CircularOverflowableAudioArray.h>
+#include <atomic>
+#include <cstdint>
 #include <memory>
 #include <vector>
 
@@ -39,6 +41,7 @@ class RecorderAdapterNode : public AudioNode {
  private:
   void readFrames(AudioBuffer &target, size_t framesToRead);
   void processResampled(int framesToProcess);
+  void waitForProcessQuiescence() const;
 
   std::unique_ptr<r8b::MultiChannelResampler> resampler_;
   bool needsResampling_ = false;
@@ -53,6 +56,8 @@ class RecorderAdapterNode : public AudioNode {
   size_t overflowSize_ = 0;
 
   std::atomic<bool> isInitialized_{false};
+  /// Incremented around each processNode() call; adapterCleanup waits for quiescence.
+  std::atomic<uint32_t> currentProcesses_{0};
 };
 
 } // namespace audioapi

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

@@ -1,12 +1,13 @@
 #pragma once
 
 #ifdef __OBJC__ // when compiled as Objective-C
-#import <NativeAudioRecorder.h>
+#import <audioapi/ios/core/NativeAudioRecorder.h>
 #else
 typedef struct objc_object NSURL;
 typedef struct objc_object AVAudioFile;
 typedef struct objc_object AudioBufferList;
 typedef struct objc_object NativeAudioRecorder;
+typedef struct objc_object AVAudioFormat;
 #endif // __OBJC__
 
 #include <audioapi/core/inputs/AudioRecorder.h>
@@ -67,6 +68,16 @@ class IOSAudioRecorder : public AudioRecorder {
   Result<std::string, std::string> setupFileWriter(
       const std::shared_ptr<AudioFileProperties> &properties,
       const std::string &fileNameOverride = "");
+  Result<NoneType, std::string> reprepareForLiveInput();
+  void handleInputConfigurationChange();
+  Result<NoneType, std::string> reprepareFileWriter(
+      AVAudioFormat *inputFormat,
+      int maxInputBufferLength);
+  Result<NoneType, std::string> reprepareCallback(
+      AVAudioFormat *inputFormat,
+      int maxInputBufferLength);
+  void reprepareAdapter(AVAudioFormat *inputFormat, int maxInputBufferLength);
+  void runSideEffects(const AudioBufferList *inputBuffer, int numFrames);
 
   std::vector<std::string> recordingSegmentPaths_;
   std::atomic<float> streamSampleRate_{0.0f};