diff options
| author | Andy Hung <hunga@google.com> | 2014-09-30 14:40:32 -0700 |
|---|---|---|
| committer | Andy Hung <hunga@google.com> | 2014-10-01 20:23:34 -0700 |
| commit | 2abde2c118a94f843a7450818c925d3f0b673cd3 (patch) | |
| tree | 452cecbb797776883b387704a299936b1dd55729 /media/libmediaplayerservice/nuplayer/GenericSource.h | |
| parent | 955e24d3a8e218d4711cabc6558781e095011132 (diff) | |
| download | frameworks_av-2abde2c118a94f843a7450818c925d3f0b673cd3.zip frameworks_av-2abde2c118a94f843a7450818c925d3f0b673cd3.tar.gz frameworks_av-2abde2c118a94f843a7450818c925d3f0b673cd3.tar.bz2 | |
NuPlayer: Fix flush mode decoder error handling
Explicitly handle each flush mode upon decoder error.
Do not clear out affected decoder immediately.
Alter logcat messages for better diagnostics.
Bug: 17638878
Bug: 17679341
Change-Id: I219796c04d65d7c4dd61c0d4f99f9f580241a68b
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 24bb6af..1741f27 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; @@ -131,6 +132,7 @@ private: DrmManagerClient *mDrmManagerClient; sp<DecryptHandle> mDecryptHandle; bool mStarted; + bool mStopRead; String8 mContentType; AString mSniffedMIME; off64_t mMetaDataSize; |