| commit | 79b888f43091a5a4a62a3666201deb254857e0a5 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Nov 22 17:53:52 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 22 17:53:52 2023 +0000 |
| tree | 34b1b5faffb50d38cdbabdc0e7d074f7be2cb2f0 | |
| parent | 3f897b2e42c78e8debfcdac6a43258a810199fc3 [diff] | |
| parent | dc2c40ba83699116c6dc138445dc2e8800d8de21 [diff] |
Merge "Restrict unsigned integer overflow in MPEG4Writer writeEdtsBox" into main am: dc2c40ba83 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2822051 Change-Id: I4ffa9d518d2d61374c4f0cfd1c7b36ff9143470c 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();