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

Commit 3b6d6b1b authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "Adds VP9 decoding support for stagefright."

parents 01128a03 94705aff

cmds/stagefright/stagefright.cpp

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ static void dumpCodecProfiles(const sp<IOMX>& omx, bool queryDecoders) { 
        MEDIA_MIMETYPE_AUDIO_AMR_NB, MEDIA_MIMETYPE_AUDIO_AMR_WB,

        MEDIA_MIMETYPE_AUDIO_MPEG, MEDIA_MIMETYPE_AUDIO_G711_MLAW,

        MEDIA_MIMETYPE_AUDIO_G711_ALAW, MEDIA_MIMETYPE_AUDIO_VORBIS,

        MEDIA_MIMETYPE_VIDEO_VPX

        MEDIA_MIMETYPE_VIDEO_VP8, MEDIA_MIMETYPE_VIDEO_VP9

    };



    const char *codecType = queryDecoders? "decoder" : "encoder";

include/media/stagefright/MediaDefs.h

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ namespace android { 


extern const char *MEDIA_MIMETYPE_IMAGE_JPEG;



extern const char *MEDIA_MIMETYPE_VIDEO_VPX;

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_MPEG4;

extern const char *MEDIA_MIMETYPE_VIDEO_H263;

media/libstagefright/ACodec.cpp

+6 −3
Original line number Diff line number Diff line
@@ -949,8 +949,10 @@ status_t ACodec::setComponentRole( 
            "video_decoder.mpeg4", "video_encoder.mpeg4" },

        { MEDIA_MIMETYPE_VIDEO_H263,

            "video_decoder.h263", "video_encoder.h263" },

        { MEDIA_MIMETYPE_VIDEO_VPX,

            "video_decoder.vpx", "video_encoder.vpx" },

        { MEDIA_MIMETYPE_VIDEO_VP8,

            "video_decoder.vp8", "video_encoder.vp8" },

        { MEDIA_MIMETYPE_VIDEO_VP9,

            "video_decoder.vp9", "video_encoder.vp9" },

        { MEDIA_MIMETYPE_AUDIO_RAW,

            "audio_decoder.raw", "audio_encoder.raw" },

        { MEDIA_MIMETYPE_AUDIO_FLAC,
@@ -1632,7 +1634,8 @@ static const struct VideoCodingMapEntry { 
    { MEDIA_MIMETYPE_VIDEO_MPEG4, OMX_VIDEO_CodingMPEG4 },

    { MEDIA_MIMETYPE_VIDEO_H263, OMX_VIDEO_CodingH263 },

    { MEDIA_MIMETYPE_VIDEO_MPEG2, OMX_VIDEO_CodingMPEG2 },

    { MEDIA_MIMETYPE_VIDEO_VPX, OMX_VIDEO_CodingVPX },

    { MEDIA_MIMETYPE_VIDEO_VP8, OMX_VIDEO_CodingVP8 },

    { MEDIA_MIMETYPE_VIDEO_VP9, OMX_VIDEO_CodingVP9 },

};



static status_t GetVideoCodingTypeFromMime(

media/libstagefright/MediaDefs.cpp

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ namespace android { 


const char *MEDIA_MIMETYPE_IMAGE_JPEG = "image/jpeg";



const char *MEDIA_MIMETYPE_VIDEO_VPX = "video/x-vnd.on2.vp8";

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_MPEG4 = "video/mp4v-es";

const char *MEDIA_MIMETYPE_VIDEO_H263 = "video/3gpp";

media/libstagefright/OMXCodec.cpp

+8 −4
Original line number Diff line number Diff line
@@ -1195,8 +1195,10 @@ status_t OMXCodec::setVideoOutputFormat( 
        compressionFormat = OMX_VIDEO_CodingMPEG4;

    } else if (!strcasecmp(MEDIA_MIMETYPE_VIDEO_H263, mime)) {

        compressionFormat = OMX_VIDEO_CodingH263;

    } else if (!strcasecmp(MEDIA_MIMETYPE_VIDEO_VPX, mime)) {

        compressionFormat = OMX_VIDEO_CodingVPX;

    } else if (!strcasecmp(MEDIA_MIMETYPE_VIDEO_VP8, mime)) {

        compressionFormat = OMX_VIDEO_CodingVP8;

    } else if (!strcasecmp(MEDIA_MIMETYPE_VIDEO_VP9, mime)) {

        compressionFormat = OMX_VIDEO_CodingVP9;

    } else if (!strcasecmp(MEDIA_MIMETYPE_VIDEO_MPEG2, mime)) {

        compressionFormat = OMX_VIDEO_CodingMPEG2;

    } else {
@@ -1388,8 +1390,10 @@ void OMXCodec::setComponentRole( 
            "video_decoder.mpeg4", "video_encoder.mpeg4" },

        { MEDIA_MIMETYPE_VIDEO_H263,

            "video_decoder.h263", "video_encoder.h263" },

        { MEDIA_MIMETYPE_VIDEO_VPX,

            "video_decoder.vpx", "video_encoder.vpx" },

        { MEDIA_MIMETYPE_VIDEO_VP8,

            "video_decoder.vp8", "video_encoder.vp8" },

        { MEDIA_MIMETYPE_VIDEO_VP9,

            "video_decoder.vp9", "video_encoder.vp9" },

        { MEDIA_MIMETYPE_AUDIO_RAW,

            "audio_decoder.raw", "audio_encoder.raw" },

        { MEDIA_MIMETYPE_AUDIO_FLAC,