screen sharing for desktop. (#135)
* screen sharing for desktop (WIP). * use git repo for testing. * update. * Add sourceId/frameRate to ScreenShareCaptureOptions. * Compatible with flutter web. * Rendering of camera and screenshare video tracks at same time. * Remote screen sharing is shown first, and fixed sub/unsub button for screenshare widget. * resolved conflict. * modify flutter-webrtc to pub version. * remove unused import. * chore: Common params for Camera and ScreenShare.
This commit is contained in:
CloudWebRTC
+45
-18
@@ -1,6 +1,5 @@
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:flutter/foundation.dart' show kIsWeb;
|
||||
import 'package:flutter_webrtc/flutter_webrtc.dart';
|
||||
|
||||
import '../track/local/audio.dart';
|
||||
import '../track/local/video.dart';
|
||||
@@ -23,26 +22,22 @@ extension CameraPositionExt on CameraPosition {
|
||||
|
||||
/// Options used when creating a [LocalVideoTrack] that captures the camera.
|
||||
class CameraCaptureOptions extends VideoCaptureOptions {
|
||||
/// The deviceId of the capture device to use.
|
||||
/// Available deviceIds can be obtained through `flutter_webrtc`:
|
||||
/// <pre>
|
||||
/// import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
|
||||
///
|
||||
/// List<MediaDeviceInfo> devices = await rtc.navigator.mediaDevices.enumerateDevices();
|
||||
/// </pre>
|
||||
final String? deviceId;
|
||||
final CameraPosition cameraPosition;
|
||||
|
||||
const CameraCaptureOptions({
|
||||
this.deviceId,
|
||||
this.cameraPosition = CameraPosition.front,
|
||||
String? deviceId,
|
||||
double? maxFrameRate,
|
||||
VideoParameters params = VideoParametersPresets.h540_169,
|
||||
}) : super(params: params);
|
||||
}) : super(params: params, deviceId: deviceId, maxFrameRate: maxFrameRate);
|
||||
|
||||
CameraCaptureOptions.from({required VideoCaptureOptions captureOptions})
|
||||
: deviceId = null,
|
||||
cameraPosition = CameraPosition.front,
|
||||
super(params: captureOptions.params);
|
||||
: cameraPosition = CameraPosition.front,
|
||||
super(
|
||||
params: captureOptions.params,
|
||||
deviceId: captureOptions.deviceId,
|
||||
maxFrameRate: captureOptions.maxFrameRate,
|
||||
);
|
||||
|
||||
@override
|
||||
Map<String, dynamic> toMediaConstraintsMap() {
|
||||
@@ -60,6 +55,9 @@ class CameraCaptureOptions extends VideoCaptureOptions {
|
||||
];
|
||||
}
|
||||
}
|
||||
if (maxFrameRate != null) {
|
||||
constraints['frameRate'] = {'max': maxFrameRate};
|
||||
}
|
||||
return constraints;
|
||||
}
|
||||
|
||||
@@ -67,21 +65,26 @@ class CameraCaptureOptions extends VideoCaptureOptions {
|
||||
CameraCaptureOptions copyWith({
|
||||
VideoParameters? params,
|
||||
CameraPosition? cameraPosition,
|
||||
String? deviceId,
|
||||
double? maxFrameRate,
|
||||
}) =>
|
||||
CameraCaptureOptions(
|
||||
params: params ?? this.params,
|
||||
cameraPosition: cameraPosition ?? this.cameraPosition,
|
||||
deviceId: deviceId ?? this.deviceId,
|
||||
maxFrameRate: maxFrameRate ?? this.maxFrameRate,
|
||||
);
|
||||
}
|
||||
|
||||
/// Options used when creating a [LocalVideoTrack] that captures the screen.
|
||||
class ScreenShareCaptureOptions extends VideoCaptureOptions {
|
||||
final bool useiOSBroadcastExtension;
|
||||
|
||||
const ScreenShareCaptureOptions({
|
||||
this.useiOSBroadcastExtension = false,
|
||||
String? sourceId,
|
||||
double? maxFrameRate,
|
||||
VideoParameters params = VideoParametersPresets.screenShareH720FPS15,
|
||||
}) : super(params: params);
|
||||
}) : super(params: params, deviceId: sourceId, maxFrameRate: maxFrameRate);
|
||||
|
||||
ScreenShareCaptureOptions.from(
|
||||
{this.useiOSBroadcastExtension = false,
|
||||
@@ -91,9 +94,17 @@ class ScreenShareCaptureOptions extends VideoCaptureOptions {
|
||||
@override
|
||||
Map<String, dynamic> toMediaConstraintsMap() {
|
||||
var constraints = super.toMediaConstraintsMap();
|
||||
if (useiOSBroadcastExtension && Platform.isIOS) {
|
||||
if (useiOSBroadcastExtension && WebRTC.platformIsIOS) {
|
||||
constraints['deviceId'] = 'broadcast';
|
||||
}
|
||||
if (WebRTC.platformIsDesktop) {
|
||||
if (deviceId != null) {
|
||||
constraints['deviceId'] = {'exact': deviceId};
|
||||
}
|
||||
if (maxFrameRate != 0.0) {
|
||||
constraints['mandatory'] = {'frameRate': maxFrameRate};
|
||||
}
|
||||
}
|
||||
return constraints;
|
||||
}
|
||||
}
|
||||
@@ -111,8 +122,24 @@ abstract class VideoCaptureOptions extends LocalTrackOptions {
|
||||
// final LocalVideoTrackType type;
|
||||
final VideoParameters params;
|
||||
|
||||
/// The deviceId of the capture device to use.
|
||||
/// Available deviceIds can be obtained through `flutter_webrtc`:
|
||||
/// <pre>
|
||||
/// import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
|
||||
///
|
||||
/// List<MediaDeviceInfo> devices = await rtc.navigator.mediaDevices.enumerateDevices();
|
||||
/// // or
|
||||
/// List<DesktopCapturerSource> desktopSources = await rtc.desktopCapturer.getSources(types: [rtc.SourceType.Screen, rtc.SourceType.Window]);
|
||||
/// </pre>
|
||||
final String? deviceId;
|
||||
|
||||
// Limit the maximum frameRate of the capture device.
|
||||
final double? maxFrameRate;
|
||||
|
||||
const VideoCaptureOptions({
|
||||
this.params = VideoParametersPresets.h540_169,
|
||||
this.deviceId,
|
||||
this.maxFrameRate,
|
||||
});
|
||||
|
||||
@override
|
||||
|
||||
@@ -0,0 +1,318 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
|
||||
|
||||
import '../logger.dart';
|
||||
|
||||
// ignore: must_be_immutable
|
||||
class ScreenSelectDialog extends Dialog {
|
||||
ScreenSelectDialog({Key? key}) : super(key: key) {
|
||||
Future.delayed(const Duration(milliseconds: 100), () {
|
||||
_getSources();
|
||||
});
|
||||
_subscriptions.add(rtc.desktopCapturer.onAdded.stream.listen((source) {
|
||||
_sources[source.id] = source;
|
||||
_stateSetter?.call(() {});
|
||||
}));
|
||||
|
||||
_subscriptions.add(rtc.desktopCapturer.onRemoved.stream.listen((source) {
|
||||
_sources.remove(source.id);
|
||||
_stateSetter?.call(() {});
|
||||
}));
|
||||
|
||||
_subscriptions
|
||||
.add(rtc.desktopCapturer.onNameChanged.stream.listen((source) {
|
||||
_sources[source.id] = source;
|
||||
_stateSetter?.call(() {});
|
||||
}));
|
||||
|
||||
_subscriptions
|
||||
.add(rtc.desktopCapturer.onThumbnailChanged.stream.listen((source) {
|
||||
_sources[source.id] = source;
|
||||
_stateSetter?.call(() {});
|
||||
}));
|
||||
}
|
||||
final Map<String, rtc.DesktopCapturerSource> _sources = {};
|
||||
rtc.SourceType _sourceType = rtc.SourceType.Screen;
|
||||
rtc.DesktopCapturerSource? _selectedSource;
|
||||
final List<StreamSubscription<rtc.DesktopCapturerSource>> _subscriptions = [];
|
||||
StateSetter? _stateSetter;
|
||||
Timer? _timer;
|
||||
|
||||
void _ok(BuildContext context) {
|
||||
_timer?.cancel();
|
||||
for (var item in _subscriptions) {
|
||||
item.cancel();
|
||||
}
|
||||
Navigator.pop<rtc.DesktopCapturerSource>(context, _selectedSource);
|
||||
}
|
||||
|
||||
void _cancel(BuildContext context) {
|
||||
_timer?.cancel();
|
||||
for (var item in _subscriptions) {
|
||||
item.cancel();
|
||||
}
|
||||
Navigator.pop<rtc.DesktopCapturerSource>(context, null);
|
||||
}
|
||||
|
||||
Future<void> _getSources() async {
|
||||
try {
|
||||
var sources = await rtc.desktopCapturer.getSources(types: [_sourceType]);
|
||||
for (var item in sources) {
|
||||
logger.info('name: ${item.name}, id: ${item.id}, type: ${item.type}');
|
||||
}
|
||||
_stateSetter?.call(() {
|
||||
for (var item in sources) {
|
||||
_sources[item.id] = item;
|
||||
}
|
||||
});
|
||||
_timer?.cancel();
|
||||
_timer = Timer.periodic(const Duration(seconds: 2), (timer) {
|
||||
rtc.desktopCapturer.updateSources(types: [_sourceType]);
|
||||
});
|
||||
return;
|
||||
} catch (e) {
|
||||
logger.warning(e.toString());
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Material(
|
||||
type: MaterialType.transparency,
|
||||
child: Center(
|
||||
child: Container(
|
||||
width: 640,
|
||||
height: 560,
|
||||
color: Colors.white,
|
||||
child: Column(
|
||||
children: <Widget>[
|
||||
Padding(
|
||||
padding: const EdgeInsets.all(10),
|
||||
child: Stack(
|
||||
children: <Widget>[
|
||||
const Align(
|
||||
alignment: Alignment.topLeft,
|
||||
child: Text(
|
||||
'Choose what to share',
|
||||
style: TextStyle(fontSize: 16, color: Colors.black87),
|
||||
),
|
||||
),
|
||||
Align(
|
||||
alignment: Alignment.topRight,
|
||||
child: InkWell(
|
||||
child: const Icon(Icons.close),
|
||||
onTap: () => _cancel(context),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
flex: 1,
|
||||
child: Container(
|
||||
width: double.infinity,
|
||||
padding: const EdgeInsets.all(10),
|
||||
child: StatefulBuilder(
|
||||
builder: (context, setState) {
|
||||
_stateSetter = setState;
|
||||
return DefaultTabController(
|
||||
length: 2,
|
||||
child: Column(
|
||||
children: <Widget>[
|
||||
Container(
|
||||
constraints:
|
||||
const BoxConstraints.expand(height: 24),
|
||||
child: TabBar(
|
||||
onTap: (value) => Future.delayed(
|
||||
const Duration(milliseconds: 300), () {
|
||||
_sourceType = value == 0
|
||||
? rtc.SourceType.Screen
|
||||
: rtc.SourceType.Window;
|
||||
_getSources();
|
||||
}),
|
||||
tabs: const [
|
||||
Tab(
|
||||
child: Text(
|
||||
'Entire Screen',
|
||||
style: TextStyle(color: Colors.black54),
|
||||
)),
|
||||
Tab(
|
||||
child: Text(
|
||||
'Window',
|
||||
style: TextStyle(color: Colors.black54),
|
||||
)),
|
||||
]),
|
||||
),
|
||||
const SizedBox(
|
||||
height: 2,
|
||||
),
|
||||
Expanded(
|
||||
child: TabBarView(children: [
|
||||
Align(
|
||||
alignment: Alignment.center,
|
||||
child: GridView.count(
|
||||
crossAxisSpacing: 8,
|
||||
crossAxisCount: 2,
|
||||
children: _sources.entries
|
||||
.where((element) =>
|
||||
element.value.type ==
|
||||
rtc.SourceType.Screen)
|
||||
.map((e) => Column(
|
||||
children: [
|
||||
Expanded(
|
||||
child: Container(
|
||||
decoration: (_selectedSource !=
|
||||
null &&
|
||||
_selectedSource!.id ==
|
||||
e.value.id)
|
||||
? BoxDecoration(
|
||||
border: Border.all(
|
||||
width: 2,
|
||||
color: Colors
|
||||
.blueAccent))
|
||||
: null,
|
||||
child: InkWell(
|
||||
onTap: () {
|
||||
logger.info(
|
||||
'Selected screen id => ${e.value.id}');
|
||||
setState(() {
|
||||
_selectedSource =
|
||||
e.value;
|
||||
});
|
||||
},
|
||||
child: e.value.thumbnail !=
|
||||
null
|
||||
? Image.memory(
|
||||
e.value.thumbnail!,
|
||||
scale: 1.0,
|
||||
repeat: ImageRepeat
|
||||
.noRepeat,
|
||||
)
|
||||
: Container(),
|
||||
),
|
||||
)),
|
||||
Text(
|
||||
e.value.name,
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
color: Colors.black87,
|
||||
fontWeight:
|
||||
(_selectedSource !=
|
||||
null &&
|
||||
_selectedSource!
|
||||
.id ==
|
||||
e.value
|
||||
.id)
|
||||
? FontWeight.bold
|
||||
: FontWeight
|
||||
.normal),
|
||||
),
|
||||
],
|
||||
))
|
||||
.toList(),
|
||||
)),
|
||||
Align(
|
||||
alignment: Alignment.center,
|
||||
child: GridView.count(
|
||||
crossAxisSpacing: 8,
|
||||
crossAxisCount: 3,
|
||||
children: _sources.entries
|
||||
.where((element) =>
|
||||
element.value.type ==
|
||||
rtc.SourceType.Window)
|
||||
.map((e) => Column(
|
||||
children: [
|
||||
Expanded(
|
||||
child: Container(
|
||||
decoration: (_selectedSource !=
|
||||
null &&
|
||||
_selectedSource!.id ==
|
||||
e.value.id)
|
||||
? BoxDecoration(
|
||||
border: Border.all(
|
||||
width: 2,
|
||||
color: Colors
|
||||
.blueAccent))
|
||||
: null,
|
||||
child: InkWell(
|
||||
onTap: () {
|
||||
logger.info(
|
||||
'Selected window id => ${e.value.id}');
|
||||
setState(() {
|
||||
_selectedSource =
|
||||
e.value;
|
||||
});
|
||||
},
|
||||
child: e.value.thumbnail!
|
||||
.isNotEmpty
|
||||
? Image.memory(
|
||||
e.value.thumbnail!,
|
||||
scale: 1.0,
|
||||
repeat: ImageRepeat
|
||||
.noRepeat,
|
||||
)
|
||||
: Container(),
|
||||
),
|
||||
)),
|
||||
Text(
|
||||
e.value.name,
|
||||
style: TextStyle(
|
||||
fontSize: 12,
|
||||
color: Colors.black87,
|
||||
fontWeight:
|
||||
(_selectedSource !=
|
||||
null &&
|
||||
_selectedSource!
|
||||
.id ==
|
||||
e.value
|
||||
.id)
|
||||
? FontWeight.bold
|
||||
: FontWeight
|
||||
.normal),
|
||||
),
|
||||
],
|
||||
))
|
||||
.toList(),
|
||||
)),
|
||||
]),
|
||||
)
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
width: double.infinity,
|
||||
child: ButtonBar(
|
||||
children: <Widget>[
|
||||
MaterialButton(
|
||||
child: const Text(
|
||||
'Cancel',
|
||||
style: TextStyle(color: Colors.black54),
|
||||
),
|
||||
onPressed: () {
|
||||
_cancel(context);
|
||||
},
|
||||
),
|
||||
MaterialButton(
|
||||
color: Theme.of(context).primaryColor,
|
||||
child: const Text(
|
||||
'Share',
|
||||
),
|
||||
onPressed: () {
|
||||
_ok(context);
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
)),
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user