chore: code cleanup

Author: greenfrvr

android/src/main/java/com/oney/WebRTCModule/audio/AudioProcessingController.java

@@ -17,20 +17,13 @@ public class AudioProcessingController implements AudioProcessingFactoryProvider
     public ExternalAudioProcessingFactory externalAudioProcessingFactory;
 
     public AudioProcessingController() {
-        // ExternalAudioProcessingFactory creation is deferred to getFactory()
-        // because its constructor calls JNI native methods that require the
-        // WebRTC native library to be loaded first (via PeerConnectionFactory.initialize()).
-        // This allows AudioProcessingController to be safely instantiated in
-        // MainApplication.onCreate() before the native library is loaded.
+        this.externalAudioProcessingFactory = new ExternalAudioProcessingFactory();
+        this.externalAudioProcessingFactory.setCapturePostProcessing(capturePostProcessing);
+        this.externalAudioProcessingFactory.setRenderPreProcessing(renderPreProcessing);
     }
 
     @Override
     public AudioProcessingFactory getFactory() {
-        if (this.externalAudioProcessingFactory == null) {
-            this.externalAudioProcessingFactory = new ExternalAudioProcessingFactory();
-            this.externalAudioProcessingFactory.setCapturePostProcessing(capturePostProcessing);
-            this.externalAudioProcessingFactory.setRenderPreProcessing(renderPreProcessing);
-        }
         return this.externalAudioProcessingFactory;
     }
 }

ios/RCTWebRTC/WebRTCModule+RTCMediaStream.m

@@ -224,19 +224,6 @@ - (RTCVideoTrack *)createScreenCaptureVideoTrack {
         // Store weak reference for audio mixing wiring
         options.activeInAppScreenCapturer = capturer;
 
-        // If audio mixing is requested, set up the audio buffer handler.
-        // The handler forwards .audioApp CMSampleBuffers to the mixer's enqueue method.
-        // The mixer may not exist yet (created by startScreenShareAudioMixing),
-        // so we check at each callback invocation.
-        if (options.includeScreenShareAudio) {
-            capturer.audioBufferHandler = ^(CMSampleBufferRef sampleBuffer) {
-                ScreenShareAudioMixer *mixer = [WebRTCModuleOptions sharedInstance].screenShareAudioMixer;
-                if (mixer) {
-                    [mixer enqueue:sampleBuffer];
-                }
-            };
-        }
-
         captureController = controller;
     } else {
         // Existing broadcast extension path

ios/RCTWebRTC/WebRTCModule.m

@@ -98,11 +98,6 @@ - (instancetype)init {
             }
             RCTLogInfo(@"Using audio processing module: %@", NSStringFromClass([audioProcessingModule class]));
 
-            // Store reference to the default APM if it is one.
-            if ([audioProcessingModule isKindOfClass:[RTCDefaultAudioProcessingModule class]]) {
-                options.defaultAudioProcessingModule = (RTCDefaultAudioProcessingModule *)audioProcessingModule;
-            }
-
             _peerConnectionFactory =
                 [[RTCPeerConnectionFactory alloc] initWithAudioDeviceModuleType:RTCAudioDeviceModuleTypeAudioEngine
                                                           bypassVoiceProcessing:NO
@@ -115,17 +110,12 @@ - (instancetype)init {
                                                                                decoderFactory:decoderFactory
                                                                                   audioDevice:audioDevice];
         } else {
-            // No custom APM provided — create a default one (no capturePostProcessingDelegate needed;
-            // screen share audio mixing uses the AVAudioEngine graph approach via audioGraphDelegate).
-            RTCDefaultAudioProcessingModule *defaultAPM = [[RTCDefaultAudioProcessingModule alloc] init];
-            options.defaultAudioProcessingModule = defaultAPM;
-
             _peerConnectionFactory =
                 [[RTCPeerConnectionFactory alloc] initWithAudioDeviceModuleType:RTCAudioDeviceModuleTypeAudioEngine
                                                           bypassVoiceProcessing:NO
                                                                  encoderFactory:encoderFactory
                                                                  decoderFactory:decoderFactory
-                                                          audioProcessingModule:defaultAPM];
+                                                          audioProcessingModule:nil];
         }
 
         _rtcAudioDeviceModuleObserver = [[AudioDeviceModuleObserver alloc] initWithWebRTCModule:self];

ios/RCTWebRTC/WebRTCModuleOptions.h

@@ -2,8 +2,6 @@
 #import <WebRTC/WebRTC.h>
 
 @class InAppScreenCapturer;
-@class RTCDefaultAudioProcessingModule;
-
 NS_ASSUME_NONNULL_BEGIN
 
 // Forward declare the Swift class — the actual import happens in the .m file.
@@ -16,10 +14,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, strong, nullable) id<RTCAudioDevice> audioDevice;
 @property(nonatomic, strong, nullable) id<RTCAudioProcessingModule> audioProcessingModule;
 
-/// Retained reference to the default audio processing module.
-/// Used to dynamically set capturePostProcessingDelegate for screen share audio mixing.
-@property(nonatomic, strong, nullable) RTCDefaultAudioProcessingModule *defaultAudioProcessingModule;
-
 @property(nonatomic, strong, nullable) NSDictionary *fieldTrials;
 @property(nonatomic, assign) RTCLoggingSeverity loggingSeverity;
 @property(nonatomic, assign) BOOL enableMultitaskingCameraAccess;
@@ -31,8 +25,8 @@ NS_ASSUME_NONNULL_BEGIN
 /// When YES, in-app screen capture will route .audioApp buffers to the audio mixer.
 @property(nonatomic, assign) BOOL includeScreenShareAudio;
 
-/// The active screen share audio mixer instance. Created by
-/// `startScreenShareAudioMixing` and cleared by `stopScreenShareAudioMixing`.
+/// The screen share audio mixer instance. Created eagerly during WebRTCModule
+/// init and retained for the lifetime of the module (never cleared).
 @property(nonatomic, strong, nullable) ScreenShareAudioMixer *screenShareAudioMixer;
 
 /// Weak reference to the current in-app screen capturer, set during

ios/RCTWebRTC/WebRTCModuleOptions.m

@@ -1,12 +1,5 @@
 #import "WebRTCModuleOptions.h"
 
-// Import Swift-generated header for ScreenShareAudioMixer
-#if __has_include(<stream_react_native_webrtc/stream_react_native_webrtc-Swift.h>)
-#import <stream_react_native_webrtc/stream_react_native_webrtc-Swift.h>
-#elif __has_include("stream_react_native_webrtc-Swift.h")
-#import "stream_react_native_webrtc-Swift.h"
-#endif
-
 @implementation WebRTCModuleOptions
 
 #pragma mark - This class is a singleton