fix: mac render crash

AgoraIO-Extensions · Jun 3, 2021 · dee5ab9 · dee5ab9
1 parent 910d191
commit dee5ab9
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 22 deletions.
diff --git a/lib/src/classes.dart b/lib/src/classes.dart
@@ -226,18 +226,18 @@ class AgoraImage {
   int? y;
 
   /// Width of the image on the broadcasting video.
-  int width;
+  int? width;
 
   /// Height of the image on the broadcasting video.
-  int height;
+  int? height;
 
   /// Constructs a [AgoraImage]
   AgoraImage(
-    this.url,
-    this.width,
-    this.height, {
+    this.url, {
     this.x,
     this.y,
+    this.width,
+    this.height,
   });
 
   /// @nodoc

diff --git a/lib/src/classes.g.dart b/lib/src/classes.g.dart
diff --git a/lib/src/rtc_device_manager.dart b/lib/src/rtc_device_manager.dart
@@ -43,6 +43,7 @@ enum _ApiTypeVideoDeviceManager {
   kVDMStopVideoDeviceTest,
 }
 
+/// TODO(doc)
 class RtcDeviceManager {
   static const MethodChannel _audioMethodChannel =
       MethodChannel('agora_rtc_audio_device_manager');

diff --git a/lib/src/rtc_engine.dart b/lib/src/rtc_engine.dart
@@ -2510,7 +2510,7 @@ class RtcEngine with RtcEngineInterface {
 
   @override
   Future<void> setScreenCaptureContentHint(VideoContentHint contentHint) {
-    if (kIsWeb || (Platform.isWindows || Platform.isMacOS)) {
+    if (!kIsWeb && (Platform.isWindows || Platform.isMacOS)) {
       return _invokeMethod('callApi', {
         'apiType': _ApiTypeEngine.kEngineSetScreenCaptureContentHint.index,
         'params': jsonEncode({
@@ -2524,7 +2524,7 @@ class RtcEngine with RtcEngineInterface {
   @override
   Future<void> startScreenCaptureByDisplayId(int displayId,
       Rectangle regionRect, ScreenCaptureParameters captureParams) {
-    if (kIsWeb || (Platform.isWindows || Platform.isMacOS)) {
+    if (!kIsWeb && (Platform.isWindows || Platform.isMacOS)) {
       return _invokeMethod('callApi', {
         'apiType': _ApiTypeEngine.kEngineStartScreenCaptureByDisplayId.index,
         'params': jsonEncode({
@@ -2540,9 +2540,9 @@ class RtcEngine with RtcEngineInterface {
   @override
   Future<void> startScreenCaptureByScreenRect(Rectangle screenRect,
       Rectangle regionRect, ScreenCaptureParameters captureParams) {
-    if (kIsWeb || (Platform.isWindows || Platform.isMacOS)) {
+    if (!kIsWeb && (Platform.isWindows || Platform.isMacOS)) {
       return _invokeMethod('callApi', {
-        'apiType': _ApiTypeEngine.kEngineStartScreenCaptureByScreenRect.index,
+        'apiType': _ApiTypeEngine.kEngineStartScreenCapture.index,
         'params': jsonEncode({
           'screenRect': screenRect.toJson(),
           'regionRect': regionRect.toJson(),
@@ -2556,7 +2556,7 @@ class RtcEngine with RtcEngineInterface {
   @override
   Future<void> startScreenCaptureByWindowId(int windowId, Rectangle regionRect,
       ScreenCaptureParameters captureParams) {
-    if (kIsWeb || (Platform.isWindows || Platform.isMacOS)) {
+    if (!kIsWeb && (Platform.isWindows || Platform.isMacOS)) {
       return _invokeMethod('callApi', {
         'apiType': _ApiTypeEngine.kEngineStartScreenCaptureByWindowId.index,
         'params': jsonEncode({
@@ -2583,7 +2583,7 @@ class RtcEngine with RtcEngineInterface {
   @override
   Future<void> updateScreenCaptureParameters(
       ScreenCaptureParameters captureParams) {
-    if (kIsWeb || (Platform.isWindows || Platform.isMacOS)) {
+    if (!kIsWeb && (Platform.isWindows || Platform.isMacOS)) {
       return _invokeMethod('callApi', {
         'apiType': _ApiTypeEngine.kEngineUpdateScreenCaptureParameters.index,
         'params': jsonEncode({
@@ -2596,7 +2596,7 @@ class RtcEngine with RtcEngineInterface {
 
   @override
   Future<void> updateScreenCaptureRegion(Rectangle regionRect) {
-    if (kIsWeb || (Platform.isWindows || Platform.isMacOS)) {
+    if (!kIsWeb && (Platform.isWindows || Platform.isMacOS)) {
       return _invokeMethod('callApi', {
         'apiType': _ApiTypeEngine.kEngineUpdateScreenCaptureRegion.index,
         'params': jsonEncode({
@@ -2606,6 +2606,23 @@ class RtcEngine with RtcEngineInterface {
     }
     throw PlatformException(code: ErrorCode.NotSupported.toString());
   }
+
+  @override
+  Future<void> startScreenCapture(
+      int? windowId, int captureFreq, Rect rect, int bitrate) {
+    if (kIsWeb || (Platform.isWindows || Platform.isMacOS)) {
+      return _invokeMethod('callApi', {
+        'apiType': _ApiTypeEngine.kEngineStartScreenCapture.index,
+        'params': jsonEncode({
+          'windowId': windowId,
+          'captureFreq': captureFreq,
+          'rect': rect.toJson(),
+          'bitrate': bitrate,
+        }),
+      });
+    }
+    throw PlatformException(code: ErrorCode.NotSupported.toString());
+  }
 }
 
 /// @nodoc
@@ -4619,4 +4636,7 @@ mixin RtcScreenSharingInterface {
   Future<void> updateScreenCaptureRegion(Rectangle regionRect);
 
   Future<void> stopScreenCapture();
+
+  Future<void> startScreenCapture(
+      int windowId, int captureFreq, Rect rect, int bitrate);
 }
diff --git a/macos/Classes/AgoraTextureViewFactory.mm b/macos/Classes/AgoraTextureViewFactory.mm
@@ -8,8 +8,10 @@ @interface TextureRenderer : NSObject <FlutterTexture>
 @property(nonatomic, weak) NSObject<FlutterTextureRegistry> *textureRegistry;
 @property(nonatomic, assign) int64_t textureId;
 @property(nonatomic, strong) FlutterMethodChannel *channel;
-@property(nonatomic) CVPixelBufferRef buffer;
+@property(nonatomic) CVPixelBufferRef buffer_cache;
+@property(nonatomic) CVPixelBufferRef buffer_temp;
 @property(nonatomic) IrisRtcRenderer *renderer;
+@property(nonatomic, strong) dispatch_semaphore_t lock;
 
 - (instancetype)
     initWithTextureRegistry:(NSObject<FlutterTextureRegistry> *)textureRegistry
@@ -48,10 +50,10 @@ void OnVideoFrameReceived(const IrisRtcVideoFrame &video_frame,
              video_frame.y_buffer_length);
       CVPixelBufferUnlockBaseAddress(buffer, 0);
 
-      CVPixelBufferRelease(renderer.buffer);
-      renderer.buffer = buffer;
-      CVBufferRetain(renderer.buffer);
-      CVPixelBufferRelease(buffer);
+      dispatch_semaphore_wait(renderer.lock, DISPATCH_TIME_FOREVER);
+      renderer.buffer_cache = buffer;
+      dispatch_semaphore_signal(renderer.lock);
+
       [renderer.textureRegistry textureFrameAvailable:renderer.textureId];
     }
   }
@@ -73,14 +75,15 @@ @implementation TextureRenderer
   self = [super init];
   if (self) {
     self.textureRegistry = textureRegistry;
-    self.renderer = renderer;
-    self.delegate = new ::RendererDelegate((__bridge void *)self);
     self.textureId = [self.textureRegistry registerTexture:self];
     self.channel = [FlutterMethodChannel
         methodChannelWithName:
             [NSString stringWithFormat:@"agora_rtc_engine/texture_render_%lld",
                                        self.textureId]
               binaryMessenger:messenger];
+    self.renderer = renderer;
+    self.lock = dispatch_semaphore_create(1);
+    self.delegate = new ::RendererDelegate((__bridge void *)self);
     __weak typeof(self) weakSelf = self;
     [self.channel setMethodCallHandler:^(FlutterMethodCall *_Nonnull call,
                                          FlutterResult _Nonnull result) {
@@ -116,7 +119,12 @@ - (void)destroy {
 }
 
 - (CVPixelBufferRef)copyPixelBuffer {
-  return self.buffer;
+  dispatch_semaphore_wait(self.lock, DISPATCH_TIME_FOREVER);
+  CVPixelBufferRelease(self.buffer_temp);
+  self.buffer_temp = self.buffer_cache;
+  CVBufferRetain(self.buffer_temp);
+  dispatch_semaphore_signal(self.lock);
+  return self.buffer_temp;
 }
 
 - (void)onTextureUnregistered:(NSObject<FlutterTexture> *)texture {