Index: media/base/android/media_codec_bridge.cc |
diff --git a/media/base/android/media_codec_bridge.cc b/media/base/android/media_codec_bridge.cc |
index 3d22752159a60e7355b9a765947a9f2a14359249..ce64894051950c5658f20f68f7698d0fbdb1afc2 100644 |
--- a/media/base/android/media_codec_bridge.cc |
+++ b/media/base/android/media_codec_bridge.cc |
@@ -52,6 +52,8 @@ static const std::string VideoCodecToAndroidMimeType(const VideoCodec& codec) { |
switch (codec) { |
case kCodecH264: |
return "video/avc"; |
+ case kCodecHEVC: |
+ return "video/hevc"; |
case kCodecVP8: |
return "video/x-vnd.on2.vp8"; |
case kCodecVP9: |
@@ -65,6 +67,8 @@ static const std::string CodecTypeToAndroidMimeType(const std::string& codec) { |
// TODO(xhwang): Shall we handle more detailed strings like "mp4a.40.2"? |
if (codec == "avc1") |
return "video/avc"; |
+ if (codec == "hvc1") |
+ return "video/hevc"; |
if (codec == "mp4a") |
return "audio/mp4a-latm"; |
if (codec == "vp8" || codec == "vp8.0") |
@@ -84,6 +88,8 @@ static const std::string AndroidMimeTypeToCodecType(const std::string& mime) { |
return "mp4v"; |
if (mime == "video/avc") |
return "avc1"; |
+ if (mime == "video/hevc") |
+ return "hvc1"; |
if (mime == "video/x-vnd.on2.vp8") |
return "vp8"; |
if (mime == "video/x-vnd.on2.vp9") |