tweaks

Author: Brazol

android/src/main/java/io/getstream/webrtc/flutter/GetUserMediaImpl.java

@@ -708,8 +708,6 @@ private synchronized void stopScreenAudioCapture() {
             localCapturer.stopCapture();
             Log.d(TAG, "Screen audio capture stopped");
         }
-
-        currentScreenCapturer = null;
     }
 
     /**

android/src/main/java/io/getstream/webrtc/flutter/MethodCallHandlerImpl.java

@@ -209,10 +209,12 @@ void dispose() {
    * tracks.
    */
   private boolean isMicrophoneMuted() {
-    for (LocalTrack track : localTracks.values()) {
-      if (track instanceof LocalAudioTrack) {
-        if (track.enabled()) {
-          return false; 
+    synchronized (localTracks) {
+      for (LocalTrack track : localTracks.values()) {
+        if (track instanceof LocalAudioTrack) {
+          if (track.enabled()) {
+            return false; 
+          }
         }
       }
     }

android/src/main/java/io/getstream/webrtc/flutter/audio/AudioBufferMixer.java

@@ -51,15 +51,24 @@ public static void mixBuffers(ByteBuffer destBuffer, ByteBuffer srcBuffer, int b
         srcBuffer.asShortBuffer().get(srcSamples, 0, srcSamplesToRead);
 
         // Mix samples with clipping
+        // Only mix up to the minimum of both buffers, then copy remaining samples
+        int mixableCount = Math.min(destSamplesToRead, srcSamplesToRead);
+
         byte[] mixedBytes = new byte[bytesToMix];
         for (int i = 0; i < samplesToMix; i++) {
             int sum;
-            if (i >= destSamplesToRead) {
-                sum = srcSamples[i];
-            } else if (i >= srcSamplesToRead) {
+            if (i < mixableCount) {
+                // Both buffers have valid data at this index - mix them
+                sum = destSamples[i] + srcSamples[i];
+            } else if (i < destSamplesToRead) {
+                // Only dest buffer has valid data at this index
                 sum = destSamples[i];
+            } else if (i < srcSamplesToRead) {
+                // Only src buffer has valid data at this index
+                sum = srcSamples[i];
             } else {
-                sum = destSamples[i] + srcSamples[i];
+                // Neither buffer has valid data - output silence
+                sum = 0;
             }
 
             if (sum > Short.MAX_VALUE) {

android/src/main/java/io/getstream/webrtc/flutter/audio/ScreenAudioCapturer.java

@@ -36,9 +36,9 @@ public class ScreenAudioCapturer {
     private static final int SAMPLE_RATE = 48000; // Standard WebRTC sample rate
 
     private final Context context;
-    private AudioRecord screenAudioRecord;
+    private volatile AudioRecord screenAudioRecord;
     private MediaProjection mediaProjection;
-    private ByteBuffer screenAudioBuffer;
+    private volatile ByteBuffer screenAudioBuffer;
     private volatile boolean isCapturing = false;
 
     public ScreenAudioCapturer(Context context) {
@@ -129,24 +129,27 @@ public ByteBuffer getScreenAudioBytes(int bytesRequested) {
         }
 
         try {
+            ByteBuffer localBuffer = screenAudioBuffer;
+
             // Ensure buffer has enough capacity
-            if (screenAudioBuffer == null || screenAudioBuffer.capacity() < bytesRequested) {
-                screenAudioBuffer = ByteBuffer.allocateDirect(bytesRequested);
-                screenAudioBuffer.order(ByteOrder.LITTLE_ENDIAN);
+            if (localBuffer == null || localBuffer.capacity() < bytesRequested) {
+                localBuffer = ByteBuffer.allocateDirect(bytesRequested);
+                localBuffer.order(ByteOrder.LITTLE_ENDIAN);
+                screenAudioBuffer = localBuffer;
             }
 
-            screenAudioBuffer.clear();
-            screenAudioBuffer.limit(bytesRequested);
+            localBuffer.clear();
+            localBuffer.limit(bytesRequested);
 
             int bytesRead = localAudioRecord.read(
-                    screenAudioBuffer,
+                    localBuffer,
                     bytesRequested,
-                    AudioRecord.READ_NON_BLOCKING);
+                    AudioRecord.READ_BLOCKING);
 
             if (bytesRead > 0) {
-                screenAudioBuffer.limit(bytesRead);
-                screenAudioBuffer.position(0);
-                return screenAudioBuffer;
+                localBuffer.limit(bytesRead);
+                localBuffer.position(0);
+                return localBuffer;
             }
 
         } catch (Exception e) {