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

Commit 64cb1ba9 authored by Ronghua Wu's avatar Ronghua Wu Committed by Android (Google) Code Review
Browse files

Merge "libstagefright: Add MEDIA_MIMETYPE_VIDEO_DOLBY_VISION."

parents 0c353b58 a29c2b20

cmds/stagefright/stagefright.cpp

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

        MEDIA_MIMETYPE_AUDIO_AMR_NB, MEDIA_MIMETYPE_AUDIO_AMR_WB,

        MEDIA_MIMETYPE_AUDIO_MPEG, MEDIA_MIMETYPE_AUDIO_G711_MLAW,

        MEDIA_MIMETYPE_AUDIO_MPEG, MEDIA_MIMETYPE_AUDIO_G711_MLAW,

        MEDIA_MIMETYPE_AUDIO_G711_ALAW, MEDIA_MIMETYPE_AUDIO_VORBIS,

        MEDIA_MIMETYPE_AUDIO_G711_ALAW, MEDIA_MIMETYPE_AUDIO_VORBIS,

        MEDIA_MIMETYPE_VIDEO_VP8, MEDIA_MIMETYPE_VIDEO_VP9

        MEDIA_MIMETYPE_VIDEO_VP8, MEDIA_MIMETYPE_VIDEO_VP9,

        MEDIA_MIMETYPE_VIDEO_DOLBY_VISION

    };

    };





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

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

include/media/stagefright/MediaDefs.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ extern const char *MEDIA_MIMETYPE_VIDEO_MPEG4; 
extern const char *MEDIA_MIMETYPE_VIDEO_H263;

extern const char *MEDIA_MIMETYPE_VIDEO_H263;

extern const char *MEDIA_MIMETYPE_VIDEO_MPEG2;

extern const char *MEDIA_MIMETYPE_VIDEO_MPEG2;

extern const char *MEDIA_MIMETYPE_VIDEO_RAW;

extern const char *MEDIA_MIMETYPE_VIDEO_RAW;

extern const char *MEDIA_MIMETYPE_VIDEO_DOLBY_VISION;





extern const char *MEDIA_MIMETYPE_AUDIO_AMR_NB;

extern const char *MEDIA_MIMETYPE_AUDIO_AMR_NB;

extern const char *MEDIA_MIMETYPE_AUDIO_AMR_WB;

extern const char *MEDIA_MIMETYPE_AUDIO_AMR_WB;

media/libstagefright/ACodec.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -1570,6 +1570,8 @@ status_t ACodec::setComponentRole( 
            "video_decoder.vp9", "video_encoder.vp9" },

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

        { MEDIA_MIMETYPE_AUDIO_RAW,

        { MEDIA_MIMETYPE_AUDIO_RAW,

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

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

        { MEDIA_MIMETYPE_VIDEO_DOLBY_VISION,

            "video_decoder.dolby-vision", "video_encoder.dolby-vision" },

        { MEDIA_MIMETYPE_AUDIO_FLAC,

        { MEDIA_MIMETYPE_AUDIO_FLAC,

            "audio_decoder.flac", "audio_encoder.flac" },

            "audio_decoder.flac", "audio_encoder.flac" },

        { MEDIA_MIMETYPE_AUDIO_MSGSM,

        { MEDIA_MIMETYPE_AUDIO_MSGSM,
@@ -2845,6 +2847,7 @@ static const struct VideoCodingMapEntry { 
    { MEDIA_MIMETYPE_VIDEO_MPEG2, OMX_VIDEO_CodingMPEG2 },

    { MEDIA_MIMETYPE_VIDEO_MPEG2, OMX_VIDEO_CodingMPEG2 },

    { MEDIA_MIMETYPE_VIDEO_VP8, OMX_VIDEO_CodingVP8 },

    { MEDIA_MIMETYPE_VIDEO_VP8, OMX_VIDEO_CodingVP8 },

    { MEDIA_MIMETYPE_VIDEO_VP9, OMX_VIDEO_CodingVP9 },

    { MEDIA_MIMETYPE_VIDEO_VP9, OMX_VIDEO_CodingVP9 },

    { MEDIA_MIMETYPE_VIDEO_DOLBY_VISION, OMX_VIDEO_CodingDolbyVision },

};

};





static status_t GetVideoCodingTypeFromMime(

static status_t GetVideoCodingTypeFromMime(

media/libstagefright/MediaDefs.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ const char *MEDIA_MIMETYPE_VIDEO_MPEG4 = "video/mp4v-es"; 
const char *MEDIA_MIMETYPE_VIDEO_H263 = "video/3gpp";

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

const char *MEDIA_MIMETYPE_VIDEO_MPEG2 = "video/mpeg2";

const char *MEDIA_MIMETYPE_VIDEO_MPEG2 = "video/mpeg2";

const char *MEDIA_MIMETYPE_VIDEO_RAW = "video/raw";

const char *MEDIA_MIMETYPE_VIDEO_RAW = "video/raw";

const char *MEDIA_MIMETYPE_VIDEO_DOLBY_VISION = "video/dolby-vision";





const char *MEDIA_MIMETYPE_AUDIO_AMR_NB = "audio/3gpp";

const char *MEDIA_MIMETYPE_AUDIO_AMR_NB = "audio/3gpp";

const char *MEDIA_MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb";

const char *MEDIA_MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb";

media/libstagefright/OMXCodec.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -1307,6 +1307,8 @@ status_t OMXCodec::setVideoOutputFormat( 
        compressionFormat = OMX_VIDEO_CodingVP9;

        compressionFormat = OMX_VIDEO_CodingVP9;

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

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

        compressionFormat = OMX_VIDEO_CodingMPEG2;

        compressionFormat = OMX_VIDEO_CodingMPEG2;

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

        compressionFormat = OMX_VIDEO_CodingDolbyVision;

    } else {

    } else {

        ALOGE("Not a supported video mime type: %s", mime);

        ALOGE("Not a supported video mime type: %s", mime);

        CHECK(!"Should not be here. Not a supported video mime type.");

        CHECK(!"Should not be here. Not a supported video mime type.");
@@ -1505,6 +1507,8 @@ void OMXCodec::setComponentRole( 
            "video_decoder.vp9", "video_encoder.vp9" },

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

        { MEDIA_MIMETYPE_AUDIO_RAW,

        { MEDIA_MIMETYPE_AUDIO_RAW,

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

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

        { MEDIA_MIMETYPE_VIDEO_DOLBY_VISION,

            "video_decoder.dolby-vision", "video_encoder.dolby-vision" },

        { MEDIA_MIMETYPE_AUDIO_FLAC,

        { MEDIA_MIMETYPE_AUDIO_FLAC,

            "audio_decoder.flac", "audio_encoder.flac" },

            "audio_decoder.flac", "audio_encoder.flac" },

        { MEDIA_MIMETYPE_AUDIO_MSGSM,

        { MEDIA_MIMETYPE_AUDIO_MSGSM,