Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(835)

Unified Diff: media/base/mime_util_internal.cc

Issue 1840173004: Flip unified media pipeline to default-on w/ disabled holdback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix outstanding failures. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/base/mime_util_internal.cc
diff --git a/media/base/mime_util_internal.cc b/media/base/mime_util_internal.cc
index e9b38f1191801c55e0e7d4e7092cfaf7a1c92140..c3ff89ce2971d939f3b8581d7d8793a184d5726b 100644
--- a/media/base/mime_util_internal.cc
+++ b/media/base/mime_util_internal.cc
@@ -457,8 +457,12 @@ bool MimeUtil::IsCodecSupportedOnPlatform(
case MPEG2_AAC:
// MPEG-2 variants of AAC are not supported on Android unless the unified
- // media pipeline can be used. These codecs will be decoded in software.
- // See https:crbug.com/544268 for details.
+ // media pipeline can be used and the container is not HLS. These codecs
+ // will be decoded in software. See https:crbug.com/544268 for details.
+ if (mime_type_lower_case == "application/x-mpegurl" ||
+ mime_type_lower_case == "application/vnd.apple.mpegurl") {
+ return false;
+ }
return !is_encrypted && platform_info.is_unified_media_pipeline_enabled;
case OPUS:

Powered by Google App Engine
This is Rietveld 408576698