Bug 1350246 - [Part4] Add a feature preference for HLS, default on for Fennec. draft
authorJames Cheng <jacheng@mozilla.com>
Fri, 05 May 2017 15:57:22 +0800
changeset 592556 3b8ce8f1996ac4195c400ea02d671fa482b39180
parent 592555 2e4304f84cdf4257cac60921b0a3b679b9e832b7
child 592557 a2e46ed434e90ffc3f41eb907cd5283684cf1483
push id63431
push userbmo:jacheng@mozilla.com
push dateMon, 12 Jun 2017 12:38:14 +0000
bugs1350246
milestone55.0a1
Bug 1350246 - [Part4] Add a feature preference for HLS, default on for Fennec. MozReview-Commit-ID: AlfMLzGmU5K
dom/media/MediaPrefs.h
mobile/android/app/mobile.js
--- a/dom/media/MediaPrefs.h
+++ b/dom/media/MediaPrefs.h
@@ -178,16 +178,19 @@ private:
 #endif
 
   // Ogg
   DECL_MEDIA_PREF("media.ogg.enabled",                        OggEnabled, bool, true);
   // Flac
   DECL_MEDIA_PREF("media.ogg.flac.enabled",                   FlacInOgg, bool, false);
   DECL_MEDIA_PREF("media.flac.enabled",                       FlacEnabled, bool, true);
 
+  // Hls
+  DECL_MEDIA_PREF("media.hls.enabled",                        HLSEnabled, bool, false);
+
 #if !defined(RELEASE_OR_BETA)
   DECL_MEDIA_PREF("media.rust.test_mode",                     RustTestMode, bool, false);
 #endif
 
 #if defined(MOZ_WIDGET_GTK)
   DECL_MEDIA_PREF("media.rust.mp4parser",                     EnableRustMP4Parser, bool, true);
 #else
   DECL_MEDIA_PREF("media.rust.mp4parser",                     EnableRustMP4Parser, bool, false);
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -626,16 +626,20 @@ pref("media.mediasource.enabled", true);
 
 pref("media.mediadrm-widevinecdm.visible", true);
 
 #ifdef NIGHTLY_BUILD
 // Enable EME (Encrypted Media Extensions)
 pref("media.eme.enabled", true);
 #endif
 
+#ifdef NIGHTLY_BUILD
+pref("media.hls.enabled", true);
+#endif
+
 // optimize images memory usage
 pref("image.downscale-during-decode.enabled", true);
 
 pref("browser.safebrowsing.downloads.enabled", false);
 
 pref("browser.safebrowsing.id", @MOZ_APP_UA_NAME@);
 
 // True if this is the first time we are showing about:firstrun