diff options
| author | Robert Shih <robertshih@google.com> | 2014-07-23 01:31:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-22 16:13:36 +0000 |
| commit | b104d5a4dfbd8415f6bc227106b9f0130350d79a (patch) | |
| tree | 403d27824ffd9914ce212dd6c697d27f115ec8d0 /media | |
| parent | 3a2956d148d81194e297408179e84a47a309ef48 (diff) | |
| parent | d8cf55d878edddfc36bb821a95b88dfb2453c2c3 (diff) | |
| download | frameworks_av-b104d5a4dfbd8415f6bc227106b9f0130350d79a.zip frameworks_av-b104d5a4dfbd8415f6bc227106b9f0130350d79a.tar.gz frameworks_av-b104d5a4dfbd8415f6bc227106b9f0130350d79a.tar.bz2 | |
Merge "MediaWriter: make get/setStartTimeOffsetMs virtual" into lmp-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/webm/WebmWriter.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/media/libstagefright/webm/WebmWriter.h b/media/libstagefright/webm/WebmWriter.h index 529dec8..36b6965 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<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; |