Merge pull request flutter-webrtc#203 from yonatann/unified-plan

enabled addTrack API for android and ios

Author: cloudwebrtc

android/src/main/java/com/cloudwebrtc/webrtc/PeerConnectionObserver.java

@@ -540,11 +540,21 @@ private Map<String, Object> rtpParametersToMap(RtpParameters rtpParameters){
         for(RtpParameters.Encoding encoding : rtpParameters.encodings){
             ConstraintsMap map = new ConstraintsMap();
             map.putBoolean("active",encoding.active);
-            map.putInt("maxBitrateBps", encoding.maxBitrateBps);
-            map.putInt("minBitrateBps", encoding.minBitrateBps);
-            map.putInt("maxFramerate", encoding.maxFramerate);
-            map.putInt("numTemporalLayers", encoding.numTemporalLayers);
-            map.putDouble("scaleResolutionDownBy", encoding.scaleResolutionDownBy);
+            if (encoding.maxBitrateBps != null) {
+                map.putInt("maxBitrateBps", encoding.maxBitrateBps);
+            }
+            if (encoding.minBitrateBps != null) {
+                map.putInt("minBitrateBps", encoding.minBitrateBps);
+            }
+            if (encoding.maxFramerate != null) {
+                map.putInt("maxFramerate", encoding.maxFramerate);
+            }
+            if (encoding.numTemporalLayers != null) {
+                map.putInt("numTemporalLayers", encoding.numTemporalLayers);
+            }
+            if (encoding.scaleResolutionDownBy != null) {
+                map.putDouble("scaleResolutionDownBy", encoding.scaleResolutionDownBy);
+            }
             map.putLong("ssrc", encoding.ssrc);
             encodings.pushMap(map);
         }
@@ -581,8 +591,10 @@ private Map<String, Object> mediaTrackToMap(MediaStreamTrack track){
     private Map<String, Object> dtmfSenderToMap(DtmfSender dtmfSender, String id){
         ConstraintsMap info = new ConstraintsMap();
         info.putString("dtmfSenderId",id);
-        info.putInt("interToneGap", dtmfSender.interToneGap());
-        info.putInt("duration",dtmfSender.duration());
+        if (dtmfSender != null) {
+            info.putInt("interToneGap", dtmfSender.interToneGap());
+            info.putInt("duration", dtmfSender.duration());
+        }
         return info.toMap();
     }
 
@@ -599,6 +611,7 @@ private Map<String, Object> rtpSenderToMap(RtpSender sender){
     private Map<String, Object> rtpReceiverToMap(RtpReceiver receiver){
         ConstraintsMap info = new ConstraintsMap();
         info.putString("receiverId", receiver.id());
+        info.putMap("rtpParameters", rtpParametersToMap(receiver.getParameters()));
         info.putMap("track", mediaTrackToMap(receiver.track()));
         return info.toMap();
     }

ios/Classes/FlutterWebRTCPlugin.m

@@ -149,6 +149,48 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult) result
                                        message:[NSString stringWithFormat:@"Error: peerConnection or mediaStream not found!"]
                                        details:nil]);
         }
+    }  else if ([@"addTrack" isEqualToString:call.method]) {
+        NSDictionary* argsMap = call.arguments;
+
+        NSString* peerConnectionId = ((NSString*)argsMap[@"peerConnectionId"]);
+        NSString* trackId = ((NSString*)argsMap[@"trackId"]);
+        NSArray<NSString *> *streamIds = ((NSArray<NSString *>*)argsMap[@"streamIds"]);
+
+        RTCPeerConnection *peerConnection = self.peerConnections[peerConnectionId];
+        RTCMediaStreamTrack *track = self.localTracks[trackId];
+
+        if (peerConnection && track) {
+            RTCRtpSender* sender = [peerConnection addTrack:track streamIds:streamIds];
+            
+            // TODO: properly map sender
+            result(@{
+                @"senderId": sender.senderId,
+                @"ownsTrack": @(YES),
+                @"dtmfSender": @{
+                        @"dtmfSenderId": sender.senderId,
+                },
+                @"rtpParameters": @{
+                        @"encodings": @[],
+                        @"headerExtensions": @[],
+                        @"codecs": @[],
+                        @"rtcp": @{
+                                
+                        },
+                },
+                @"track": @{
+                        @"id": sender.track.trackId,
+                        @"kind": sender.track.kind,
+                        @"label": sender.track.trackId,
+                        @"enabled": @(sender.track.isEnabled),
+                        @"remote": @(YES),
+                        @"readyState": @"live"
+                }
+            });
+        } else {
+            result([FlutterError errorWithCode:[NSString stringWithFormat:@"%@Failed",call.method]
+                                       message:[NSString stringWithFormat:@"Error: peerConnection or track not found!"]
+                                       details:nil]);
+        }
     }  else if ([@"removeStream" isEqualToString:call.method]) {
         NSDictionary* argsMap = call.arguments;
 

ios/flutter_webrtc.podspec

@@ -16,7 +16,7 @@ A new flutter plugin project.
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
   s.dependency 'libyuv-iOS'
-  s.dependency 'GoogleWebRTC', '1.1.27299'
+  s.dependency 'GoogleWebRTC', '1.1.29229'
   s.ios.deployment_target = '9.0'
   s.static_framework = true
 end

lib/media_stream_track.dart

@@ -14,7 +14,7 @@ class MediaStreamTrack {
   /// public:
   factory MediaStreamTrack.fromMap(Map<dynamic, dynamic> map) {
     return new MediaStreamTrack(
-        map['trackId'], map['label'], map['kind'], map['enabled']);
+        map['id'], map['label'], map['kind'], map['enabled']);
   }
 
   MediaStreamTrack(this._trackId, this._label, this._kind, this._enabled);

lib/rtc_rtp_receiver.dart

@@ -39,7 +39,7 @@ class RTCRtpReceiver {
   OnFirstPacketReceivedCallback onFirstPacketReceived;
 
   factory RTCRtpReceiver.fromMap(Map<dynamic, dynamic> map) {
-    MediaStreamTrack track = MediaStreamTrack.fromMap(map['trackInfo']);
+    MediaStreamTrack track = MediaStreamTrack.fromMap(map['track']);
     RTCRtpParameters parameters =
         RTCRtpParameters.fromMap(map['rtpParameters']);
     return RTCRtpReceiver(map['receiverId'], track, parameters);

lib/rtc_rtp_sender.dart

@@ -19,7 +19,7 @@ class RTCRtpSender {
     return new RTCRtpSender(
         map['senderId'],
         MediaStreamTrack.fromMap(map['track']),
-        RTCDTMFSender.fromMap(map['dtmfSender']),
+        RTCDTMFSender.fromMap(Map<String, dynamic>.from(map['dtmfSender'])),
         RTCRtpParameters.fromMap(map['rtpParameters']),
         map['ownsTrack']);
   }