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 /include/media/stagefright/DataSource.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 'include/media/stagefright/DataSource.h')
| -rw-r--r-- | include/media/stagefright/DataSource.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/media/stagefright/DataSource.h b/include/media/stagefright/DataSource.h index a3da3ed..d0b9fcd 100644 --- a/include/media/stagefright/DataSource.h +++ b/include/media/stagefright/DataSource.h @@ -25,6 +25,7 @@ #include <utils/List.h> #include <utils/RefBase.h> #include <utils/threads.h> +#include <drm/DrmManagerClient.h> namespace android { @@ -73,6 +74,13 @@ public: static void RegisterSniffer(SnifferFunc func); static void RegisterDefaultSniffers(); + // for DRM + virtual DecryptHandle* DrmInitialization(DrmManagerClient *client) { + return NULL; + } + virtual void getDrmInfo(DecryptHandle **handle, DrmManagerClient **client) {}; + + protected: virtual ~DataSource() {} |