diff options
author | Martin Stransky <stransky@redhat.com> | 2020-11-25 10:42:45 +0100 |
---|---|---|
committer | Martin Stransky <stransky@redhat.com> | 2020-11-25 10:42:45 +0100 |
commit | e36bb4e6344cd1ea8722bd669daab0dbf236936e (patch) | |
tree | e63178b25dbb46f2a33a2bc160cc0e59d1c2c8aa /pw7.patch | |
parent | Export MOZ_GMP_PATH from /usr/bin/firefox script (https://pagure.io/fedora-w... (diff) | |
download | librewolf-fedora-ff-e36bb4e6344cd1ea8722bd669daab0dbf236936e.tar.gz librewolf-fedora-ff-e36bb4e6344cd1ea8722bd669daab0dbf236936e.tar.bz2 librewolf-fedora-ff-e36bb4e6344cd1ea8722bd669daab0dbf236936e.zip |
Added fix for rhbz#1900542
Diffstat (limited to 'pw7.patch')
-rw-r--r-- | pw7.patch | 95 |
1 files changed, 0 insertions, 95 deletions
diff --git a/pw7.patch b/pw7.patch deleted file mode 100644 index db75dea..0000000 --- a/pw7.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff --git a/browser/actors/WebRTCParent.jsm b/browser/actors/WebRTCParent.jsm ---- a/browser/actors/WebRTCParent.jsm -+++ b/browser/actors/WebRTCParent.jsm -@@ -756,6 +756,8 @@ - ); - menupopup.appendChild(doc.createXULElement("menuseparator")); - -+ let isPipeWire = false; -+ - // Build the list of 'devices'. - let monitorIndex = 1; - for (let i = 0; i < devices.length; ++i) { -@@ -783,6 +785,7 @@ - // Don't mark it as scary as there's an extra confirmation step by - // PipeWire portal dialog. - if (name == PIPEWIRE_PORTAL_NAME && device.id == PIPEWIRE_ID) { -+ isPipeWire = true; - let sawcStringId = "getUserMedia.sharePipeWirePortal.label"; - let item = addDeviceToList( - menupopup, -@@ -908,39 +911,41 @@ - perms.EXPIRE_SESSION - ); - -- video.deviceId = deviceId; -- let constraints = { -- video: { mediaSource: type, deviceId: { exact: deviceId } }, -- }; -- chromeWin.navigator.mediaDevices.getUserMedia(constraints).then( -- stream => { -- if (video.deviceId != deviceId) { -- // The user has selected a different device or closed the panel -- // before getUserMedia finished. -- stream.getTracks().forEach(t => t.stop()); -- return; -+ if (!isPipeWire) { -+ video.deviceId = deviceId; -+ let constraints = { -+ video: { mediaSource: type, deviceId: { exact: deviceId } }, -+ }; -+ chromeWin.navigator.mediaDevices.getUserMedia(constraints).then( -+ stream => { -+ if (video.deviceId != deviceId) { -+ // The user has selected a different device or closed the panel -+ // before getUserMedia finished. -+ stream.getTracks().forEach(t => t.stop()); -+ return; -+ } -+ video.srcObject = stream; -+ video.stream = stream; -+ doc.getElementById("webRTC-preview").hidden = false; -+ video.onloadedmetadata = function(e) { -+ video.play(); -+ }; -+ }, -+ err => { -+ if ( -+ err.name == "OverconstrainedError" && -+ err.constraint == "deviceId" -+ ) { -+ // Window has disappeared since enumeration, which can happen. -+ // No preview for you. -+ return; -+ } -+ Cu.reportError( -+ `error in preview: ${err.message} ${err.constraint}` -+ ); - } -- video.srcObject = stream; -- video.stream = stream; -- doc.getElementById("webRTC-preview").hidden = false; -- video.onloadedmetadata = function(e) { -- video.play(); -- }; -- }, -- err => { -- if ( -- err.name == "OverconstrainedError" && -- err.constraint == "deviceId" -- ) { -- // Window has disappeared since enumeration, which can happen. -- // No preview for you. -- return; -- } -- Cu.reportError( -- `error in preview: ${err.message} ${err.constraint}` -- ); -- } -- ); -+ ); -+ } - }; - menupopup.addEventListener("command", menupopup._commandEventListener); - } - |