fix: screen capture bug for Android/iOS (#1729)

cloudwebrtc · web-flow · commit bb730e460bac · 2024-12-23T14:08:36.000+08:00
* fix: display bug for android.

* fix issue for ios.
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/GetUserMediaImpl.java b/android/src/main/java/com/cloudwebrtc/webrtc/GetUserMediaImpl.java
@@ -584,6 +584,7 @@ public void onStop() {
             track_.putBoolean("remote", false);
 
             videoTracks.pushMap(track_);
+            mediaStream.addTrack(displayTrack);
         }
 
         String streamId = mediaStream.getId();
diff --git a/common/darwin/Classes/FlutterRTCDesktopCapturer.m b/common/darwin/Classes/FlutterRTCDesktopCapturer.m
@@ -38,9 +38,9 @@ - (void)getDisplayMedia:(NSDictionary*)constraints result:(FlutterResult)result
   id screenCapturer;
 
   if (useBroadcastExtension) {
-    screenCapturer = [[FlutterBroadcastScreenCapturer alloc] initWithDelegate:videoSource];
+    screenCapturer = [[FlutterBroadcastScreenCapturer alloc] initWithDelegate:videoProcessingAdapter];
   } else {
-    screenCapturer = [[FlutterRPScreenRecorder alloc] initWithDelegate:videoSource];
+    screenCapturer = [[FlutterRPScreenRecorder alloc] initWithDelegate:videoProcessingAdapter];
   }
 
   [screenCapturer startCapture];
diff --git a/ios/Classes/Broadcast/FlutterSocketConnectionFrameReader.m b/ios/Classes/Broadcast/FlutterSocketConnectionFrameReader.m
@@ -224,7 +224,7 @@ - (void)didCaptureVideoFrame:(CVPixelBufferRef)pixelBuffer
       break;
   }
 
-  RTCVideoFrame* videoFrame = [[RTCVideoFrame alloc] initWithBuffer:rtcPixelBuffer
+  RTCVideoFrame* videoFrame = [[RTCVideoFrame alloc] initWithBuffer:[rtcPixelBuffer toI420]
                                                            rotation:rotation
                                                         timeStampNs:frameTimeStampNs];
 

Original file line number	Diff line number	Diff line change
`@@ -584,6 +584,7 @@ public void onStop() {`
`584`	`584`	`track_.putBoolean("remote", false);`
`585`	`585`
`586`	`586`	`videoTracks.pushMap(track_);`
	`587`	`+ mediaStream.addTrack(displayTrack);`
`587`	`588`	`}`
`588`	`589`
`589`	`590`	`String streamId = mediaStream.getId();`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ - (void)didCaptureVideoFrame:(CVPixelBufferRef)pixelBuffer`
`224`	`224`	`break;`
`225`	`225`	`}`
`226`	`226`
`227`		`- RTCVideoFrame* videoFrame = [[RTCVideoFrame alloc] initWithBuffer:rtcPixelBuffer`
	`227`	`+ RTCVideoFrame* videoFrame = [[RTCVideoFrame alloc] initWithBuffer:[rtcPixelBuffer toI420]`
`228`	`228`	`rotation:rotation`
`229`	`229`	`timeStampNs:frameTimeStampNs];`
`230`	`230`