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

Commit 9e1b2746 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "bug_204349132" am: dbb28516 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1877476

Change-Id: Id2a29cd8ce1f08e0ed50ec01bafca4641100aa0e
parents 3d679d88 dbb28516

media/libmediaplayerservice/StagefrightMetadataRetriever.cpp

+9 −0
Original line number Diff line number Diff line
@@ -231,6 +231,15 @@ sp<IMemory> StagefrightMetadataRetriever::getImageInternal( 
        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 */