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

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: Rebase. Comments. Fix UMA. 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
« no previous file with comments | « media/base/media_switches.cc ('k') | media/base/mime_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/mime_util_internal.cc
diff --git a/media/base/mime_util_internal.cc b/media/base/mime_util_internal.cc
index b2904e8764d39bbc885ffed536481feb6cd3b7da..c86dd6f2611925bd011961023840921416f54470 100644
--- a/media/base/mime_util_internal.cc
+++ b/media/base/mime_util_internal.cc
@@ -455,8 +455,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:
« no previous file with comments | « media/base/media_switches.cc ('k') | media/base/mime_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698