fix: screen sharing issue for desktop. (flutter-webrtc#1490)

cloudwebrtc · web-flow · commit 00ae26143688 · 2023-11-29T14:35:16.000+08:00
diff --git a/example/lib/src/widgets/screen_select_dialog.dart b/example/lib/src/widgets/screen_select_dialog.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_webrtc/flutter_webrtc.dart';
@@ -20,12 +21,14 @@ class ThumbnailWidget extends StatefulWidget {
 
 class _ThumbnailWidgetState extends State<ThumbnailWidget> {
   final List<StreamSubscription> _subscriptions = [];
-
+  Uint8List? _thumbnail;
   @override
   void initState() {
     super.initState();
     _subscriptions.add(widget.source.onThumbnailChanged.stream.listen((event) {
-      setState(() {});
+      setState(() {
+        _thumbnail = event;
+      });
     }));
     _subscriptions.add(widget.source.onNameChanged.stream.listen((event) {
       setState(() {});
@@ -55,9 +58,9 @@ class _ThumbnailWidgetState extends State<ThumbnailWidget> {
               print('Selected source id => ${widget.source.id}');
               widget.onTap(widget.source);
             },
-            child: widget.source.thumbnail != null
+            child: _thumbnail != null
                 ? Image.memory(
-                    widget.source.thumbnail!,
+                    _thumbnail!,
                     gaplessPlayback: true,
                     alignment: Alignment.center,
                   )
@@ -190,8 +193,8 @@ class ScreenSelectDialog extends Dialog {
                           Container(
                             constraints: BoxConstraints.expand(height: 24),
                             child: TabBar(
-                                onTap: (value) => Future.delayed(
-                                        Duration(milliseconds: 300), () {
+                                onTap: (value) =>
+                                    Future.delayed(Duration.zero, () {
                                       _sourceType = value == 0
                                           ? SourceType.Screen
                                           : SourceType.Window;
diff --git a/lib/src/native/desktop_capturer_impl.dart b/lib/src/native/desktop_capturer_impl.dart
@@ -107,10 +107,9 @@ class DesktopCapturerNative extends DesktopCapturer {
         }
         break;
       case 'desktopSourceRemoved':
-        final source = _sources[map['id'] as String];
-        if (source != null) {
-          _sources.remove((source) => source.id == map['id']);
-          _onRemoved.add(source);
+        final id = map['id'] as String;
+        if (_sources[id] != null) {
+          _onRemoved.add(_sources.remove(id)!);
         }
         break;
       case 'desktopSourceThumbnailChanged':

Original file line number	Diff line number	Diff line change
`@@ -107,10 +107,9 @@ class DesktopCapturerNative extends DesktopCapturer {`
`107`	`107`	`}`
`108`	`108`	`break;`
`109`	`109`	`case 'desktopSourceRemoved':`
`110`		`- final source = _sources[map['id'] as String];`
`111`		`- if (source != null) {`
`112`		`- _sources.remove((source) => source.id == map['id']);`
`113`		`- _onRemoved.add(source);`
	`110`	`+ final id = map['id'] as String;`
	`111`	`+ 4E3D if (_sources[id] != null) {`
	`112`	`+ _onRemoved.add(_sources.remove(id)!);`
`114`	`113`	`}`
`115`	`114`	`break;`
`116`	`115`	`case 'desktopSourceThumbnailChanged':`