| commit | e537579361e1ac7318e45c7b429babdd26299aa6 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Dec 13 05:49:57 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 13 05:49:57 2022 +0000 |
| tree | 3b6a1d1de997a458d67b48ef80ef384be8b18476 | |
| parent | 949540c63c079238e6dcf62a09cecd34d442ef4e [diff] | |
| parent | 80fe08ba70741191cb1928e2458931b670284c9e [diff] |
Merge "Fix integer overflow in MPEG4Extractor" am: 80fe08ba70 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2330395 Change-Id: Ib8a213083e355bd4b2243c6e54193be5f845133d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/module/extractors/mp4/MPEG4Extractor.cpp b/media/module/extractors/mp4/MPEG4Extractor.cpp index 2e889e3..8f8fc1b 100644 --- a/media/module/extractors/mp4/MPEG4Extractor.cpp +++ b/media/module/extractors/mp4/MPEG4Extractor.cpp
@@ -6723,7 +6723,7 @@ const Sample *smpl = &mCurrentSamples[mCurrentSampleIndex]; offset = smpl->offset; size = smpl->size; - cts = mCurrentTime + smpl->compositionOffset; + cts = (int64_t)mCurrentTime + (int64_t)smpl->compositionOffset; if (mElstInitialEmptyEditTicks > 0) { cts += mElstInitialEmptyEditTicks;