diff options
| author | Wei Jia <wjia@google.com> | 2016-07-07 16:08:30 -0700 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2016-07-13 20:30:42 -0700 |
| commit | cad52fe423734c12aea2b8e90a2c15952777b536 (patch) | |
| tree | 79ab8b9c4961824addcb7a4fd58b2fbb5810e876 | |
| parent | 13eb2e20a30abcfa45f41cd11a1fc110717c7c2b (diff) | |
| download | base-cad52fe423734c12aea2b8e90a2c15952777b536.tar.gz | |
MediaDataSource: add DrmInitialization for IDataSource.
Bug: 29342399
Bug: 28901867
Change-Id: Ib2049566582aa08783ff588dd25afef4e1c0b5e2
(cherry picked from commit a03dc2b5eb94a906eeeda5bf0afbcfb60588abb4)
| -rw-r--r-- | media/jni/android_media_MediaDataSource.cpp | 5 | ||||
| -rw-r--r-- | media/jni/android_media_MediaDataSource.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/media/jni/android_media_MediaDataSource.cpp b/media/jni/android_media_MediaDataSource.cpp index d07942b5fd89..2ab7e39fad17 100644 --- a/media/jni/android_media_MediaDataSource.cpp +++ b/media/jni/android_media_MediaDataSource.cpp @@ -26,6 +26,7 @@ #include "JNIHelp.h" #include <binder/MemoryDealer.h> +#include <drm/drm_framework_common.h> #include <media/stagefright/foundation/ADebug.h> #include <nativehelper/ScopedLocalRef.h> @@ -159,4 +160,8 @@ String8 JMediaDataSource::toString() { return String8::format("JMediaDataSource(pid %d, uid %d)", getpid(), getuid()); } +sp<DecryptHandle> JMediaDataSource::DrmInitialization(const char * /* mime */) { + return NULL; +} + } // namespace android diff --git a/media/jni/android_media_MediaDataSource.h b/media/jni/android_media_MediaDataSource.h index 378baf433fed..39405d2db579 100644 --- a/media/jni/android_media_MediaDataSource.h +++ b/media/jni/android_media_MediaDataSource.h @@ -47,6 +47,7 @@ public: virtual void close(); virtual uint32_t getFlags(); virtual String8 toString(); + virtual sp<DecryptHandle> DrmInitialization(const char *mime); private: // Protect all member variables with mLock because this object will be |