[M124 minibranch] Disable Builtin-HLS
Stable release of Builtin HLS exposed missing features around encrypted
content as well as livestreaming. This change disables the feature by
default.
(cherry picked from commit ad5561381a873b23655c848878d6cb2fd96ced45)
Bug: 336837266
Bug: b/337072556
Bug: 336930736
Change-Id: Ie2b964ad7e6b939fb6125c98df58ccd2c9444af2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5498101
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Commit-Queue: Ted (Chromium) Meyer <tmathmeyer@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1293991}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5500543
Reviewed-by: Krishna Govind <govind@chromium.org>
Owners-Override: Krishna Govind <govind@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/branch-heads/6367_54@{#3}
Cr-Branched-From: cd0e5b0bca78ffe85d566cf44bc06658cf8b42ac-refs/branch-heads/6367@{#791}
Cr-Branched-From: d158c6dc6e3604e6f899041972edf26087a49740-refs/heads/main@{#1274542}
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
index 92d68c8..0ed71c6 100644
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -1251,11 +1251,7 @@
#if BUILDFLAG(ENABLE_HLS_DEMUXER)
BASE_FEATURE(kBuiltInHlsPlayer,
"BuiltInHlsPlayer",
-#if BUILDFLAG(IS_ANDROID)
- base::FEATURE_ENABLED_BY_DEFAULT
-#else
base::FEATURE_DISABLED_BY_DEFAULT
-#endif
);
BASE_FEATURE(kBuiltInHlsMP4,
