Bug 979716: fix mistake in Aurora uplift merge for AEC setting r=slee a=lmandel
authorRandell Jesup <rjesup@jesup.org>
Fri, 04 Jul 2014 13:28:38 -0400
changeset 207664 80e9afb69bade25e7f3c2bb834d0b298591a1aa6
parent 207663 869ae8eb4b0f7d770ae1ae736c0b04dca05212f6
child 207665 d18987ef2fe8c70a8560a6fd7f30359622c66bbd
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersslee, lmandel
bugs979716
milestone32.0a2
Bug 979716: fix mistake in Aurora uplift merge for AEC setting r=slee a=lmandel Uplifting under existing a= since it we uplifted the wrong (old) patch
modules/libpref/src/init/all.js
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -267,25 +267,25 @@ pref("media.webrtc.debug.aec_dump_max_si
 #ifdef MOZ_WIDGET_GONK
 pref("media.navigator.video.default_width",320);
 pref("media.navigator.video.default_height",240);
 pref("media.peerconnection.enabled", true);
 pref("media.peerconnection.video.enabled", true);
 pref("media.navigator.video.max_fs", 1200); // 640x480 == 1200mb
 pref("media.navigator.video.max_fr", 30);
 pref("media.peerconnection.video.h264_enabled", false);
-pref("media.peerconnection.aec", 4);
+pref("media.getusermedia.aec", 4);
 #else
 pref("media.navigator.video.default_width",0);  // adaptive default
 pref("media.navigator.video.default_height",0); // adaptive default
 pref("media.peerconnection.enabled", true);
 pref("media.peerconnection.video.enabled", true);
 pref("media.navigator.video.max_fs", 0); // unrestricted
 pref("media.navigator.video.max_fr", 0); // unrestricted
-pref("media.peerconnection.aec", 1);
+pref("media.getusermedia.aec", 1);
 #endif
 pref("media.peerconnection.video.min_bitrate", 200);
 pref("media.peerconnection.video.start_bitrate", 300);
 pref("media.peerconnection.video.max_bitrate", 2000);
 pref("media.navigator.permission.disabled", false);
 pref("media.peerconnection.default_iceservers", "[{\"url\": \"stun:stun.services.mozilla.com\"}]");
 pref("media.peerconnection.trickle_ice", true);
 pref("media.peerconnection.use_document_iceservers", true);