Bug 1061131 - Disable MSE/WebM on Firefox OS; r=cajbir; a=philor
authorAnthony Jones <ajones@mozilla.com>
Tue, 02 Sep 2014 13:43:03 +1200
changeset 224555 d59d58d42f40d32f597e9974dae81d123eb36224
parent 224554 b9e3a9f5d04a122c0f0ae3d7f43a75452d1e4782
child 224556 5b992c20ee1690e5c56be93d7a745c5191c1f3f5
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscajbir, philor
bugs1061131
milestone34.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 1061131 - Disable MSE/WebM on Firefox OS; r=cajbir; a=philor
content/media/mediasource/MediaSource.cpp
--- a/content/media/mediasource/MediaSource.cpp
+++ b/content/media/mediasource/MediaSource.cpp
@@ -58,24 +58,29 @@ PRLogModuleInfo* GetMediaSourceAPILog()
 #endif
 
 // Arbitrary limit.
 static const unsigned int MAX_SOURCE_BUFFERS = 16;
 
 namespace mozilla {
 
 static const char* const gMediaSourceTypes[6] = {
+// XXX: Disabled other temporarily on desktop to allow WebM testing.  For now,
+// set the developer-only media.mediasource.ignore_codecs pref to true to test
+// other codecs, and expect things to be broken.
+//
+// Disabled WebM in favour of MP4 on Firefox OS.
+#ifdef MOZ_GONK_MEDIACODEC
+  "video/mp4",
+  "audio/mp4",
+#else
   "video/webm",
   "audio/webm",
-// XXX: Disabled other codecs temporarily to allow WebM testing.  For now, set
-// the developer-only media.mediasource.ignore_codecs pref to true to test other
-// codecs, and expect things to be broken.
+#endif
 #if 0
-  "video/mp4",
-  "audio/mp4",
   "audio/mpeg",
 #endif
   nullptr
 };
 
 static nsresult
 IsTypeSupported(const nsAString& aType)
 {