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

Commit dbb28516 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "bug_204349132" 

* changes:
  media: check decoder support for thumbnail dimensions
  Add for Dolby thumbnail
parents 52f47542 a4b02cd8

media/libmediaplayerservice/StagefrightMetadataRetriever.cpp

+23 −0
Original line number Diff line number Diff line
@@ -225,10 +225,26 @@ sp<IMemory> StagefrightMetadataRetriever::getImageInternal( 
            "media.stagefright.thumbnail.prefer_hw_codecs", false);

    uint32_t flags = preferhw ? 0 : MediaCodecList::kPreferSoftwareCodecs;

    Vector<AString> matchingCodecs;

    sp<AMessage> format = new AMessage;

    status_t err = convertMetaDataToMessage(trackMeta, &format);

    if (err != OK) {

        format = NULL;

    }



    // If decoding thumbnail check decoder supports thumbnail dimensions instead

    int32_t thumbHeight, thumbWidth;

    if (thumbnail && format != NULL

            && trackMeta->findInt32(kKeyThumbnailHeight, &thumbHeight)

            && trackMeta->findInt32(kKeyThumbnailWidth, &thumbWidth)) {

        format->setInt32("height", thumbHeight);

        format->setInt32("width", thumbWidth);

    }



    MediaCodecList::findMatchingCodecs(

            mime,

            false, /* encoder */

            flags,

            format,

            &matchingCodecs);



    for (size_t i = 0; i < matchingCodecs.size(); ++i) {
@@ -348,11 +364,18 @@ sp<IMemory> StagefrightMetadataRetriever::getFrameInternal( 
    bool preferhw = property_get_bool(

            "media.stagefright.thumbnail.prefer_hw_codecs", false);

    uint32_t flags = preferhw ? 0 : MediaCodecList::kPreferSoftwareCodecs;

    sp<AMessage> format = new AMessage;

    status_t err = convertMetaDataToMessage(trackMeta, &format);

    if (err != OK) {

        format = NULL;

    }



    Vector<AString> matchingCodecs;

    MediaCodecList::findMatchingCodecs(

            mime,

            false, /* encoder */

            flags,

            format,

            &matchingCodecs);



    for (size_t i = 0; i < matchingCodecs.size(); ++i) {

media/libstagefright/MediaCodecList.cpp

+23 −0
Original line number Diff line number Diff line
@@ -509,6 +509,29 @@ bool MediaCodecList::codecHandlesFormat(const char *mime, sp<MediaCodecInfo> inf 
                }

            }

        }



        int32_t profile = -1;

        if (format->findInt32("profile", &profile)) {

            int32_t level = -1;

            format->findInt32("level", &level);

            Vector<MediaCodecInfo::ProfileLevel> profileLevels;

            capabilities->getSupportedProfileLevels(&profileLevels);

            auto it = profileLevels.begin();

            for (; it != profileLevels.end(); ++it) {

                if (profile != it->mProfile) {

                    continue;

                }

                if (level > -1 && level > it->mLevel) {

                    continue;

                }

                break;

            }



            if (it == profileLevels.end()) {

                ALOGV("Codec does not support profile %d with level %d", profile, level);

                return false;

            }

        }

    }



    // haven't found a reason to discard this one