| commit | 2b5c92d01b085938e94b3fc958ef0608976b95e8 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Nov 22 18:26:56 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 22 18:26:56 2023 +0000 |
| tree | c6de0d2512603b0d172b05b47c843e3a0319d25c | |
| parent | 22e1dee04456caec5c920629828e8d25f73ee51c [diff] | |
| parent | 2ee12a3681f020b6d78578b245b8f8a1370bd4a9 [diff] |
Merge "Restrict unsigned integer overflow in MPEG4Writer writeEdtsBox" into main am: dc2c40ba83 am: 79b888f430 am: 2ee12a3681 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2822051 Change-Id: I4d9b7edef42123906a05d5da76222a2f01a90f80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/libstagefright/include/media/stagefright/MPEG4Writer.h b/media/libstagefright/include/media/stagefright/MPEG4Writer.h index 054a4b8..18237e5 100644 --- a/media/libstagefright/include/media/stagefright/MPEG4Writer.h +++ b/media/libstagefright/include/media/stagefright/MPEG4Writer.h
@@ -77,6 +77,9 @@ virtual void setStartTimeOffsetMs(int ms) { mStartTimeOffsetMs = ms; } virtual int32_t getStartTimeOffsetMs() const { return mStartTimeOffsetMs; } virtual status_t setNextFd(int fd); + bool isSampleMetadataValid([[maybe_unused]] size_t trackIndex, int64_t timeUs) override { + return timeUs >= 0; + } protected: virtual ~MPEG4Writer();