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

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

Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2... 

Merge "Fix integer overflow and divide-by-zero" into klp-dev am: b264ece2 am: bbca2719 am: c2e69851 am: 3285770d am: d935c7f1 am: 98ee832c am: 1db2ee3d am: 946a690f am: 5fef11c6 am: 3a3cc883 am: d218b519 am: 9305cf71
am: 7422dafe

Change-Id: I9981960bd9ddf47e41825de77bb0e4a7a0c29c37
parents a83fb599 7422dafe

media/libstagefright/AMRExtractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ status_t AMRSource::read( 


    int64_t seekTimeUs;

    ReadOptions::SeekMode mode;

    if (options && options->getSeekTo(&seekTimeUs, &mode)) {

    if (mOffsetTableLength > 0 && options && options->getSeekTo(&seekTimeUs, &mode)) {

        size_t size;

        int64_t seekFrame = seekTimeUs / 20000ll;  // 20ms per frame.

        mCurrentTimeUs = seekFrame * 20000ll;

media/libstagefright/NuMediaExtractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ bool NuMediaExtractor::getTotalBitrate(int64_t *bitrate) const { 
    }



    off64_t size;

    if (mDurationUs >= 0 && mDataSource->getSize(&size) == OK) {

    if (mDurationUs > 0 && mDataSource->getSize(&size) == OK) {

        *bitrate = size * 8000000ll / mDurationUs;  // in bits/sec

        return true;

    }