diff options
| author | Robert Shih <robertshih@google.com> | 2014-07-23 01:39:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-23 01:39:44 +0000 |
| commit | 433ae66759c36069a0d5e3715510f992dd8a8cba (patch) | |
| tree | ec3eb943a912fb1499027155b8934fd550610561 /media | |
| parent | 78be88ee353a6ca0cb53845b3bd862ce70665eab (diff) | |
| parent | b104d5a4dfbd8415f6bc227106b9f0130350d79a (diff) | |
| download | frameworks_av-433ae66759c36069a0d5e3715510f992dd8a8cba.zip frameworks_av-433ae66759c36069a0d5e3715510f992dd8a8cba.tar.gz frameworks_av-433ae66759c36069a0d5e3715510f992dd8a8cba.tar.bz2 | |
am b104d5a4: Merge "MediaWriter: make get/setStartTimeOffsetMs virtual" into lmp-dev
* commit 'b104d5a4dfbd8415f6bc227106b9f0130350d79a':
MediaWriter: make get/setStartTimeOffsetMs virtual
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; |