Bug 1187247: [MSE] P2. Enable WebM in MediaSource. r=jya
authorJan Gerber <j@mailb.org>
Tue, 21 Jul 2015 12:54:50 +0200
changeset 255716 15ef1802114fd28a312362ef43a6bb50111e816c
parent 255715 37ce03221f95f5f147ae1daae7dbf604565bd702
child 255717 a4f7a655c74a5342146dd02aa042a8a1b8c16c6f
push id63123
push userjyavenard@mozilla.com
push dateFri, 31 Jul 2015 22:35:45 +0000
treeherdermozilla-inbound@15ef1802114f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjya
bugs1187247
milestone42.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 1187247: [MSE] P2. Enable WebM in MediaSource. r=jya
dom/media/mediasource/MediaSource.cpp
--- a/dom/media/mediasource/MediaSource.cpp
+++ b/dom/media/mediasource/MediaSource.cpp
@@ -94,18 +94,17 @@ IsTypeSupported(const nsAString& aType)
         }
         if (hasCodecs &&
             DecoderTraits::CanHandleCodecsType(mimeTypeUTF8.get(),
                                                codecs) == CANPLAY_NO) {
           return NS_ERROR_DOM_INVALID_STATE_ERR;
         }
         return NS_OK;
       } else if (DecoderTraits::IsWebMType(mimeTypeUTF8)) {
-        if (!Preferences::GetBool("media.mediasource.webm.enabled", false) ||
-            Preferences::GetBool("media.mediasource.format-reader", false)) {
+        if (!Preferences::GetBool("media.mediasource.webm.enabled", false)) {
           return NS_ERROR_DOM_NOT_SUPPORTED_ERR;
         }
         if (hasCodecs &&
             DecoderTraits::CanHandleCodecsType(mimeTypeUTF8.get(),
                                                codecs) == CANPLAY_NO) {
           return NS_ERROR_DOM_INVALID_STATE_ERR;
         }
         return NS_OK;