Index: net/base/mime_util.cc |
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc |
index 0b42b85920239bded4ff775fa81c2544b8889d36..22570ed85dba0be69a04b564962c1c41e0596a10 100644 |
--- a/net/base/mime_util.cc |
+++ b/net/base/mime_util.cc |
@@ -45,6 +45,7 @@ class MimeUtil : public PlatformMimeUtil { |
H264_BASELINE, |
H264_MAIN, |
H264_HIGH, |
+ HEVC_MAIN, |
VP8, |
VP9, |
THEORA |
@@ -466,6 +467,15 @@ static bool IsCodecSupportedOnAndroid(MimeUtil::Codec codec) { |
case MimeUtil::VORBIS: |
return true; |
+ case MimeUtil::HEVC_MAIN: |
+#if defined(ENABLE_HEVC_DEMUXING) |
+ // HEVC/H.265 is supported only in Lollipop+ (API Level 21). According to |
+ // http://developer.android.com/reference/android/media/MediaFormat.html |
+ return base::android::BuildInfo::GetInstance()->sdk_int() >= 21; |
+#else |
+ return false; |
+#endif |
+ |
case MimeUtil::MPEG2_AAC_LC: |
case MimeUtil::MPEG2_AAC_MAIN: |
case MimeUtil::MPEG2_AAC_SSR: |
@@ -520,6 +530,11 @@ static const char kMP4VideoCodecsExpression[] = |
// kUnambiguousCodecStringMap/kAmbiguousCodecStringMap should be the only |
// mapping from strings to codecs. See crbug.com/461009. |
"avc1.42E00A,avc1.4D400A,avc1.64000A," |
+#if defined(ENABLE_HEVC_DEMUXING) |
+ // Any valid-looking HEVC string will work here, since these strings are |
+ // parsed and mapped to MimeUtil::Codec enum values. |
+ "hvc1.1.L0.0," |
+#endif |
"mp4a.66,mp4a.67,mp4a.68,mp4a.69,mp4a.6B,mp4a.40.2,mp4a.40.02,mp4a.40.5," |
"mp4a.40.05,mp4a.40.29"; |
@@ -1025,6 +1040,23 @@ static bool ParseH264CodecID(const std::string& codec_id, |
return true; |
} |
+#if defined(ENABLE_HEVC_DEMUXING) |
+static bool ParseHEVCCodecID(const std::string& codec_id, |
+ MimeUtil::Codec* codec, |
+ bool* is_ambiguous) { |
+ if (StartsWithASCII(codec_id, "hev1.", true) || |
+ StartsWithASCII(codec_id, "hvc1.", true)) { |
+ // TODO(servolk): Implement parsing of hevc codec ids as described in |
ddorwin
2015/03/25 18:02:58
Is there a bug for this?
servolk
2015/04/29 23:50:33
Created crbug.com/482761
|
+ // ETSI TS 126 244 standard section A.2.2, but for now allow any |
+ // HEVC tiers/profiles and let decoder decide if it can handle that. |
+ *codec = MimeUtil::HEVC_MAIN; |
+ *is_ambiguous = true; |
ddorwin
2015/03/25 18:02:58
IIRC, this will cause a DCHECK because of line 536
servolk
2015/04/29 23:50:33
Yep, that was causing dchecks, so I've changed is_
|
+ return true; |
+ } |
+ return false; |
ddorwin
2015/03/25 18:02:58
nit: empty line
servolk
2015/04/29 23:50:33
Done.
|
+} |
+#endif |
+ |
bool MimeUtil::StringToCodec(const std::string& codec_id, |
Codec* codec, |
bool* is_ambiguous) const { |
@@ -1037,8 +1069,15 @@ bool MimeUtil::StringToCodec(const std::string& codec_id, |
} |
// If |codec_id| is not in |string_to_codec_map_|, then we assume that it is |
- // an H.264 codec ID because currently those are the only ones that can't be |
- // stored in the |string_to_codec_map_| and require parsing. |
+ // either H.264 or HEVC/H.265 codec ID because currently those are the only |
+ // ones that are not added to the |string_to_codec_map_| and require parsing. |
+ |
+#if defined(ENABLE_HEVC_DEMUXING) |
+ if (ParseHEVCCodecID(codec_id, codec, is_ambiguous)) { |
+ return true; |
+ } |
+#endif |
+ |
return ParseH264CodecID(codec_id, codec, is_ambiguous); |
} |
@@ -1066,6 +1105,7 @@ bool MimeUtil::IsCodecProprietary(Codec codec) const { |
case H264_BASELINE: |
case H264_MAIN: |
case H264_HIGH: |
+ case HEVC_MAIN: |
return true; |
case PCM: |