Bug 1108059 - Enable mp4, not webm, for MediaSource on MacOS X. r=ajones, a=sledru
authorRalph Giles <giles@mozilla.com>
Fri, 05 Dec 2014 14:33:00 -0800
changeset 234347 0b60df2212abe0fdc75bbfbb3236da207d7728c1
parent 234346 fa86f0e36b598558a15299816400ccef1494f783
child 234348 034a07dd81f67adbcd8b188d27e9455c7223fc3e
push id7370
push userryanvm@gmail.com
push dateTue, 16 Dec 2014 15:08:14 +0000
treeherdermozilla-aurora@64c6aa56aa22 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersajones, sledru
bugs1108059
milestone36.0a2
Bug 1108059 - Enable mp4, not webm, for MediaSource on MacOS X. r=ajones, a=sledru This makes the setting the same as on Windows. This will reduce the amount of testing we get for WebM, since only Linux will be left with that enabled, but reduces the exposed code surface while we're trying to stabilize things enough to ship support.
modules/libpref/init/all.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -422,17 +422,17 @@ pref("media.mediasource.enabled", false)
 #else
 pref("media.mediasource.enabled", true);
 #endif
 
 #ifdef MOZ_WIDGET_GONK
 pref("media.mediasource.mp4.enabled", false);
 pref("media.mediasource.webm.enabled", false);
 #else
-#ifdef XP_WIN
+#if defined(XP_WIN) || defined(XP_MACOSX)
 pref("media.mediasource.mp4.enabled", true);
 pref("media.mediasource.webm.enabled", false);
 #else
 pref("media.mediasource.mp4.enabled", false);
 pref("media.mediasource.webm.enabled", true);
 #endif
 #endif