Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MediaDataSource: add DrmInitialization for IDataSource." into nyc-mr1-dev

Browse Source
This commit is contained in:
Wei Jia
2016-07-13 01:48:07 +00:00
committed by Android (Google) Code Review
parent feaa2bfb39 a03dc2b5eb
commit e7982e05f6
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/jni/android_media_MediaDataSource.cpp
View File

@@ -26,6 +26,7 @@
#include "JNIHelp.h" #include "JNIHelp.h"
#include <binder/MemoryDealer.h> #include <binder/MemoryDealer.h>
#include <drm/drm_framework_common.h>
#include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/foundation/ADebug.h>
#include <nativehelper/ScopedLocalRef.h> #include <nativehelper/ScopedLocalRef.h>
@@ -159,4 +160,8 @@ String8 JMediaDataSource::toString() {
return String8::format("JMediaDataSource(pid %d, uid %d)", getpid(), getuid()); return String8::format("JMediaDataSource(pid %d, uid %d)", getpid(), getuid());
} }
sp<DecryptHandle> JMediaDataSource::DrmInitialization(const char * /* mime */) {
return NULL;
}
} // namespace android } // namespace android

1
media/jni/android_media_MediaDataSource.h
View File

@@ -47,6 +47,7 @@ public:
virtual void close(); virtual void close();
virtual uint32_t getFlags(); virtual uint32_t getFlags();
virtual String8 toString(); virtual String8 toString();
virtual sp<DecryptHandle> DrmInitialization(const char *mime);
private: private:
// Protect all member variables with mLock because this object will be // Protect all member variables with mLock because this object will be