From d8cf55d878edddfc36bb821a95b88dfb2453c2c3 Mon Sep 17 00:00:00 2001 From: Robert Shih Date: Thu, 17 Jul 2014 11:46:13 -0700 Subject: [PATCH] MediaWriter: make get/setStartTimeOffsetMs virtual Bug: 16329805 Change-Id: Ib971dd95b54829438c8af97528f9e00b87ab3f1e --- include/media/stagefright/MPEG4Writer.h | 4 ++-- include/media/stagefright/MediaWriter.h | 3 +++ media/libstagefright/webm/WebmWriter.h | 16 ++++++++-------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h index 3ef6b9adee..26ce5f9d95 100644 --- a/include/media/stagefright/MPEG4Writer.h +++ b/include/media/stagefright/MPEG4Writer.h @@ -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(); diff --git a/include/media/stagefright/MediaWriter.h b/include/media/stagefright/MediaWriter.h index 5cc8dcffe0..e27ea1d26e 100644 --- a/include/media/stagefright/MediaWriter.h +++ b/include/media/stagefright/MediaWriter.h @@ -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; diff --git a/media/libstagefright/webm/WebmWriter.h b/media/libstagefright/webm/WebmWriter.h index 529dec80c1..36b6965b40 100644 --- a/media/libstagefright/webm/WebmWriter.h +++ b/media/libstagefright/webm/WebmWriter.h @@ -41,14 +41,14 @@ public: ~WebmWriter() { reset(); } - status_t addSource(const sp &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 &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; -- 2.11.0