diff options
| author | Chong Zhang <chz@google.com> | 2014-08-04 21:19:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-01 01:46:21 +0000 |
| commit | ca61a8f0bc22606cb11b99bdb10a146f941d556e (patch) | |
| tree | 5fa0f5a6047155c486713879e531038879d4dcf1 /include | |
| parent | b63d63b8afa25694d1973988d7acdfebcd01a18d (diff) | |
| parent | 16e79115e497386eaf010af388627f94314a55a3 (diff) | |
| download | frameworks_av-ca61a8f0bc22606cb11b99bdb10a146f941d556e.zip frameworks_av-ca61a8f0bc22606cb11b99bdb10a146f941d556e.tar.gz frameworks_av-ca61a8f0bc22606cb11b99bdb10a146f941d556e.tar.bz2 | |
Merge "MediaCodecSource: stop puller from caller's thread instead of looper" into lmp-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaCodecSource.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/media/stagefright/MediaCodecSource.h b/include/media/stagefright/MediaCodecSource.h index 4b18a0b..e1b2830 100644 --- a/include/media/stagefright/MediaCodecSource.h +++ b/include/media/stagefright/MediaCodecSource.h @@ -106,7 +106,6 @@ private: bool mStarted; bool mStopping; bool mDoMoreWorkPending; - bool mPullerReachedEOS; sp<AMessage> mEncoderActivityNotify; sp<IGraphicBufferProducer> mGraphicBufferProducer; Vector<sp<ABuffer> > mEncoderInputBuffers; @@ -123,7 +122,7 @@ private: Mutex mOutputBufferLock; Condition mOutputBufferCond; List<MediaBuffer*> mOutputBufferQueue; - bool mEncodedReachedEOS; + bool mEncoderReachedEOS; status_t mErrorCode; DISALLOW_EVIL_CONSTRUCTORS(MediaCodecSource); |