Merge pull request #53 from GetStream/chore/sync_1.2.1

Brazol · web-flow · commit e5579f100f09 · 2025-12-16T14:59:47.000+01:00
chore: sync with flutter_webrtc 1.2.1
diff --git a/android/src/main/java/io/getstream/webrtc/flutter/MethodCallHandlerImpl.java b/android/src/main/java/io/getstream/webrtc/flutter/MethodCallHandlerImpl.java
@@ -8,6 +8,7 @@
 import android.graphics.SurfaceTexture;
 import android.hardware.Camera;
 import android.hardware.Camera.CameraInfo;
+import android.media.AudioManager;
 import android.media.MediaRecorder;
 import android.media.AudioAttributes;
 import android.media.AudioDeviceInfo;
@@ -202,7 +203,7 @@ void dispose() {
   }
 
   private void initialize(boolean bypassVoiceProcessing, int networkIgnoreMask, boolean forceSWCodec, List<String> forceSWCodecList,
-  @Nullable ConstraintsMap androidAudioConfiguration, Severity logSeverity) {
+  @Nullable ConstraintsMap androidAudioConfiguration, Severity logSeverity, @Nullable Integer audioSampleRate, @Nullable Integer audioOutputSampleRate) {
     if (mFactory != null) {
       return;
     }
@@ -261,6 +262,39 @@ private void initialize(boolean bypassVoiceProcessing, int networkIgnoreMask, bo
                         .setUseHardwareNoiseSuppressor(useHardwareAudioProcessing);
     }
 
+    // Configure audio sample rates if specified
+    // This allows high-quality audio playback instead of defaulting to WebRtcAudioManager's queried rate
+    if (audioSampleRate != null) {
+      Log.i(TAG, "Setting audio sample rate (both input and output) to: " + audioSampleRate + " Hz");
+      audioDeviceModuleBuilder.setSampleRate(audioSampleRate);
+    }
+
+    // audioOutputSampleRate takes precedence over audioSampleRate for output
+    if (audioOutputSampleRate != null) {
+      Log.i(TAG, "Setting audio output sample rate to: " + audioOutputSampleRate + " Hz");
+      audioDeviceModuleBuilder.setOutputSampleRate(audioOutputSampleRate);
+    } else if (bypassVoiceProcessing && audioSampleRate == null && audioOutputSampleRate == null) {
+      // When bypassVoiceProcessing is enabled, use the device's native optimal sample rate
+      // This prevents the default behavior which may use a low sample rate based on audio mode
+      AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+      if (audioManager != null) {
+        String nativeSampleRateStr = audioManager.getProperty(AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE);
+        int nativeSampleRate = 48000; // fallback default
+        if (nativeSampleRateStr != null) {
+          try {
+            nativeSampleRate = Integer.parseInt(nativeSampleRateStr);
+          } catch (NumberFormatException e) {
+            Log.w(TAG, "Failed to parse native sample rate, using default: " + e.getMessage());
+          }
+        }
+        Log.i(TAG, "bypassVoiceProcessing enabled with no explicit sample rate - using device's native optimal rate: " + nativeSampleRate + " Hz");
+        audioDeviceModuleBuilder.setOutputSampleRate(nativeSampleRate);
+      } else {
+        Log.w(TAG, "AudioManager not available, defaulting to 48000 Hz output");
+        audioDeviceModuleBuilder.setOutputSampleRate(48000);
+      }
+    }
+
     audioDeviceModuleBuilder.setSamplesReadyCallback(recordSamplesReadyCallbackAdapter);
     audioDeviceModuleBuilder.setPlaybackSamplesReadyCallback(playbackSamplesReadyCallbackAdapter);
 
@@ -401,7 +435,19 @@ public void onMethodCall(MethodCall call, @NonNull Result notSafeResult) {
           logSeverity = str2LogSeverity(logSeverityStr);
         }
 
-        initialize(enableBypassVoiceProcessing, networkIgnoreMask, forceSWCodec, forceSWCodecList, androidAudioConfiguration, logSeverity);
+        Integer audioSampleRate = null;
+        if (constraintsMap.hasKey("audioSampleRate")
+                && constraintsMap.getType("audioSampleRate") == ObjectType.Number) {
+          audioSampleRate = constraintsMap.getInt("audioSampleRate");
+        }
+
+        Integer audioOutputSampleRate = null;
+        if (constraintsMap.hasKey("audioOutputSampleRate")
+                && constraintsMap.getType("audioOutputSampleRate") == ObjectType.Number) {
+          audioOutputSampleRate = constraintsMap.getInt("audioOutputSampleRate");
+        }
+
+        initialize(enableBypassVoiceProcessing, networkIgnoreMask, forceSWCodec, forceSWCodecList, androidAudioConfiguration, logSeverity, audioSampleRate, audioOutputSampleRate);
         result.success(null);
         break;
       }
diff --git a/android/src/main/java/io/getstream/webrtc/flutter/record/MediaRecorderImpl.java b/android/src/main/java/io/getstream/webrtc/flutter/record/MediaRecorderImpl.java
@@ -83,10 +83,6 @@ public void stopRecording(Runnable onStopped) {
             audioFileRenderer.release();
             audioFileRenderer = null;
         }
-        if (audioFileRenderer != null) {
-            audioFileRenderer.release();
-            audioFileRenderer = null;
-        }
     }
 
     private static final String TAG = "MediaRecorderImpl";
diff --git a/android/src/main/java/io/getstream/webrtc/flutter/record/VideoFileRenderer.java b/android/src/main/java/io/getstream/webrtc/flutter/record/VideoFileRenderer.java
@@ -92,13 +92,18 @@ private boolean tryConfigureEncoder(EncoderConfig config) {
             // Use YUV420 semi-planar size (1.5 bytes per pixel) to reduce memory usage
             format.setInteger(MediaFormat.KEY_MAX_INPUT_SIZE, config.width * config.height * 3 / 2);
             format.setInteger(MediaFormat.KEY_PRIORITY, 0);
-            format.setInteger(MediaFormat.KEY_PROFILE, config.profile);
 
             Log.d(TAG, "Trying encoder config: " + config);
 
             encoder = MediaCodec.createEncoderByType(MIME_TYPE);
             String codecName = encoder.getName();
             Log.d(TAG, "Codec name: " + codecName);
+            if ("OMX.hisi.video.encoder.avc".equals(codecName)) {
+                Log.w(TAG, "hisi h264 encoder does not set 'MediaFormat.KEY_PROFILE'.");
+                //format.setInteger(MediaFormat.KEY_PROFILE, config.profile);
+            }else{
+                format.setInteger(MediaFormat.KEY_PROFILE, config.profile);
+            }
 
             encoder.configure(format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
             // Create input surface *before* starting the encoder
diff --git a/common/cpp/src/flutter_webrtc_base.cc b/common/cpp/src/flutter_webrtc_base.cc
@@ -15,6 +15,7 @@ FlutterWebRTCBase::FlutterWebRTCBase(BinaryMessenger* messenger,
     : messenger_(messenger), task_runner_(task_runner), textures_(textures) {
   LibWebRTC::Initialize();
   factory_ = LibWebRTC::CreateRTCPeerConnectionFactory();
+  factory_->Initialize();
   audio_device_ = factory_->GetAudioDevice();
   video_device_ = factory_->GetVideoDevice();
   desktop_device_ = factory_->GetDesktopDevice();
diff --git a/common/darwin/Classes/FlutterRTCMediaRecorder.m b/common/darwin/Classes/FlutterRTCMediaRecorder.m
@@ -113,10 +113,18 @@ - (void)renderFrame:(nullable RTCVideoFrame*)frame {
     pixelBufferRef = [FlutterRTCFrameCapturer convertToCVPixelBuffer:frame];
     shouldRelease = true;
   }
-  CMVideoFormatDescriptionRef formatDescription;
+  CMVideoFormatDescriptionRef formatDescription = NULL;
   OSStatus status = CMVideoFormatDescriptionCreateForImageBuffer(
       kCFAllocatorDefault, pixelBufferRef, &formatDescription);
 
+  if (status != noErr || formatDescription == NULL) {
+    NSLog(@"Failed to create format description: %d", (int)status);
+    if (shouldRelease) {
+      CVPixelBufferRelease(pixelBufferRef);
+    }
+    return;
+  }
+
   CMSampleTimingInfo timingInfo;
 
   timingInfo.decodeTimeStamp = kCMTimeInvalid;
@@ -127,19 +135,30 @@ - (void)renderFrame:(nullable RTCVideoFrame*)frame {
   timingInfo.presentationTimeStamp = CMTimeMake(frameTime, 1000000);
   framesCount++;
 
-  CMSampleBufferRef outBuffer;
+  CMSampleBufferRef outBuffer = NULL;
 
   status = CMSampleBufferCreateReadyWithImageBuffer(kCFAllocatorDefault, pixelBufferRef,
                                                     formatDescription, &timingInfo, &outBuffer);
 
-  if (![self.writerInput appendSampleBuffer:outBuffer]) {
-    NSLog(@"Frame not appended %@", self.assetWriter.error);
+  if (status == noErr && outBuffer != NULL) {
+    if (![self.writerInput appendSampleBuffer:outBuffer]) {
+      NSLog(@"Frame not appended %@", self.assetWriter.error);
+    }
+  } else {
+    NSLog(@"Failed to create sample buffer: %d", (int)status);
   }
-#if TARGET_OS_IPHONE
+
+  // Release Core Foundation objects to prevent memory leaks
+  if (outBuffer != NULL) {
+    CFRelease(outBuffer);
+  }
+  if (formatDescription != NULL) {
+    CFRelease(formatDescription);
+  }
+
   if (shouldRelease) {
     CVPixelBufferRelease(pixelBufferRef);
   }
-#endif
 }
 
 - (void)stop:(FlutterResult _Nonnull)result {
diff --git a/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/FlutterRTCMediaRecorder.m b/ios/stream_webrtc_flutter/Sources/stream_webrtc_flutter/FlutterRTCMediaRecorder.m
@@ -109,10 +109,18 @@ - (void)renderFrame:(nullable RTCVideoFrame*)frame {
     pixelBufferRef = [FlutterRTCFrameCapturer convertToCVPixelBuffer:frame];
     shouldRelease = true;
   }
-  CMVideoFormatDescriptionRef formatDescription;
+  CMVideoFormatDescriptionRef formatDescription = NULL;
   OSStatus status = CMVideoFormatDescriptionCreateForImageBuffer(
       kCFAllocatorDefault, pixelBufferRef, &formatDescription);
 
+  if (status != noErr || formatDescription == NULL) {
+    NSLog(@"Failed to create format description: %d", (int)status);
+    if (shouldRelease) {
+      CVPixelBufferRelease(pixelBufferRef);
+    }
+    return;
+  }
+
   CMSampleTimingInfo timingInfo;
 
   timingInfo.decodeTimeStamp = kCMTimeInvalid;
@@ -123,19 +131,30 @@ - (void)renderFrame:(nullable RTCVideoFrame*)frame {
   timingInfo.presentationTimeStamp = CMTimeMake(frameTime, 1000000);
   framesCount++;
 
-  CMSampleBufferRef outBuffer;
+  CMSampleBufferRef outBuffer = NULL;
 
   status = CMSampleBufferCreateReadyWithImageBuffer(kCFAllocatorDefault, pixelBufferRef,
                                                     formatDescription, &timingInfo, &outBuffer);
 
-  if (![self.writerInput appendSampleBuffer:outBuffer]) {
-    NSLog(@"Frame not appended %@", self.assetWriter.error);
+  if (status == noErr && outBuffer != NULL) {
+    if (![self.writerInput appendSampleBuffer:outBuffer]) {
+      NSLog(@"Frame not appended %@", self.assetWriter.error);
+    }
+  } else {
+    NSLog(@"Failed to create sample buffer: %d", (int)status);
+  }
+
+  // Release Core Foundation objects to prevent memory leaks
+  if (outBuffer != NULL) {
+    CFRelease(outBuffer);
   }
-#if TARGET_OS_IPHONE
+  if (formatDescription != NULL) {
+    CFRelease(formatDescription);
+  }
+
   if (shouldRelease) {
     CVPixelBufferRelease(pixelBufferRef);
   }
-#endif
 }
 
 - (void)stop:(FlutterResult _Nonnull)result {
diff --git a/lib/src/native/utils.dart b/lib/src/native/utils.dart
@@ -54,6 +54,13 @@ class WebRTC {
   /// "androidAudioConfiguration": an AndroidAudioConfiguration object mapped with toMap()
   ///
   /// "bypassVoiceProcessing": a boolean that bypasses the audio processing for the audio device.
+  ///
+  /// "audioSampleRate": (Android only) Sets both input and output sample rate in Hz (e.g., 48000).
+  ///                    If not specified, uses the native device's default sample rate.
+  ///
+  /// "audioOutputSampleRate": (Android only) Sets only output sample rate in Hz (e.g., 48000).
+  ///                          Takes precedence over audioSampleRate for output.
+  ///                          If not specified, uses audioSampleRate or native default.
   static Future<void> initialize({Map<String, dynamic>? options}) async {
     if (!initialized) {
       await _channel.invokeMethod<void>('initialize', <String, dynamic>{
diff --git a/lib/src/web/rtc_video_renderer_impl.dart b/lib/src/web/rtc_video_renderer_impl.dart
@@ -347,6 +347,8 @@ class RTCVideoRenderer extends ValueNotifier<RTCVideoValue>
       element.style.pointerEvents = "none";
       element.style.opacity = "0";
       element.style.position = "absolute";
+      element.style.left = "0px";
+      element.style.top = "0px";
     }
   }
 
diff --git a/lib/src/web/rtc_video_view_impl.dart b/lib/src/web/rtc_video_view_impl.dart
@@ -172,6 +172,7 @@ class RTCVideoViewState extends State<RTCVideoView> {
                       RTCVideoViewObjectFit.RTCVideoViewObjectFitCover =>
                         BoxFit.cover,
                     },
+                    clipBehavior: Clip.hardEdge,
                     child: SizedBox(
                         width: capturedFrame!.width.toDouble(),
                         height: capturedFrame!.height.toDouble(),
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
@@ -1,7 +1,7 @@
 include(ExternalProject)
 
 set(ZIPFILE "${CMAKE_CURRENT_LIST_DIR}/downloads/libwebrtc.zip")
-set(DOWNLOAD_URL "https://github.com/flutter-webrtc/flutter-webrtc/releases/download/v1.1.0/libwebrtc.zip")
+set(DOWNLOAD_URL "https://github.com/flutter-webrtc/flutter-webrtc/releases/download/v1.2.1/libwebrtc.zip")
 
 if(NOT EXISTS "${ZIPFILE}")
   message(NOTICE "download: ${DOWNLOAD_URL}")

Original file line number	Diff line number	Diff line change
`@@ -83,10 +83,6 @@ public void stopRecording(Runnable onStopped) {`
`83`	`83`	`audioFileRenderer.release();`
`84`	`84`	`audioFileRenderer = null;`
`85`	`85`	`}`
`86`		`- if (audioFileRenderer != null) {`
`87`		`- audioFileRenderer.release();`
`88`		`- audioFileRenderer = null;`
`89`		`- }`
`90`	`86`	`}`
`91`	`87`
`92`	`88`	`private static final String TAG = "MediaRecorderImpl";`
Original file line number	Diff line number	Diff line change
`@@ -347,6 +347,8 @@ class RTCVideoRenderer extends ValueNotifier<RTCVideoValue>`
`347`	`347`	`element.style.pointerEvents = "none";`
`348`	`348`	`element.style.opacity = "0";`
`349`	`349`	`element.style.position = "absolute";`
	`350`	`+ element.style.left = "0px";`
	`351`	`+ element.style.top = "0px";`
`350`	`352`	`}`
`351`	`353`	`}`
`352`	`354`