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

Commit 5bd99f92 authored by Lajos Molnar's avatar Lajos Molnar
Browse files

stagefright: handle NULL format after convertMetaDataToMessage 

Bug: 30421366
Change-Id: I411f9f22b39943f7c8fa4e22fc37efe5f9e0ccb5
parent eb2c7c37

media/libmediaplayerservice/nuplayer/StreamingSource.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -229,7 +229,8 @@ sp<AMessage> NuPlayer::StreamingSource::getFormat(bool audio) { 




    sp<MetaData> meta = source->getFormat();

    sp<MetaData> meta = source->getFormat();

    status_t err = convertMetaDataToMessage(meta, &format);

    status_t err = convertMetaDataToMessage(meta, &format);

    if (err != OK) {

    if (err != OK) { // format may have been cleared on error

        format = new AMessage;

        format->setInt32("err", err);

        format->setInt32("err", err);

    }

    }

    return format;

    return format;

media/libstagefright/SimpleDecodingSource.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,9 @@ sp<SimpleDecodingSource> SimpleDecodingSource::Create( 
    CHECK(meta->findCString(kKeyMIMEType, &mime));

    CHECK(meta->findCString(kKeyMIMEType, &mime));





    sp<AMessage> format = new AMessage;

    sp<AMessage> format = new AMessage;

    convertMetaDataToMessage(source->getFormat(), &format);

    if (convertMetaDataToMessage(source->getFormat(), &format) != OK) {

        return NULL;

    }





    Vector<AString> matchingCodecs;

    Vector<AString> matchingCodecs;

    MediaCodecList::findMatchingCodecs(

    MediaCodecList::findMatchingCodecs(