diff options
| author | Lajos Molnar <lajos@google.com> | 2015-03-31 10:06:48 -0700 |
|---|---|---|
| committer | Chong Zhang <chz@google.com> | 2015-04-01 09:42:36 -0700 |
| commit | fcd3e94c075e964670d946f6ec5d82d059bf9e09 (patch) | |
| tree | 04671659ed1853cb36f7e00e76dbc0e4720a2f20 /media/libmediaplayerservice/nuplayer/GenericSource.h | |
| parent | ac41a6f253a69671f6e018fcc84daf0030615ca9 (diff) | |
| download | frameworks_av-fcd3e94c075e964670d946f6ec5d82d059bf9e09.zip frameworks_av-fcd3e94c075e964670d946f6ec5d82d059bf9e09.tar.gz frameworks_av-fcd3e94c075e964670d946f6ec5d82d059bf9e09.tar.bz2 | |
mediaplayer: ensure secure decoders are instantiated before starting source
Bug: 19984798
Change-Id: Iff13cf03c4ce3141380f4d7ab4a2b1045c5ce747
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/GenericSource.h')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.h b/media/libmediaplayerservice/nuplayer/GenericSource.h index 5fc41ec..862ee5f 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.h +++ b/media/libmediaplayerservice/nuplayer/GenericSource.h @@ -96,6 +96,7 @@ private: kWhatStopWidevine, kWhatStart, kWhatResume, + kWhatSecureDecodersInstantiated, }; struct Track { @@ -158,6 +159,9 @@ private: void setDrmPlaybackStatusIfNeeded(int playbackStatus, int64_t position); void notifyPreparedAndCleanup(status_t err); + void onSecureDecodersInstantiated(status_t err); + void finishPrepareAsync(); + status_t startSources(); void onGetFormatMeta(sp<AMessage> msg) const; sp<MetaData> doGetFormatMeta(bool audio) const; |