diff options
| author | James Dong <jdong@google.com> | 2010-06-11 14:28:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-06-11 14:28:55 -0700 |
| commit | f62c57d684b83df7d2817db976c0afdb500ae92a (patch) | |
| tree | 47f6db0ae3fe6061ce23e1e5f8002308e732e418 /include | |
| parent | 9f8cc518e14c7a34bc52da712afbf02d84585f67 (diff) | |
| parent | 08c7473ce9b601e170fd79c530f106bf74277a0f (diff) | |
| download | frameworks_base-f62c57d684b83df7d2817db976c0afdb500ae92a.zip frameworks_base-f62c57d684b83df7d2817db976c0afdb500ae92a.tar.gz frameworks_base-f62c57d684b83df7d2817db976c0afdb500ae92a.tar.bz2 | |
Merge "Initial checkin for pause and resume control" into kraken
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/AMRWriter.h | 3 | ||||
| -rw-r--r-- | include/media/stagefright/MPEG4Writer.h | 4 | ||||
| -rw-r--r-- | include/media/stagefright/MediaWriter.h | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/include/media/stagefright/AMRWriter.h b/include/media/stagefright/AMRWriter.h index dd11809..b0eaba4 100644 --- a/include/media/stagefright/AMRWriter.h +++ b/include/media/stagefright/AMRWriter.h @@ -37,6 +37,7 @@ struct AMRWriter : public MediaWriter { virtual bool reachedEOS(); virtual status_t start(); virtual void stop(); + virtual void pause(); protected: virtual ~AMRWriter(); @@ -46,6 +47,8 @@ private: status_t mInitCheck; sp<MediaSource> mSource; bool mStarted; + volatile bool mPaused; + volatile bool mResumed; volatile bool mDone; volatile bool mReachedEOS; pthread_t mThread; diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h index 3c85eca..3d90434 100644 --- a/include/media/stagefright/MPEG4Writer.h +++ b/include/media/stagefright/MPEG4Writer.h @@ -39,6 +39,7 @@ public: virtual status_t start(); virtual bool reachedEOS(); virtual void stop(); + virtual void pause(); void beginBox(const char *fourcc); void writeInt8(int8_t x); @@ -59,6 +60,8 @@ private: class Track; FILE *mFile; + bool mPaused; + bool mStarted; off_t mOffset; off_t mMdatOffset; uint8_t *mMoovBoxBuffer; @@ -77,6 +80,7 @@ private: void setStartTimestamp(int64_t timeUs); int64_t getStartTimestamp(); // Not const + status_t startTracks(); void lock(); void unlock(); diff --git a/include/media/stagefright/MediaWriter.h b/include/media/stagefright/MediaWriter.h index b15f69c..8528203 100644 --- a/include/media/stagefright/MediaWriter.h +++ b/include/media/stagefright/MediaWriter.h @@ -32,6 +32,7 @@ struct MediaWriter : public RefBase { virtual bool reachedEOS() = 0; virtual status_t start() = 0; virtual void stop() = 0; + virtual void pause() = 0; virtual void setMaxFileSize(int64_t bytes) { mMaxFileSizeLimitBytes = bytes; } virtual void setMaxFileDuration(int64_t durationUs) { mMaxFileDurationLimitUs = durationUs; } virtual void setListener(const sp<IMediaPlayerClient>& listener) { |