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

Commit a2e99a3d authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Fix issues with metadata handling when format change happens" am: 92047ec3 am: d41a64c7 

am: 2a02f18c

Change-Id: Ia945c856b0b805111ebcb5a93908934ddaa78db1
parents dd5ff666 2a02f18c

media/libmediaplayerservice/nuplayer/StreamingSource.cpp

+4 −0
Original line number Diff line number Diff line
@@ -228,6 +228,10 @@ sp<AMessage> NuPlayer::StreamingSource::getFormat(bool audio) { 
    }



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

    if (meta == NULL) {

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

        return format;

    }

    status_t err = convertMetaDataToMessage(meta, &format);

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

        format = new AMessage;