fix bugs.

Author: cloudwebrtc

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

@@ -41,6 +41,7 @@ class PeerConnectionObserver implements PeerConnection.Observer, EventChannel.St
   private PeerConnection.RTCConfiguration configuration;
   final Map<String, MediaStream> remoteStreams = new HashMap<>();
   final Map<String, MediaStreamTrack> remoteTracks = new HashMap<>();
+  final Map<String, RtpTransceiver> transceivers = new HashMap<>();
   private final StateProvider stateProvider;
   private final EventChannel eventChannel;
   private EventChannel.EventSink eventSink;
@@ -151,13 +152,16 @@ void dataChannelSend(int dataChannelId, ByteBuffer byteBuffer, Boolean isBinary)
     }
 
     RtpTransceiver getRtpTransceiverById(String id) {
-        List<RtpTransceiver> transceivers = peerConnection.getTransceivers();
-        for(RtpTransceiver transceiver : transceivers) {
-            if (id.equals(transceiver.getMid())){
-                return transceiver;
-            }
-        }
-        return null;
+       RtpTransceiver transceiver = transceivers.get(id);
+       if(null == transceiver) {
+           List<RtpTransceiver> transceivers = peerConnection.getTransceivers();
+           for(RtpTransceiver t : transceivers) {
+               if (id.equals(t.getMid())){
+                   transceiver = t;
+               }
+           }
+       }
+       return transceiver;
     }
 
     RtpSender getRtpSenderById(String id) {
@@ -432,7 +436,11 @@ public void onAddTrack(RtpReceiver receiver, MediaStream[] mediaStreams) {
           List<RtpTransceiver> transceivers = peerConnection.getTransceivers();
           for( RtpTransceiver transceiver : transceivers ) {
               if(transceiver.getReceiver() != null && receiver.id().equals(transceiver.getReceiver().id())) {
-                  params.putMap("transceiver", transceiverToMap(transceiver));
+                  String transceiverId = transceiver.getMid();
+                  if(null == transceiverId) {
+                      transceiverId = stateProvider.getNextStreamUUID();
+                  }
+                  params.putMap("transceiver", transceiverToMap(transceiverId, transceiver));
               }
           }
       }
@@ -846,10 +854,14 @@ private Map<String, Object> rtpReceiverToMap(RtpReceiver receiver){
       return info.toMap();
   }
 
-  Map<String, Object> transceiverToMap(RtpTransceiver transceiver){
+  Map<String, Object> transceiverToMap(String transceiverId, RtpTransceiver transceiver){
       ConstraintsMap info = new ConstraintsMap();
-      info.putString("transceiverId", transceiver.getMid());
-      info.putString("mid", transceiver.getMid());
+      info.putString("transceiverId", transceiverId);
+      if(transceiver.getMid() == null) {
+          info.putString("mid", "");
+      } else {
+          info.putString("mid", transceiver.getMid());
+      }
       info.putString("direction", transceiverDirectionString(transceiver.getDirection()));
       info.putMap("sender", rtpSenderToMap(transceiver.getSender()));
       info.putMap("receiver", rtpReceiverToMap(transceiver.getReceiver()));
@@ -888,7 +900,12 @@ public void addTransceiver(MediaStreamTrack track, Map<String, Object> transceiv
       } else {
           transceiver = peerConnection.addTransceiver(track);
       }
-      result.success(transceiverToMap(transceiver));
+      String transceiverId = transceiver.getMid();
+      if(null == transceiverId) {
+          transceiverId = stateProvider.getNextStreamUUID();
+      }
+      transceivers.put(transceiverId, transceiver);
+      result.success(transceiverToMap(transceiverId, transceiver));
   }
 
   public void addTransceiverOfType(String mediaType, Map<String, Object> transceiverInit,  Result result) {
@@ -898,7 +915,12 @@ public void addTransceiverOfType(String mediaType, Map<String, Object> transceiv
       } else {
           transceiver = peerConnection.addTransceiver(stringToMediaType(mediaType));
       }
-      result.success(transceiverToMap(transceiver));
+      String transceiverId = transceiver.getMid();
+      if(null == transceiverId) {
+          transceiverId = stateProvider.getNextStreamUUID();
+      }
+      transceivers.put(transceiverId, transceiver);
+      result.success(transceiverToMap(transceiverId, transceiver));
   }
 
   public void rtpTransceiverSetDirection(String direction, String transceiverId, Result result) {
@@ -990,8 +1012,12 @@ public void getReceivers(Result result) {
     public void getTransceivers(Result result) {
       List<RtpTransceiver> transceivers = peerConnection.getTransceivers();
       ConstraintsArray transceiversParams = new ConstraintsArray();
-      for(RtpTransceiver receiver : transceivers){
-        transceiversParams.pushMap(new ConstraintsMap(transceiverToMap(receiver)));
+      for(RtpTransceiver transceiver : transceivers){
+          String transceiverId = transceiver.getMid();
+          if(null == transceiverId) {
+              transceiverId = stateProvider.getNextStreamUUID();
+          }
+        transceiversParams.pushMap(new ConstraintsMap(transceiverToMap(transceiverId, transceiver)));
       }
       ConstraintsMap params = new ConstraintsMap();
       params.putArray("transceivers", transceiversParams.toArrayList());

lib/src/web/rtc_video_renderer_impl.dart

@@ -86,8 +86,8 @@ class RTCVideoRendererWeb extends VideoRenderer {
     var element = findHtmlView();
     value = value.copyWith(
       rotation: 0,
-      width: element?.videoWidth?.toDouble() ?? 0.0,
-      height: element?.videoHeight?.toDouble() ?? 0.0,
+      width: element?.videoWidth.toDouble() ?? 0.0,
+      height: element?.videoHeight.toDouble() ?? 0.0,
       renderVideo: renderVideo,
     );
   }
@@ -97,6 +97,13 @@ class RTCVideoRendererWeb extends VideoRenderer {
 
   @override
   set srcObject(MediaStream? stream) {
+
+    if(stream == null) {
+      findHtmlView()?.srcObject = null;
+      _audioElement?.srcObject = _audioStream;
+      return;
+    }
+
     _srcObject = stream as MediaStreamWeb;
 
     if (null != _srcObject) {
@@ -127,6 +134,7 @@ class RTCVideoRendererWeb extends VideoRenderer {
       }
       _audioElement?.srcObject = _audioStream;
     }
+
     findHtmlView()?.srcObject = _videoStream;
 
     value = value.copyWith(renderVideo: renderVideo);