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

Commit ea10c83c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix Integer overflow in estimateCuesSize" into main am: 965655e0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3181721



Change-Id: I266b96e57bdb8b6c828da191bcd0e262ab960b76
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 76e4d181 965655e0

media/libstagefright/webm/WebmWriter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ uint64_t WebmWriter::estimateCuesSize(int32_t bitRate) { 
    // Max file duration limit is set

    if (mMaxFileDurationLimitUs != 0) {

        if (bitRate > 0) {

            int64_t size2 = ((mMaxFileDurationLimitUs * bitRate * 6) / 1000 / 8000000);

            int64_t size2 = ((mMaxFileDurationLimitUs / 1000) * bitRate * 6) / 8000000;

            if (mMaxFileSizeLimitBytes != 0 && mIsFileSizeLimitExplicitlyRequested) {

                // When both file size and duration limits are set,

                // we use the smaller limit of the two.