Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ac09738 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Restrict unsigned integer overflow in MPEG4Writer writeEdtsBox" into main am: dc2c40ba 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2822051



Change-Id: I6bf68245082f5c52b741e6cd37e307f14e6f73ff
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6f38445a dc2c40ba

media/libstagefright/include/media/stagefright/MPEG4Writer.h

+3 −0
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ public: 
    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();