diff options
| author | qinmin <qinmin@chromium.org> | 2014-08-28 09:17:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-28 16:18:24 +0000 |
| commit | d9b32ee803870c87f65351766e5a731f41172299 (patch) | |
| tree | 0a010d022e4ea5c32d30d6f667904b1c7c671c7e /net | |
| parent | 0f9a254ee1378da9707334fb858ffe642d1af878 (diff) | |
| download | chromium_src-d9b32ee803870c87f65351766e5a731f41172299.zip chromium_src-d9b32ee803870c87f65351766e5a731f41172299.tar.gz chromium_src-d9b32ee803870c87f65351766e5a731f41172299.tar.bz2 | |
Mark android supports H264 main/high profile
Most hardware OEMs provides codecs to support H264 main/high profile.
The current way of declaring them as unsupported is too restrictive.
BUG=407741
Review URL: https://codereview.chromium.org/506283002
Cr-Commit-Position: refs/heads/master@{#292395}
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/mime_util.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc index 5e77619..37e630f 100644 --- a/net/base/mime_util.cc +++ b/net/base/mime_util.cc @@ -477,6 +477,8 @@ static bool IsCodecSupportedOnAndroid(MimeUtil::Codec codec) { case MimeUtil::MPEG4_AAC_LC: case MimeUtil::MPEG4_AAC_SBRv1: case MimeUtil::H264_BASELINE: + case MimeUtil::H264_MAIN: + case MimeUtil::H264_HIGH: case MimeUtil::VP8: case MimeUtil::VORBIS: return true; @@ -487,11 +489,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; |