Bläddra i källkod

fix(safari): fixes an exception that is caused by adding a null stream to pc

Remove unused code, we always use replaceTrack in unified plan
dev1
Jaya Allamsetty 5 år sedan
förälder
incheckning
6af8eee57d
2 ändrade filer med 8 tillägg och 7 borttagningar
  1. 8
    4
      modules/RTC/TPCUtils.js
  2. 0
    3
      modules/RTC/TraceablePeerConnection.js

+ 8
- 4
modules/RTC/TPCUtils.js Visa fil

@@ -257,10 +257,14 @@ export class TPCUtils {
257 257
         // If the client starts with audio/video muted setting, the transceiver direction
258 258
         // will be set to 'recvonly'. Use addStream here so that a MSID is generated for the stream.
259 259
         if (transceiver.direction === 'recvonly') {
260
-            this.pc.peerconnection.addStream(localTrack.getOriginalStream());
261
-            this.setEncodings(localTrack);
262
-            this.pc.localTracks.set(localTrack.rtcId, localTrack);
263
-            transceiver.direction = 'sendrecv';
260
+            const stream = localTrack.getOriginalStream();
261
+
262
+            if (stream) {
263
+                this.pc.peerconnection.addStream(localTrack.getOriginalStream());
264
+                this.setEncodings(localTrack);
265
+                this.pc.localTracks.set(localTrack.rtcId, localTrack);
266
+                transceiver.direction = 'sendrecv';
267
+            }
264 268
 
265 269
             return Promise.resolve(false);
266 270
         }

+ 0
- 3
modules/RTC/TraceablePeerConnection.js Visa fil

@@ -1606,9 +1606,6 @@ TraceablePeerConnection.prototype.isMediaStreamInPc = function(mediaStream) {
1606 1606
  *       The same applies to addTrack.
1607 1607
  */
1608 1608
 TraceablePeerConnection.prototype.removeTrack = function(localTrack) {
1609
-    if (browser.usesUnifiedPlan()) {
1610
-        return this.tpcUtils.removeTrack(localTrack);
1611
-    }
1612 1609
     const webRtcStream = localTrack.getOriginalStream();
1613 1610
 
1614 1611
     this.trace(

Laddar…
Avbryt
Spara