diff options
author | Gloria Wang <gwang@google.com> | 2010-10-25 16:56:49 -0700 |
---|---|---|
committer | Gloria Wang <gwang@google.com> | 2010-10-25 16:56:49 -0700 |
commit | aceaaf303422bbe3a7b8d9cdb96495dbf8109c23 (patch) | |
tree | 567006154374135f6747dd8a81288d3b5570c11f /media/libstagefright/include/AwesomePlayer.h | |
parent | 4cd5c79858d5c8508dffdcba5a0fcb941a39cbef (diff) | |
parent | a9741a9232c81eaf59179acef91f5be46c42264e (diff) | |
download | frameworks_av-aceaaf303422bbe3a7b8d9cdb96495dbf8109c23.zip frameworks_av-aceaaf303422bbe3a7b8d9cdb96495dbf8109c23.tar.gz frameworks_av-aceaaf303422bbe3a7b8d9cdb96495dbf8109c23.tar.bz2 |
resolved conflicts for merge of 965f960e to master
Change-Id: I63cec8ffb3593216da1de03428134d89e75b9338
Diffstat (limited to 'media/libstagefright/include/AwesomePlayer.h')
-rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h index f4a2024..a0a7436 100644 --- a/media/libstagefright/include/AwesomePlayer.h +++ b/media/libstagefright/include/AwesomePlayer.h @@ -26,6 +26,7 @@ #include <media/stagefright/OMXClient.h> #include <media/stagefright/TimeSource.h> #include <utils/threads.h> +#include <drm/DrmManagerClient.h> namespace android { @@ -41,6 +42,9 @@ struct ARTSPController; struct ARTPSession; struct UDPPusher; +class DrmManagerClinet; +class DecryptHandle; + struct AwesomeRenderer : public RefBase { AwesomeRenderer() {} @@ -222,6 +226,9 @@ private: } } *mSuspensionState; + DrmManagerClient *mDrmManagerClient; + DecryptHandle *mDecryptHandle; + status_t setDataSource_l( const char *uri, const KeyedVector<String8, String8> *headers = NULL); |