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

Commit b104d5a4 authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

Merge "MediaWriter: make get/setStartTimeOffsetMs virtual" into lmp-dev

parents 3a2956d1 d8cf55d8

include/media/stagefright/MPEG4Writer.h

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ public: 
    int32_t getTimeScale() const { return mTimeScale; }



    status_t setGeoData(int latitudex10000, int longitudex10000);

    void setStartTimeOffsetMs(int ms) { mStartTimeOffsetMs = ms; }

    int32_t getStartTimeOffsetMs() const { return mStartTimeOffsetMs; }

    virtual void setStartTimeOffsetMs(int ms) { mStartTimeOffsetMs = ms; }

    virtual int32_t getStartTimeOffsetMs() const { return mStartTimeOffsetMs; }



protected:

    virtual ~MPEG4Writer();

include/media/stagefright/MediaWriter.h

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ struct MediaWriter : public RefBase { 
        return OK;

    }



    virtual void setStartTimeOffsetMs(int ms) {}

    virtual int32_t getStartTimeOffsetMs() const { return 0; }



protected:

    virtual ~MediaWriter() {}

    int64_t mMaxFileSizeLimitBytes;

media/libstagefright/webm/WebmWriter.h

+8 −8
Original line number Diff line number Diff line
@@ -41,14 +41,14 @@ public: 
    ~WebmWriter() { reset(); }





    status_t addSource(const sp<MediaSource> &source);

    status_t start(MetaData *param = NULL);

    status_t stop();

    status_t pause();

    bool reachedEOS();



    void setStartTimeOffsetMs(int ms) { mStartTimeOffsetMs = ms; }

    int32_t getStartTimeOffsetMs() const { return mStartTimeOffsetMs; }

    virtual status_t addSource(const sp<MediaSource> &source);

    virtual status_t start(MetaData *param = NULL);

    virtual status_t stop();

    virtual status_t pause();

    virtual bool reachedEOS();



    virtual void setStartTimeOffsetMs(int ms) { mStartTimeOffsetMs = ms; }

    virtual int32_t getStartTimeOffsetMs() const { return mStartTimeOffsetMs; }



private:

    int mFd;