Merge pull request #1185 from webrtcHacks/firefox-guard-more

firefox: do not wrap for obsolete shims

Author: fippo

src/js/firefox/firefox_shim.js

@@ -182,13 +182,17 @@ export function shimRTCDataChannel(window) {
   }
 }
 
-export function shimAddTransceiver(window) {
+export function shimAddTransceiver(window, browserDetails) {
   // https://github.com/webrtcHacks/adapter/issues/998#issuecomment-516921647
   // Firefox ignores the init sendEncodings options passed to addTransceiver
   // https://bugzilla.mozilla.org/show_bug.cgi?id=1396918
   if (!(typeof window === 'object' && window.RTCPeerConnection)) {
     return;
   }
+  // Fixed by https://bugzilla.mozilla.org/show_bug.cgi?id=1401592 in FF110.
+  if (browserDetails.version >= 110) {
+    return;
+  }
   const origAddTransceiver = window.RTCPeerConnection.prototype.addTransceiver;
   if (origAddTransceiver) {
     window.RTCPeerConnection.prototype.addTransceiver =
@@ -253,10 +257,14 @@ export function shimAddTransceiver(window) {
   }
 }
 
-export function shimGetParameters(window) {
+export function shimGetParameters(window, browserDetails) {
   if (!(typeof window === 'object' && window.RTCRtpSender)) {
     return;
   }
+  // Fixed by https://bugzilla.mozilla.org/show_bug.cgi?id=1401592 in FF110.
+  if (browserDetails.version >= 110) {
+    return;
+  }
   const origGetParameters = window.RTCRtpSender.prototype.getParameters;
   if (origGetParameters) {
     window.RTCRtpSender.prototype.getParameters =
@@ -270,13 +278,17 @@ export function shimGetParameters(window) {
   }
 }
 
-export function shimCreateOffer(window) {
+export function shimCreateOffer(window, browserDetails) {
   // https://github.com/webrtcHacks/adapter/issues/998#issuecomment-516921647
   // Firefox ignores the init sendEncodings options passed to addTransceiver
   // https://bugzilla.mozilla.org/show_bug.cgi?id=1396918
   if (!(typeof window === 'object' && window.RTCPeerConnection)) {
     return;
   }
+  // Fixed by https://bugzilla.mozilla.org/show_bug.cgi?id=1401592 in FF110.
+  if (browserDetails.version >= 110) {
+    return;
+  }
   const origCreateOffer = window.RTCPeerConnection.prototype.createOffer;
   window.RTCPeerConnection.prototype.createOffer = function createOffer() {
     if (this.setParametersPromises && this.setParametersPromises.length) {
@@ -292,13 +304,17 @@ export function shimCreateOffer(window) {
   };
 }
 
-export function shimCreateAnswer(window) {
+export function shimCreateAnswer(window, browserDetails) {
   // https://github.com/webrtcHacks/adapter/issues/998#issuecomment-516921647
   // Firefox ignores the init sendEncodings options passed to addTransceiver
   // https://bugzilla.mozilla.org/show_bug.cgi?id=1396918
   if (!(typeof window === 'object' && window.RTCPeerConnection)) {
     return;
   }
+  // Fixed by https://bugzilla.mozilla.org/show_bug.cgi?id=1401592 in FF110.
+  if (browserDetails.version >= 110) {
+    return;
+  }
   const origCreateAnswer = window.RTCPeerConnection.prototype.createAnswer;
   window.RTCPeerConnection.prototype.createAnswer = function createAnswer() {
     if (this.setParametersPromises && this.setParametersPromises.length) {

src/js/firefox/getdisplaymedia.js

@@ -9,11 +9,11 @@
 'use strict';
 
 export function shimGetDisplayMedia(window, preferredMediaSource) {
-  if (window.navigator.mediaDevices &&
-    'getDisplayMedia' in window.navigator.mediaDevices) {
+  if (!(window.navigator.mediaDevices)) {
     return;
   }
-  if (!(window.navigator.mediaDevices)) {
+  if (window.navigator.mediaDevices &&
+    'getDisplayMedia' in window.navigator.mediaDevices) {
     return;
   }
   window.navigator.mediaDevices.getDisplayMedia =