diff options
| author | Andy Hung <hunga@google.com> | 2014-10-02 14:26:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-02 14:26:02 +0000 |
| commit | d8b03abf1d003e2940a19f0071ea2892689dd10e (patch) | |
| tree | 0da3ff7e88649ef12a8121d483befd555c7ac3f3 /media/libmediaplayerservice/nuplayer/GenericSource.h | |
| parent | f916667a017a5a6763afc4808344778570312d5a (diff) | |
| parent | 2abde2c118a94f843a7450818c925d3f0b673cd3 (diff) | |
| download | frameworks_av-d8b03abf1d003e2940a19f0071ea2892689dd10e.zip frameworks_av-d8b03abf1d003e2940a19f0071ea2892689dd10e.tar.gz frameworks_av-d8b03abf1d003e2940a19f0071ea2892689dd10e.tar.bz2 | |
Merge "NuPlayer: Fix flush mode decoder error handling" into lmp-dev
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/GenericSource.h')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.h b/media/libmediaplayerservice/nuplayer/GenericSource.h index 5ed4d52..f8601ea 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.h +++ b/media/libmediaplayerservice/nuplayer/GenericSource.h @@ -93,6 +93,7 @@ private: kWhatSelectTrack, kWhatSeek, kWhatReadBuffer, + kWhatStopWidevine, }; Vector<sp<MediaSource> > mSources; @@ -132,6 +133,7 @@ private: DrmManagerClient *mDrmManagerClient; sp<DecryptHandle> mDecryptHandle; bool mStarted; + bool mStopRead; String8 mContentType; AString mSniffedMIME; off64_t mMetaDataSize; |