summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorRachad <rachad@google.com>2014-05-19 23:00:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-19 23:00:04 +0000
commitddde219f2f93c1d81ff1cfaf4d3d31d95156f7a3 (patch)
tree6ec4126a46e409b1163a57be9071af764ec98687 /media
parentb4db73d022f3de3530bc2b3c9c831ccfdd1a2ead (diff)
parent2472b1c0d63454e5d90a982bd6c555de6c3127bd (diff)
downloadframeworks_av-ddde219f2f93c1d81ff1cfaf4d3d31d95156f7a3.zip
frameworks_av-ddde219f2f93c1d81ff1cfaf4d3d31d95156f7a3.tar.gz
frameworks_av-ddde219f2f93c1d81ff1cfaf4d3d31d95156f7a3.tar.bz2
Merge "Add HEVC decoder support to ACodec bug: 14571712"
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/ACodec.cpp3
-rw-r--r--media/libstagefright/MediaDefs.cpp1
2 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index 2e8e412..8f154be 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -990,6 +990,8 @@ status_t ACodec::setComponentRole(
"audio_decoder.g711alaw", "audio_encoder.g711alaw" },
{ MEDIA_MIMETYPE_VIDEO_AVC,
"video_decoder.avc", "video_encoder.avc" },
+ { MEDIA_MIMETYPE_VIDEO_HEVC,
+ "video_decoder.hevc", "video_encoder.hevc" },
{ MEDIA_MIMETYPE_VIDEO_MPEG4,
"video_decoder.mpeg4", "video_encoder.mpeg4" },
{ MEDIA_MIMETYPE_VIDEO_H263,
@@ -1811,6 +1813,7 @@ static const struct VideoCodingMapEntry {
OMX_VIDEO_CODINGTYPE mVideoCodingType;
} kVideoCodingMapEntry[] = {
{ MEDIA_MIMETYPE_VIDEO_AVC, OMX_VIDEO_CodingAVC },
+ { MEDIA_MIMETYPE_VIDEO_HEVC, OMX_VIDEO_CodingHEVC },
{ MEDIA_MIMETYPE_VIDEO_MPEG4, OMX_VIDEO_CodingMPEG4 },
{ MEDIA_MIMETYPE_VIDEO_H263, OMX_VIDEO_CodingH263 },
{ MEDIA_MIMETYPE_VIDEO_MPEG2, OMX_VIDEO_CodingMPEG2 },
diff --git a/media/libstagefright/MediaDefs.cpp b/media/libstagefright/MediaDefs.cpp
index c670bb4..8229e55 100644
--- a/media/libstagefright/MediaDefs.cpp
+++ b/media/libstagefright/MediaDefs.cpp
@@ -23,6 +23,7 @@ const char *MEDIA_MIMETYPE_IMAGE_JPEG = "image/jpeg";
const char *MEDIA_MIMETYPE_VIDEO_VP8 = "video/x-vnd.on2.vp8";
const char *MEDIA_MIMETYPE_VIDEO_VP9 = "video/x-vnd.on2.vp9";
const char *MEDIA_MIMETYPE_VIDEO_AVC = "video/avc";
+const char *MEDIA_MIMETYPE_VIDEO_HEVC = "video/hevc";
const char *MEDIA_MIMETYPE_VIDEO_MPEG4 = "video/mp4v-es";
const char *MEDIA_MIMETYPE_VIDEO_H263 = "video/3gpp";
const char *MEDIA_MIMETYPE_VIDEO_MPEG2 = "video/mpeg2";