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

Unified Diff: net/base/mime_util.cc

Issue 506283002: Mark android supports H264 main/high profile (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/mime_util.cc
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
index 29264b8b076ee1b0b6b7827c4b830d4053cb573e..810a57084d3303f34b3b8e996b24e6ffd87e062d 100644
--- a/net/base/mime_util.cc
+++ b/net/base/mime_util.cc
@@ -472,6 +472,10 @@ static bool IsCodecSupportedOnAndroid(MimeUtil::Codec codec) {
case MimeUtil::MPEG4_AAC_LC:
case MimeUtil::MPEG4_AAC_SBRv1:
case MimeUtil::H264_BASELINE:
+ // Most OEMs have their own codecs that supports H.264 main and high
acolwell GONE FROM CHROMIUM 2014/08/26 22:38:50 nit: Comment probably not necessary since we don't
qinmin 2014/08/27 00:26:41 Done.
+ // profile.
+ case MimeUtil::H264_MAIN:
+ case MimeUtil::H264_HIGH:
case MimeUtil::VP8:
case MimeUtil::VORBIS:
return true;
@@ -482,11 +486,6 @@ static bool IsCodecSupportedOnAndroid(MimeUtil::Codec codec) {
// MPEG-2 variants of AAC are not supported on Android.
return false;
- case MimeUtil::H264_MAIN:
- case MimeUtil::H264_HIGH:
- // H.264 Main and High profiles are not supported on Android.
- return false;
-
case MimeUtil::VP9:
// VP9 is supported only in KitKat+ (API Level 19).
return base::android::BuildInfo::GetInstance()->sdk_int() >= 19;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698