| commit | f8ab9cc189b8186c974604e2da9394321286c3e8 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Dec 13 07:01:50 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 13 07:01:50 2022 +0000 |
| tree | ef96281316a66a7370de62282b77ae28c87877fd | |
| parent | 4685821d1b2619b229c2a0eb1790df3862753216 [diff] | |
| parent | 4018c06edf8079d7c8b89def18b7d6ccd8ad718a [diff] |
Merge "Fix integer overflow in MPEG4Extractor" am: 80fe08ba70 am: e537579361 am: 4018c06edf Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2330395 Change-Id: Ia456b8c0c3916b6092c22f9b1c361021d9c09af4 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;