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

Commit feb40604 authored by Chong Zhang's avatar Chong Zhang
Browse files

Expose video codec type in MediaMetadataRetriever 

bug: 163086057
test: android.media.cts.MediaMetadataRetriever

Change-Id: Iac752e63ae582db1771c7a85b318675d44b8ab0b
parent 358a0844

media/libmedia/include/media/mediametadataretriever.h

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ enum { 
    METADATA_KEY_COLOR_RANGE     = 37,

    METADATA_KEY_SAMPLERATE      = 38,

    METADATA_KEY_BITS_PER_SAMPLE = 39,

    METADATA_KEY_VIDEO_CODEC_MIME_TYPE = 40,



    // Add more here...

};

media/libmediaplayerservice/StagefrightMetadataRetriever.cpp

+4 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ void StagefrightMetadataRetriever::parseMetaData() { 


    // The overall duration is the duration of the longest track.

    int64_t maxDurationUs = 0;

    String8 timedTextLang;

    String8 timedTextLang, videoMime;

    for (size_t i = 0; i < numTracks; ++i) {

        sp<MetaData> trackMeta = mExtractor->getTrackMetaData(i);

        if (!trackMeta) {
@@ -575,6 +575,7 @@ void StagefrightMetadataRetriever::parseMetaData() { 
                }

            } else if (!hasVideo && !strncasecmp("video/", mime, 6)) {

                hasVideo = true;

                videoMime = String8(mime);



                CHECK(trackMeta->findInt32(kKeyWidth, &videoWidth));

                CHECK(trackMeta->findInt32(kKeyHeight, &videoHeight));
@@ -637,6 +638,8 @@ void StagefrightMetadataRetriever::parseMetaData() { 
        sprintf(tmp, "%d", rotationAngle);

        mMetaData.add(METADATA_KEY_VIDEO_ROTATION, String8(tmp));



        mMetaData.add(METADATA_KEY_VIDEO_CODEC_MIME_TYPE, videoMime);



        if (videoFrameCount > 0) {

            sprintf(tmp, "%d", videoFrameCount);

            mMetaData.add(METADATA_KEY_VIDEO_FRAME_COUNT, String8(tmp));