commit 68fca636ac961c181ee71a49f151c71b564258d0
author Lajos Molnar <lajos@google.com> Tue Mar 31 10:06:48 2015 -0700
committer Lajos Molnar <lajos@google.com> Tue Mar 31 12:43:59 2015 -0700
tree 9d149d5f109cb35133ed3af0805029ccb0576f46
parent 424314382b6e2064df1c7c445038a11104be84c7

mediaplayer: ensure secure decoders are instantiated before starting source

Bug: 19984798
Change-Id: Iff13cf03c4ce3141380f4d7ab4a2b1045c5ce747

media/libmediaplayerservice/nuplayer/GenericSource.h

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.h b/media/libmediaplayerservice/nuplayer/GenericSource.h
index 385d73a..2d73ea9 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.h
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.h
@@ -96,6 +96,7 @@
         kWhatStopWidevine,
         kWhatStart,
         kWhatResume,
+        kWhatSecureDecodersInstantiated,
     };
 
     struct Track {
@@ -161,6 +162,9 @@
     status_t prefillCacheIfNecessary();
 
     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;