flutter-webrtc · wer-mathurin · Oct 9, 2020 · Sep 18, 2020 · Sep 23, 2020 · Sep 25, 2020
diff --git a/example/lib/src/get_display_media_sample.dart b/example/lib/src/get_display_media_sample.dart
@@ -52,7 +52,7 @@ class _GetDisplayMediaSampleState extends State<GetDisplayMediaSample> {
     final mediaConstraints = <String, dynamic>{'audio': false, 'video': true};
 
     try {
-      var stream = await MediaDevices.getDisplayMedia(mediaConstraints);
+      var stream = await navigator.getDisplayMedia(mediaConstraints);
       _localStream = stream;
       _localRenderer.srcObject = _localStream;
     } catch (e) {

diff --git a/example/lib/src/get_user_media_sample.dart b/example/lib/src/get_user_media_sample.dart
@@ -59,7 +59,7 @@ class _GetUserMediaSampleState extends State<GetUserMediaSample> {
     };
 
     try {
-      var stream = await MediaDevices.getUserMedia(mediaConstraints);
+      var stream = await navigator.getUserMedia(mediaConstraints);
       _localStream = stream;
       _localRenderer.srcObject = _localStream;
     } catch (e) {

diff --git a/example/lib/src/get_user_media_sample_web.dart b/example/lib/src/get_user_media_sample_web.dart
@@ -27,7 +27,7 @@ class _GetUserMediaSampleState extends State<GetUserMediaSample> {
   void initState() {
     super.initState();
     initRenderers();
-    MediaDevices.getSources().then((md) {
+    navigator.getSources().then((md) {
       setState(() {
         cameras = md.where((d) => d['kind'] == 'videoinput').toList();
       });
@@ -62,7 +62,7 @@ class _GetUserMediaSampleState extends State<GetUserMediaSample> {
     };
 
     try {
-      var stream = await MediaDevices.getUserMedia(mediaConstraints);
+      var stream = await navigator.getUserMedia(mediaConstraints);
       _localStream = stream;
       _localRenderer.srcObject = _localStream;
     } catch (e) {

diff --git a/example/lib/src/loopback_sample.dart b/example/lib/src/loopback_sample.dart
@@ -128,7 +128,7 @@ class _MyAppState extends State<LoopBackSample> {
     if (_peerConnection != null) return;
 
     try {
-      _localStream = await MediaDevices.getUserMedia(mediaConstraints);
+      _localStream = await navigator.getUserMedia(mediaConstraints);
       _localRenderer.srcObject = _localStream;
       _peerConnection =
           await createPeerConnection(configuration, loopbackConstraints);

diff --git a/lib/flutter_webrtc.dart b/lib/flutter_webrtc.dart
@@ -1,27 +1,19 @@
 library flutter_webrtc;
 
-export 'src/enums.dart';
-export 'src/get_user_media.dart'
-    if (dart.library.html) 'src/web/get_user_media.dart';
-export 'src/media_recorder.dart'
-    if (dart.library.html) 'src/web/media_recorder.dart';
-export 'src/media_stream.dart'
-    if (dart.library.html) 'src/web/media_stream.dart';
-export 'src/media_stream_track.dart'
-    if (dart.library.html) 'src/web/media_stream_track.dart';
-export 'src/rtc_data_channel.dart'
-    if (dart.library.html) 'src/web/rtc_data_channel.dart';
-export 'src/rtc_dtmf_sender.dart'
-    if (dart.library.html) 'src/web/rtc_dtmf_sender.dart';
-export 'src/rtc_ice_candidate.dart'
-    if (dart.library.html) 'src/web/rtc_ice_candidate.dart';
-export 'src/rtc_peerconnection.dart'
-    if (dart.library.html) 'src/web/rtc_peerconnection.dart';
-export 'src/rtc_peerconnection_factory.dart'
+export 'src/interface/enums.dart';
+export 'src/interface/media_stream.dart';
+export 'src/interface/media_stream_track.dart';
+export 'src/interface/rtc_data_channel.dart';
+export 'src/interface/rtc_dtmf_sender.dart';
+export 'src/interface/rtc_ice_candidate.dart';
+export 'src/interface/rtc_peerconnection.dart';
+export 'src/interface/rtc_session_description.dart';
+export 'src/interface/rtc_stats_report.dart';
+export 'src/media_devices.dart';
+export 'src/media_recorder.dart';
+export 'src/native/rtc_peerconnection_factory.dart'
     if (dart.library.html) 'src/web/rtc_peerconnection_factory.dart';
-export 'src/rtc_session_description.dart'
-    if (dart.library.html) 'src/web/rtc_session_description.dart';
-export 'src/rtc_stats_report.dart';
-export 'src/rtc_video_view.dart'
-    if (dart.library.html) 'src/web/rtc_video_view.dart';
-export 'src/utils.dart' if (dart.library.html) 'src/web/utils.dart';
+export 'src/native/rtc_video_view_impl.dart'
+    if (dart.library.html) 'src/web/rtc_video_view_impl.dart';
+export 'src/native/utils.dart' if (dart.library.html) 'src/web/utils.dart';
+export 'src/rtc_video_renderer.dart';
diff --git a/lib/src/enums.dart → lib/src/interface/enums.dart b/lib/src/enums.dart → lib/src/interface/enums.dart
diff --git a/lib/src/interface/factory.dart b/lib/src/interface/factory.dart
@@ -0,0 +1,19 @@
+import 'media_recorder.dart';
+import 'media_stream.dart';
+import 'navigator.dart';
+import 'rtc_peerconnection.dart';
+import 'rtc_video_renderer.dart';
+
+abstract class RTCFactory {
+  Future<RTCPeerConnection> createPeerConnection(
+      Map<String, dynamic> configuration,
+      [Map<String, dynamic> constraints]);
+
+  Future<MediaStream> createLocalMediaStream(String label);
+
+  Navigator get navigator;
+
+  MediaRecorder mediaRecorder();
+
+  VideoRenderer videoRenderer();
+}
diff --git a/lib/src/interface/media_recorder.dart b/lib/src/interface/media_recorder.dart
@@ -0,0 +1,22 @@
+import 'enums.dart';
+import 'media_stream.dart';
+import 'media_stream_track.dart';
+
+abstract class MediaRecorder {
+  /// For Android use audioChannel param
+  /// For iOS use audioTrack
+  Future<void> start(
+    String path, {
+    MediaStreamTrack videoTrack,
+    RecorderAudioChannel audioChannel,
+  });
+
+  /// Only for Flutter Web
+  void startWeb(
+    MediaStream stream, {
+    Function(dynamic blob, bool isLastOne) onDataChunk,
+    String mimeType,
+  });
+
+  Future<dynamic> stop();
+}
diff --git a/lib/src/interface/media_stream.dart b/lib/src/interface/media_stream.dart
@@ -0,0 +1,26 @@
+import 'media_stream_track.dart';
+
+abstract class MediaStream {
+  MediaStream(this._id, this._ownerTag);
+  final String _id;
+  final String _ownerTag;
+
+  String get id => _id;
+
+  String get ownerTag => _ownerTag;
+
+  Future<void> getMediaTracks();
+
+  Future<void> addTrack(MediaStreamTrack track, {bool addToNative = true});
+
+  Future<void> removeTrack(MediaStreamTrack track,
+      {bool removeFromNative = true});
+
+  List<MediaStreamTrack> getAudioTracks();
+
+  List<MediaStreamTrack> getVideoTracks();
+
+  Future<void> dispose() async {
+    return Future.value();
+  }
+}
diff --git a/lib/src/interface/media_stream_track.dart b/lib/src/interface/media_stream_track.dart
@@ -0,0 +1,33 @@
+abstract class MediaStreamTrack {
+  MediaStreamTrack();
+
+  bool get enabled;
+  set enabled(bool b);
+
+  String get label;
+
+  String get kind;
+
+  String get id;
+
+  ///Future contains isFrontCamera
+  ///Throws error if switching camera failed
+  Future<bool> switchCamera();
+
+  Future<void> adaptRes(int width, int height);
+
+  void setVolume(double volume);
+
+  void setMicrophoneMute(bool mute);
+
+  void enableSpeakerphone(bool enable);
+
+  Future<dynamic> captureFrame([String filePath]);
+
+  Future<bool> hasTorch();
+  Future<void> setTorch(bool torch);
+
+  Future<void> dispose() {
+    return Future.value();
+  }
+}
diff --git a/lib/src/interface/mediadevices.dart b/lib/src/interface/mediadevices.dart
@@ -0,0 +1,7 @@
+import 'media_stream.dart';
+
+abstract class MediaDevices {
+  Future<MediaStream> getUserMedia(Map<String, dynamic> mediaConstraints);
+  Future<MediaStream> getDisplayMedia(Map<String, dynamic> mediaConstraints);
+  Future<List<dynamic>> getSources();
+}
diff --git a/lib/src/interface/navigator.dart b/lib/src/interface/navigator.dart
@@ -0,0 +1,9 @@
+import 'media_stream.dart';
+import 'mediadevices.dart';
+
+abstract class Navigator {
+  Future<MediaStream> getUserMedia(Map<String, dynamic> mediaConstraints);
+  Future<MediaStream> getDisplayMedia(Map<String, dynamic> mediaConstraints);
+  Future<List<dynamic>> getSources();
+  MediaDevices get mediaDevices;
+}
diff --git a/lib/src/web/rtc_data_channel.dart → lib/src/interface/rtc_data_channel.dart b/lib/src/web/rtc_data_channel.dart → lib/src/interface/rtc_data_channel.dart
@@ -1,9 +1,7 @@
 import 'dart:async';
-import 'dart:html' as html;
-import 'dart:js_util' as jsutil;
 import 'dart:typed_data';
 
-import '../enums.dart';
+import 'enums.dart';
 
 class RTCDataChannelInit {
   bool ordered = true;
@@ -22,7 +20,7 @@ class RTCDataChannelInit {
       if (maxRetransmits > 0) 'maxRetransmits': maxRetransmits,
       'protocol': protocol,
       'negotiated': negotiated,
-      if (id != 0) 'id': id
+      'id': id
     };
   }
 }
@@ -63,48 +61,18 @@ class RTCDataChannelMessage {
 }
 
 typedef RTCDataChannelStateCallback = void Function(RTCDataChannelState state);
+
 typedef RTCDataChannelOnMessageCallback = void Function(
     RTCDataChannelMessage data);
 
-class RTCDataChannel {
-  RTCDataChannel(this._jsDc) {
-    stateChangeStream = _stateChangeController.stream;
-    messageStream = _messageController.stream;
-    _jsDc.onClose.listen((_) {
-      _state = RTCDataChannelState.RTCDataChannelClosed;
-      _stateChangeController.add(_state);
-      if (onDataChannelState != null) {
-        onDataChannelState(_state);
-      }
-    });
-    _jsDc.onOpen.listen((_) {
-      _state = RTCDataChannelState.RTCDataChannelOpen;
-      _stateChangeController.add(_state);
-      if (onDataChannelState != null) {
-        onDataChannelState(_state);
-      }
-    });
-    _jsDc.onMessage.listen((event) async {
-      var msg = await _parse(event.data);
-      _messageController.add(msg);
-      if (onMessage != null) {
-        onMessage(msg);
-      }
-    });
-  }
+abstract class RTCDataChannel {
+  RTCDataChannel();
 
-  final html.RtcDataChannel _jsDc;
   RTCDataChannelStateCallback onDataChannelState;
   RTCDataChannelOnMessageCallback onMessage;
-  RTCDataChannelState _state = RTCDataChannelState.RTCDataChannelConnecting;
 
   /// Get current state.
-  RTCDataChannelState get state => _state;
-
-  final _stateChangeController =
-      StreamController<RTCDataChannelState>.broadcast(sync: true);
-  final _messageController =
-      StreamController<RTCDataChannelMessage>.broadcast(sync: true);
+  RTCDataChannelState get state;
 
   /// Stream of state change events. Emits the new state on change.
   /// Closes when the [RTCDataChannel] is closed.
@@ -114,32 +82,12 @@ class RTCDataChannel {
   /// Closes when the [RTCDataChannel] is closed.
   Stream<RTCDataChannelMessage> messageStream;
 
-  Future<RTCDataChannelMessage> _parse(dynamic data) async {
-    if (data is String) return RTCDataChannelMessage(data);
-    dynamic arrayBuffer;
-    if (data is html.Blob) {
-      // This should never happen actually
-      arrayBuffer = await jsutil
-          .promiseToFuture(jsutil.callMethod(data, 'arrayBuffer', []));
-    } else {
-      arrayBuffer = data;
-    }
-    return RTCDataChannelMessage.fromBinary(arrayBuffer.asUint8List());
-  }
+  /// Send a message to this datachannel.
+  /// To send a text message, use the default constructor to instantiate a text [RTCDataChannelMessage]
+  /// for the [message] parameter.
+  /// To send a binary message, pass a binary [RTCDataChannelMessage]
+  /// constructed with [RTCDataChannelMessage.fromBinary]
+  Future<void> send(RTCDataChannelMessage message);
 
-  Future<void> send(RTCDataChannelMessage message) {
-    if (!message.isBinary) {
-      _jsDc.send(message.text);
-    } else {
-      // This may just work
-      _jsDc.sendByteBuffer(message.binary.buffer);
-      // If not, convert to ArrayBuffer/Blob
-    }
-    return Future.value();
-  }
-
-  Future<void> close() {
-    _jsDc.close();
-    return Future.value();
-  }
+      Future<void> close();
 }
diff --git a/lib/src/web/rtc_dtmf_sender.dart → lib/src/interface/rtc_dtmf_sender.dart b/lib/src/web/rtc_dtmf_sender.dart → lib/src/interface/rtc_dtmf_sender.dart
@@ -1,9 +1,4 @@
-import 'dart:html' as html;
-
-class RTCDTMFSender {
-  RTCDTMFSender(this._jsDtmfSender);
-  final html.RtcDtmfSender _jsDtmfSender;
-
+abstract class RTCDTMFSender {
   ///  tones:A String containing the DTMF codes to be transmitted to the recipient.
   ///          Specifying an empty string as the tones parameter clears the tone
   ///          buffer, aborting any currently queued tones. A "," character inserts
@@ -15,11 +10,10 @@ class RTCDTMFSender {
   ///          if you specify a lower value, 30 ms will be used instead);
   ///          the default is 70 ms.
   Future<void> insertDTMF(String tones,
-      {int duration = 100, int interToneGap = 70}) async {
-    return _jsDtmfSender.insertDtmf(tones, duration, interToneGap);
-  }
+      {int duration = 100, int interToneGap = 70});
 
   /// Compatible with old methods
+  @Deprecated('Use method insertDTMF instead')
   Future<void> sendDtmf(String tones,
           {int duration = 100, int interToneGap = 70}) =>
       insertDTMF(tones, duration: duration, interToneGap: interToneGap);

diff --git a/lib/src/rtc_ice_candidate.dart → lib/src/interface/rtc_ice_candidate.dart b/lib/src/rtc_ice_candidate.dart → lib/src/interface/rtc_ice_candidate.dart