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

Commit c280a25f authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "StagefrightMetadataRetriever: handle mSource being NULL" into nyc-dev

parents f0003e3d 665df6f7

media/libstagefright/StagefrightMetadataRetriever.cpp

+4 −2
Original line number Diff line number Diff line
@@ -61,8 +61,10 @@ StagefrightMetadataRetriever::StagefrightMetadataRetriever() 
StagefrightMetadataRetriever::~StagefrightMetadataRetriever() {

    ALOGV("~StagefrightMetadataRetriever()");

    clearMetadata();

    if (mSource != NULL) {

        mSource->close();

    }

}



status_t StagefrightMetadataRetriever::setDataSource(

        const sp<IMediaHTTPService> &httpService,
@@ -704,7 +706,7 @@ void StagefrightMetadataRetriever::parseMetaData() { 
        mMetaData.add(METADATA_KEY_BITRATE, String8(tmp));

    } else {

        off64_t sourceSize;

        if (mSource->getSize(&sourceSize) == OK) {

        if (mSource != NULL && mSource->getSize(&sourceSize) == OK) {

            int64_t avgBitRate = (int64_t)(sourceSize * 8E6 / maxDurationUs);



            sprintf(tmp, "%" PRId64, avgBitRate);