Merge branch 'master' into feat/desktop-capture-testing

Author: cloudwebrtc

.github/workflows/flutter.yml

@@ -22,7 +22,7 @@ jobs:
           java-version: '12.x'
       - uses: subosito/flutter-action@v1
         with:
-          flutter-version: '2.0.5'
+          flutter-version: '3.3.2'
           channel: 'stable'
       - run: flutter packages get
       - run: flutter test

android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java

@@ -21,7 +21,7 @@ class _CallSampleState extends State<CallSample> {
   RTCVideoRenderer _remoteRenderer = RTCVideoRenderer();
   bool _inCalling = false;
   Session? _session;
-
+  DesktopCapturerSource? selected_source_;
   bool _waitAccept = false;
 
   // ignore: unused_element
@@ -31,7 +31,7 @@ class _CallSampleState extends State<CallSample> {
   initState() {
     super.initState();
     initRenderers();
-    _connect();
+    _connect(context);
   }
 
   initRenderers() async {
@@ -47,8 +47,8 @@ class _CallSampleState extends State<CallSample> {
     _remoteRenderer.dispose();
   }
 
-  void _connect() async {
-    _signaling ??= Signaling(widget.host)..connect();
+  void _connect(BuildContext context) async {
+    _signaling ??= Signaling(widget.host, context)..connect();
     _signaling?.onSignalingStateChange = (SignalingState state) {
       switch (state) {
         case SignalingState.ConnectionClosed:

ios/Runner/GeneratedPluginRegistrant.h

@@ -29,7 +29,7 @@ class _DataChannelSampleState extends State<DataChannelSample> {
   @override
   initState() {
     super.initState();
-    _connect();
+    _connect(context);
   }
 
   @override
@@ -39,8 +39,8 @@ class _DataChannelSampleState extends State<DataChannelSample> {
     _timer?.cancel();
   }
 
-  void _connect() async {
-    _signaling ??= Signaling(widget.host)..connect();
+  void _connect(BuildContext context) async {
+    _signaling ??= Signaling(widget.host, context)..connect();
 
     _signaling?.onDataChannelMessage = (_, dc, RTCDataChannelMessage data) {
       setState(() {

ios/Runner/GeneratedPluginRegistrant.m

@@ -1,7 +1,9 @@
 import 'dart:convert';
 import 'dart:async';
+import 'package:flutter/material.dart';
 import 'package:flutter_webrtc/flutter_webrtc.dart';
 
+import '../utils/screen_select_dialog.dart';
 import 'random_string.dart';
 
 import '../utils/device_info.dart'
@@ -39,12 +41,13 @@ class Session {
 }
 
 class Signaling {
-  Signaling(this._host);
+  Signaling(this._host, this._context);
 
   JsonEncoder _encoder = JsonEncoder();
   JsonDecoder _decoder = JsonDecoder();
   String _selfId = randomNumeric(6);
   SimpleWebSocket? _socket;
+  BuildContext? _context;
   var _host;
   var _port = 8086;
   var _turnCredential;
@@ -330,7 +333,8 @@ class Signaling {
     await _socket?.connect();
   }
 
-  Future<MediaStream> createStream(String media, bool userScreen) async {
+  Future<MediaStream> createStream(String media, bool userScreen,
+      {BuildContext? context}) async {
     final Map<String, dynamic> mediaConstraints = {
       'audio': userScreen ? false : true,
       'video': userScreen
@@ -346,22 +350,43 @@ class Signaling {
               'optional': [],
             }
     };
+    late MediaStream stream;
+    if (userScreen) {
+      if (WebRTC.platformIsDesktop) {
+        final source = await showDialog<DesktopCapturerSource>(
+          context: context!,
+          builder: (context) => ScreenSelectDialog(),
+        );
+        stream = await navigator.mediaDevices.getDisplayMedia(<String, dynamic>{
+          'video': source == null
+              ? true
+              : {
+                  'deviceId': {'exact': source.id},
+                  'mandatory': {'frameRate': 30.0}
+                }
+        });
+      } else {
+        stream = await navigator.mediaDevices.getDisplayMedia(mediaConstraints);
+      }
+    } else {
+      stream = await navigator.mediaDevices.getUserMedia(mediaConstraints);
+    }
 
-    MediaStream stream = userScreen
-        ? await navigator.mediaDevices.getDisplayMedia(mediaConstraints)
-        : await navigator.mediaDevices.getUserMedia(mediaConstraints);
     onLocalStream?.call(stream);
     return stream;
   }
 
-  Future<Session> _createSession(Session? session,
-      {required String peerId,
-      required String sessionId,
-      required String media,
-      required bool screenSharing}) async {
+  Future<Session> _createSession(
+    Session? session, {
+    required String peerId,
+    required String sessionId,
+    required String media,
+    required bool screenSharing,
+  }) async {
     var newSession = session ?? Session(sid: sessionId, pid: peerId);
     if (media != 'data')
-      _localStream = await createStream(media, screenSharing);
+      _localStream =
+          await createStream(media, screenSharing, context: _context);
     print(_iceServers);
     RTCPeerConnection pc = await createPeerConnection({
       ..._iceServers,