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

Commit 7a0c1949 authored by Wei Jia's avatar Wei Jia Committed by Android Git Automerger
Browse files

am cc1a4208: am 3662ca10: Merge "StagefrightMetadataRetriever: handle error... 

am cc1a4208: am 3662ca10: Merge "StagefrightMetadataRetriever: handle error returned from convertMetaDataToMessage()." into mnc-dev

* commit 'cc1a4208':
  StagefrightMetadataRetriever: handle error returned from convertMetaDataToMessage().
parents 8433b0c5 cc1a4208

media/libstagefright/StagefrightMetadataRetriever.cpp

+4 −1
Original line number Diff line number Diff line
@@ -146,7 +146,10 @@ static VideoFrame *extractVideoFrame( 
    sp<MetaData> format = source->getFormat();



    sp<AMessage> videoFormat;

    convertMetaDataToMessage(trackMeta, &videoFormat);

    if (convertMetaDataToMessage(trackMeta, &videoFormat) != OK) {

        ALOGW("Failed to convert meta data to message");

        return NULL;

    }



    // TODO: Use Flexible color instead

    videoFormat->setInt32("color-format", OMX_COLOR_FormatYUV420Planar);