diff options
author | Gloria Wang <gwang@google.com> | 2010-10-25 15:23:04 -0700 |
---|---|---|
committer | Gloria Wang <gwang@google.com> | 2010-10-25 16:11:18 -0700 |
commit | a9741a9232c81eaf59179acef91f5be46c42264e (patch) | |
tree | 9a66416b42a28ec2ad4fa2ec520c42d976046aec /media/libstagefright/include/AwesomePlayer.h | |
parent | d8cba5371423841e6a85816ad4a7fd88d3a60b12 (diff) | |
parent | dcd25efb46c41c8d24a0a9cf61fb57f84149709e (diff) | |
download | frameworks_av-a9741a9232c81eaf59179acef91f5be46c42264e.zip frameworks_av-a9741a9232c81eaf59179acef91f5be46c42264e.tar.gz frameworks_av-a9741a9232c81eaf59179acef91f5be46c42264e.tar.bz2 |
resolved conflicts for merge of 9084631d to gingerbread-plus-aosp
Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
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 3020a09..4526bf1 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() {} @@ -215,6 +219,9 @@ private: } } *mSuspensionState; + DrmManagerClient *mDrmManagerClient; + DecryptHandle *mDecryptHandle; + status_t setDataSource_l( const char *uri, const KeyedVector<String8, String8> *headers = NULL); |