Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddde219f authored by Rachad's avatar Rachad Committed by Android (Google) Code Review
Browse files

Merge "Add HEVC decoder support to ACodec bug: 14571712"

parents b4db73d0 2472b1c0

include/media/stagefright/MediaDefs.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ extern const char *MEDIA_MIMETYPE_IMAGE_JPEG; 
extern const char *MEDIA_MIMETYPE_VIDEO_VP8;

extern const char *MEDIA_MIMETYPE_VIDEO_VP9;

extern const char *MEDIA_MIMETYPE_VIDEO_AVC;

extern const char *MEDIA_MIMETYPE_VIDEO_HEVC;

extern const char *MEDIA_MIMETYPE_VIDEO_MPEG4;

extern const char *MEDIA_MIMETYPE_VIDEO_H263;

extern const char *MEDIA_MIMETYPE_VIDEO_MPEG2;

media/libstagefright/ACodec.cpp

+3 −0
Original line number Diff line number Diff line
@@ -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 },

media/libstagefright/MediaDefs.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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";