Merge branch 'master' into owt-wasm-denoise

arunetm · web-flow · commit 2328f197ef6e · 2020-08-15T11:09:41.000-07:00
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,6 +1,6 @@
 # See https://help.github.com/articles/about-code-owners/ for CODEOWNERS syntax.
 
-* @jianjunz
+* @jianjunz @taste1981 @lzhai @HuaChunbo
 test/ @yanbin7
-src/sdk/rest/ @xiandeatintel
-src/samples/conference/public/scripts/rest-sample.js @xiandeatintel
+src/sdk/rest/ @starwarfan
+src/samples/conference/public/scripts/rest-sample.js @starwarfan
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/samples/conference/cert/certificate.pfx b/src/samples/conference/cert/certificate.pfx
diff --git a/src/samples/p2p/peercall.html b/src/samples/p2p/peercall.html
@@ -59,7 +59,7 @@
 </head>
 
 <body>
-  <script src="https://code.jquery.com/jquery-1.10.2.min.js"
+  <script src="https://code.jquery.com/jquery-3.5.1.min.js"
     type="text/javascript"></script>
   <script
     src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js"
diff --git a/src/sdk/base/sdputils.js b/src/sdk/base/sdputils.js
@@ -514,8 +514,8 @@ function setDefaultCodec(mLine, payload) {
 
 // Following codecs will not be removed from SDP event they are not in the
 // user-specified codec list.
-const audioCodecWhiteList = ['CN', 'telephone-event'];
-const videoCodecWhiteList = ['red', 'ulpfec'];
+const audioCodecAllowList = ['CN', 'telephone-event'];
+const videoCodecAllowList = ['red', 'ulpfec', 'flexfec'];
 
 // Returns a new m= line with the specified codec order.
 function setCodecOrder(mLine, payloads) {
@@ -561,8 +561,8 @@ export function reorderCodecs(sdp, type, codecs) {
     return sdp;
   }
 
-  codecs = type === 'audio' ? codecs.concat(audioCodecWhiteList) : codecs.concat(
-      videoCodecWhiteList);
+  codecs = type === 'audio' ? codecs.concat(audioCodecAllowList) : codecs.concat(
+      videoCodecAllowList);
 
   let sdpLines = sdp.split('\r\n');
 
diff --git a/src/sdk/p2p/peerconnection-channel.js b/src/sdk/p2p/peerconnection-channel.js
@@ -1090,7 +1090,7 @@ class P2PPeerConnectionChannel extends EventDispatcher {
                 const mediaStreams = this._getStreamByTrack(event.target);
                 for (const mediaStream of mediaStreams) {
                   if (this._areAllTracksEnded(mediaStream)) {
-                    this._onRemoteStreamRemoved(mediaStream);
+                    this._onRemoteStreamRemoved({stream: mediaStream});
                   }
                 }
               });

Original file line number	Diff line number	Diff line change
`@@ -1090,7 +1090,7 @@ class P2PPeerConnectionChannel extends EventDispatcher {`
`1090`	`1090`	`const mediaStreams = this._getStreamByTrack(event.target);`
`1091`	`1091`	`for (const mediaStream of mediaStreams) {`
`1092`	`1092`	`if (this._areAllTracksEnded(mediaStream)) {`
`1093`		`- this._onRemoteStreamRemoved(mediaStream);`
	`1093`	`+ this._onRemoteStreamRemoved({stream: mediaStream});`
`1094`	`1094`	`}`
`1095`	`1095`	`}`
`1096`	`1096`	`});`