Fix bug for unified-plan.

Author: cloudwebrtc

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
 --------------------------------------------
+0.2.2
+
+* Fix bug for unified-plan.
+
+
 0.2.1
 
 * Fix getStats.

lib/src/rtc_peerconnection.dart

@@ -36,7 +36,12 @@ class RTCOfferOptions {
 @JS()
 @anonymous
 class RTCAnswerOptions {
-  external factory RTCAnswerOptions({bool voiceActivityDetection});
+  external factory RTCAnswerOptions(
+      {bool offerToReceiveAudio,
+      bool offerToReceiveVideo,
+      bool voiceActivityDetection});
+  external bool get offerToReceiveAudio;
+  external bool get offerToReceiveVideo;
   external bool get voiceActivityDetection;
 }
 
@@ -49,19 +54,15 @@ class MediaStreamEvent {
 @JS()
 @anonymous
 class RTCConfiguration {
-  external factory RTCConfiguration({
-    List<RTCIceServer> iceServers,
-    String rtcpMuxPolicy,
-    String iceTransportPolicy,
-    String bundlePolicy,
-    String peerIdentity,
-    int iceCandidatePoolSize,
-  });
+  external factory RTCConfiguration(
+      {List<RTCIceServer> iceServers,
+      String iceTransportPolicy,
+      String bundlePolicy,
+      String peerIdentity,
+      String sdpSemantics,
+      int iceCandidatePoolSize});
   external List<RTCIceServer> get iceServers;
 
-  ///Optional: 'negotiate' or 'require'
-  external String get rtcpMuxPolicy;
-
   ///Optional: 'relay' or 'all'
   external String get iceTransportPolicy;
 
@@ -75,6 +76,9 @@ class RTCConfiguration {
 
   ///Optional: 'balanced' | 'max-compat' | 'max-bundle'
   external String get bundlePolicy;
+
+  /// 'plan-b' | 'unified-plan'
+  external String get sdpSemantics;
 }
 
 @JS()
@@ -104,8 +108,7 @@ class RTCPeerConnectionJs {
   external void removeStream(MediaStreamJs stream);
   external List<MediaStreamJs> getLocalStreams();
   external List<MediaStreamJs> getRemoteStreams();
-  external RTCRtpSender addTrack(
-      MediaStreamTrack track, List<MediaStreamJs> streams);
+  external RTCRtpSender addTrack(MediaStreamTrack track, MediaStreamJs stream);
   external void removeTrack(RTCRtpSender sender);
   external dynamic setLocalDescription(RTCSessionDescription desc);
   external dynamic setRemoteDescription(RTCSessionDescription desc);
@@ -208,11 +211,9 @@ class RTCPeerConnection {
   }
 
   Future<RTCRtpSender> addTrack(
-      {MediaStreamTrack track, List<MediaStreamJs> streams}) async {
+      {MediaStreamTrack track, MediaStreamJs stream}) async {
     try {
-      var sender = await promiseToFuture<RTCRtpSender>(
-          _internal.addTrack(track, streams));
-      return sender;
+      return _internal.addTrack(track, stream);
     } catch (e) {
       rethrow;
     }
@@ -238,7 +239,7 @@ class RTCPeerConnection {
 
   Future<void> addIceCandidate(RTCIceCandidate candidate) async {
     try {
-      _internal.addIceCandidate(candidate);
+      await promiseToFuture<void>(_internal.addIceCandidate(candidate));
     } catch (e) {
       rethrow;
     }

lib/src/rtc_rtcp_parameters.dart

@@ -14,3 +14,11 @@ class RTCRTCPParameters {
   /// Whether reduced size RTCP is configured or compound RTCP
   external bool get reducedSize;
 }
+
+Map<String, dynamic> rtcpParametersToMap(RTCRTCPParameters parameters) {
+  return {'cname': parameters.cname, 'reducedSize': parameters.reducedSize};
+}
+
+RTCRTCPParameters rtcpParametersFromMap(Map<String, dynamic> map) {
+  return RTCRTCPParameters(cname: map['cnam'], reducedSize: map['reducedSize']);
+}

lib/src/rtc_rtp_parameters.dart

@@ -113,10 +113,82 @@ class RTCRtpEncodingParameters {
 
 Map<String, dynamic> rtpEncodingParametersToMap(
     RTCRtpEncodingParameters parameters) {
-  return {};
+  return {
+    'rtcp': rtcpParametersToMap(parameters.rtcp),
+    'headerExtensions': parameters.headerExtensions
+        .map((e) => headerExtensionToMap(e))
+        .toList(),
+    'encodings': parameters.encodings.map((e) => rtpEncodingToMap(e)).toList(),
+    'codecs': parameters.codecs.map((e) => rtcCodecToMap(e)).toList(),
+  };
 }
 
 RTCRtpEncodingParameters rtpEncodingParametersFromMap(
     Map<String, dynamic> map) {
-  return RTCRtpEncodingParameters();
+  return RTCRtpEncodingParameters(
+      rtcp: rtcpParametersFromMap(map['rtcp']),
+      codecs: (map['codecs'] as List).map((e) => rtcCodecFromMap(e)).toList(),
+      encodings:
+          (map['encodings'] as List).map((e) => rtpEncodingFromMap(e)).toList(),
+      headerExtensions: (map['headerExtensions'] as List)
+          .map((e) => headerExtensionFromMap(e))
+          .toList());
+}
+
+Map<String, dynamic> rtpEncodingToMap(RTCRtpEncoding encoding) {
+  return {
+    'rid': encoding.rid,
+    'active': encoding.active,
+    'maxBitrateBps': encoding.maxBitrateBps,
+    'minBitrateBps': encoding.minBitrateBps,
+    'maxFramerate': encoding.maxFramerate,
+    'numTemporalLayers': encoding.numTemporalLayers,
+    'scaleResolutionDownBy': encoding.scaleResolutionDownBy,
+    'ssrc': encoding.ssrc
+  };
+}
+
+RTCRtpEncoding rtpEncodingFromMap(Map<String, dynamic> map) {
+  return RTCRtpEncoding(
+      rid: map['rid'],
+      active: map['active'],
+      maxBitrateBps: map['maxBitrateBps'],
+      minBitrateBps: map['minBitrateBps'],
+      numTemporalLayers: map['numTemporalLayers'],
+      scaleResolutionDownBy: map['scaleResolutionDownBy'],
+      ssrc: map['ssrc']);
+}
+
+Map<String, dynamic> rtcCodecToMap(RTCRTPCodec codec) {
+  return {
+    'payloadType': codec.payloadType,
+    'name': codec.name,
+    'kind': codec.kind,
+    'clockRate': codec.clockRate,
+    'numChannels': codec.numChannels,
+    'parameters': codec.parameters
+  };
+}
+
+RTCRTPCodec rtcCodecFromMap(Map<String, dynamic> map) {
+  return RTCRTPCodec(
+      payloadType: map['payloadType'],
+      name: map['name'],
+      kind: map['kind'],
+      clockRate: map['clockRate'],
+      numChannels: map['numChannels'],
+      parameters: map['parameters']);
+}
+
+Map<String, dynamic> headerExtensionToMap(RTCHeaderExtension headerExtension) {
+  return {
+    'uri': headerExtension.uri,
+    'id': headerExtension.id,
+    'encrypted': headerExtension.encrypted
+  };
+}
+
+RTCHeaderExtension headerExtensionFromMap(Map<String, dynamic> map) {
+  return RTCHeaderExtension(
+      encrypted: map['encrypted'], id: map['id'], uri: map['uri']);
 }

lib/src/rtc_rtp_sender.dart

@@ -17,7 +17,7 @@ class RTCRtpSender {
   external RTCRtpEncodingParameters getParameters();
   external bool setParameters(RTCRtpEncodingParameters parameters);
   external RTCStatsReportJs getStats();
-  external void setStreams(List<MediaStream> streams);
+  external void setStreams(List<MediaStreamJs> streams);
   external void replaceTrack(MediaStreamTrack track);
   external static dynamic getCapabilities();
 }

lib/src/rtc_rtp_transceiver.dart

@@ -13,17 +13,18 @@ import 'rtc_rtp_sender.dart';
 class RTCRtpTransceiverInit {
   external factory RTCRtpTransceiverInit(
       {String direction,
-      List<MediaStream> streams,
+      List<MediaStreamJs> streams,
       List<RTCRtpEncodingParameters> sendEncodings});
   external String get direction;
-  external List<MediaStream> get streams;
+  external List<MediaStreamJs> get streams;
   external List<RTCRtpEncodingParameters> get sendEncodings;
 }
 
 @JS('RTCRtpTransceiver')
 class RTCRtpTransceiver {
   external factory RTCRtpTransceiver();
   external String get direction;
+  external set direction(String dir);
   external String get mid;
   external RTCRtpReceiver get receiver;
   external RTCRtpSender get sender;

lib/src/rtc_stats_resport.dart

@@ -30,7 +30,7 @@ class RTCStatsReport {
     }));
   }
   final RTCStatsReportJs _jsStats;
-  Map<String, RTCStats> _stats = {};
+  final Map<String, RTCStats> _stats = {};
 
   int get size => _jsStats.size;
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: dart_webrtc
 description: Use the dart/js library to re-wrap the webrtc js interface of the browser, to adapted common browsers.
-version: 0.2.1
+version: 0.2.2
 homepage: https://github.com/flutter-webrtc/dart-webrtc
 
 environment:

web/main.dart

@@ -2,12 +2,13 @@ import 'dart:html' as html;
 
 import 'package:dart_webrtc/dart_webrtc.dart';
 
+/*
 import 'test_media_devices.dart' as media_devices_tests;
 import 'test_media_stream.dart' as media_stream_tests;
 import 'test_media_stream_track.dart' as media_stream_track_tests;
 import 'test_peerconnection.dart' as peerconnection_tests;
 import 'test_video_element.dart' as video_elelment_tests;
-
+*/
 void main() {
   /*
   video_elelment_tests.testFunctions.forEach((Function func) => func());