| commit | ea10c83c7ea5bf073dfbdc8ee22fb5b75cdab043 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Jul 19 03:16:00 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 19 03:16:00 2024 +0000 |
| tree | abd687b66f3b9258374ffb87ab4976657f34cf17 | |
| parent | 76e4d181129eb6729f444bda6a6ae0390d82b234 [diff] | |
| parent | 965655e0db1e9735e20053a862f8ff071ac34eb7 [diff] |
Merge "Fix Integer overflow in estimateCuesSize" into main am: 965655e0db Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3181721 Change-Id: I266b96e57bdb8b6c828da191bcd0e262ab960b76 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/libstagefright/webm/WebmWriter.cpp b/media/libstagefright/webm/WebmWriter.cpp index ca862b0..151ce7c 100644 --- a/media/libstagefright/webm/WebmWriter.cpp +++ b/media/libstagefright/webm/WebmWriter.cpp
@@ -290,7 +290,7 @@ // 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.