Bug 1313758 - set media.getusermedia.browser.enabled to default false; r=jesup
authorMunro Mengjue Chiang <mchiang@mozilla.com>
Wed, 30 Nov 2016 15:03:48 +0800
changeset 325106 617cd94bd7c5ff1dbcd3083bbe1c843bfb2fdb49
parent 325105 82cd79862bab05ae8afb3dec503c4d99c7dd8853
child 325107 1451fb639925d5c59389aa5da22781a92bff2e69
push id84599
push userkwierso@gmail.com
push dateFri, 02 Dec 2016 21:13:20 +0000
treeherdermozilla-inbound@18109e54e6cc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs1313758
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1313758 - set media.getusermedia.browser.enabled to default false; r=jesup MozReview-Commit-ID: 54YTn2p4nnX
dom/media/tests/mochitest/test_getUserMedia_basicTabshare.html
modules/libpref/init/all.js
--- a/dom/media/tests/mochitest/test_getUserMedia_basicTabshare.html
+++ b/dom/media/tests/mochitest/test_getUserMedia_basicTabshare.html
@@ -18,18 +18,20 @@
    */
   runTest(function () {
     const isWinXP = navigator.userAgent.indexOf("Windows NT 5.1") != -1;
     if (IsMacOSX10_6orOlder() || isWinXP) {
         ok(true, "Screensharing disabled for OSX10.6 and WinXP");
         return;
     }
     var testVideo = createMediaElement('video', 'testVideo');
+    var pushPrefs = (...p) => SpecialPowers.pushPrefEnv({set: p});
 
     return Promise.resolve()
+      .then(() => pushPrefs(["media.getusermedia.browser.enabled", true]))
       .then(() => getUserMedia({
         video: { mediaSource: "browser",
                  scrollWithPage: true },
         fake: false
       }))
       .then(stream => {
         var playback = new LocalMediaStreamPlayback(testVideo, stream);
         return playback.playMediaWithDeprecatedStreamStop(false);
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -462,17 +462,17 @@ pref("media.peerconnection.video.enabled
 pref("media.navigator.video.max_fs", 12288); // Enough for 2048x1536
 pref("media.navigator.video.max_fr", 60);
 pref("media.navigator.video.h264.level", 31); // 0x42E01f - level 3.1
 pref("media.navigator.video.h264.max_br", 0);
 pref("media.navigator.video.h264.max_mbps", 0);
 pref("media.peerconnection.video.h264_enabled", false);
 pref("media.peerconnection.video.vp9_enabled", true);
 pref("media.getusermedia.aec", 1);
-pref("media.getusermedia.browser.enabled", true);
+pref("media.getusermedia.browser.enabled", false);
 #endif
 // Gonk typically captures at QVGA, and so min resolution is QQVGA or
 // 160x120; 100Kbps is plenty for that.
 // Desktop is typically VGA capture or more; and qm_select will not drop resolution
 // below 1/2 in each dimension (or so), so QVGA (320x200) is the lowest here usually.
 pref("media.peerconnection.video.min_bitrate", 0);
 pref("media.peerconnection.video.start_bitrate", 0);
 pref("media.peerconnection.video.max_bitrate", 0);