Merge pull request flutter-webrtc#98 from MrAlek/fix/remote-capture

cloudwebrtc · web-flow · commit abbfbbd0f4e5 · 2019-05-24T20:13:40.000+08:00
Make startRecordToFile and captureFrame able to capture remote tracks
diff --git a/android/src/main/java/com/cloudwebrtc/webrtc/FlutterWebRTCPlugin.java b/android/src/main/java/com/cloudwebrtc/webrtc/FlutterWebRTCPlugin.java
@@ -314,7 +314,7 @@ public void onMethodCall(MethodCall call, Result notSafeResult) {
                 VideoTrack videoTrack = null;
                 String videoTrackId = call.argument("videoTrackId");
                 if (videoTrackId != null) {
-                    MediaStreamTrack track = localTracks.get(videoTrackId);
+                    MediaStreamTrack track = getTrackForId(videoTrackId);
                     if (track instanceof VideoTrack)
                         videoTrack = (VideoTrack) track;
                 }
@@ -339,7 +339,7 @@ public void onMethodCall(MethodCall call, Result notSafeResult) {
             String path = call.argument("path");
             String videoTrackId = call.argument("trackId");
             if (videoTrackId != null) {
-                MediaStreamTrack track = localTracks.get(videoTrackId);
+                MediaStreamTrack track = getTrackForId(videoTrackId);
                 if (track instanceof VideoTrack)
                     new FrameCapturer((VideoTrack) track, new File(path), result);
                 else
diff --git a/ios/Classes/FlutterWebRTCPlugin.m b/ios/Classes/FlutterWebRTCPlugin.m
@@ -171,7 +171,7 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult) result
         NSString* path = argsMap[@"path"];
         NSString* trackId = argsMap[@"trackId"];
 
-        RTCMediaStreamTrack *track = self.localTracks[trackId];
+        RTCMediaStreamTrack *track = [self trackForId: trackId];
         if (track != nil && [track isKindOfClass:[RTCVideoTrack class]]) {
             RTCVideoTrack *videoTrack = (RTCVideoTrack *)track;
             [self mediaStreamTrackCaptureFrame:videoTrack toPath:path result:result];
@@ -482,8 +482,7 @@ - (RTCMediaStream*)streamForId:(NSString*)streamId
 {
     RTCMediaStream *stream = _localStreams[streamId];
     if (!stream) {
-        for (NSString *peerConnectionId in _peerConnections) {
-            RTCPeerConnection *peerConnection = _peerConnections[peerConnectionId];
+        for (RTCPeerConnection *peerConnection in _peerConnections.allValues) {
             stream = peerConnection.remoteStreams[streamId];
             if (stream) {
                 break;
@@ -493,6 +492,21 @@ - (RTCMediaStream*)streamForId:(NSString*)streamId
     return stream;
 }
 
+- (RTCMediaStreamTrack*)trackForId:(NSString*)trackId
+{
+    RTCMediaStreamTrack *track = _localTracks[trackId];
+    if (!track) {
+        for (RTCPeerConnection *peerConnection in _peerConnections.allValues) {
+            track = peerConnection.remoteTracks[trackId];
+            if (track) {
+                break;
+            }
+        }
+    }
+
+    return track;    
+}
+
 - (RTCIceServer *)RTCIceServer:(id)json
 {
     if (!json) {
