widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Let getOriginalMimeType() take a fd passed from Java applications" into jb-mr1-dev

Browse Source
This commit is contained in:
James Dong
2012-08-22 14:50:21 -07:00
committed by Android (Google) Code Review
parent 196fe01488 adad411ea6
commit 20e8e2b01c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proprietary/drmwvmplugin/include/WVMDrmPlugin.h
View File

@@ -41,7 +41,7 @@ protected:
DrmInfo* onAcquireDrmInfo(int uniqueId, const DrmInfoRequest* drmInfoRequest); DrmInfo* onAcquireDrmInfo(int uniqueId, const DrmInfoRequest* drmInfoRequest);
String8 onGetOriginalMimeType(int uniqueId, const String8& path); String8 onGetOriginalMimeType(int uniqueId, const String8& path, int fd);
int onGetDrmObjectType(int uniqueId, const String8& path, const String8& mimeType); int onGetDrmObjectType(int uniqueId, const String8& path, const String8& mimeType);

2
proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp
View File

@@ -542,7 +542,7 @@ bool WVMDrmPlugin::onCanHandle(int uniqueId, const String8& path) {
* @return String8 * @return String8
* Returns mime-type of the original content, such as "video/mpeg" * Returns mime-type of the original content, such as "video/mpeg"
*/ */
String8 WVMDrmPlugin::onGetOriginalMimeType(int uniqueId, const String8& path) { String8 WVMDrmPlugin::onGetOriginalMimeType(int uniqueId, const String8& path, int fd) {
//ALOGD("WVMDrmPlugin::onGetOriginalMimeType() : %d", uniqueId); //ALOGD("WVMDrmPlugin::onGetOriginalMimeType() : %d", uniqueId);
return String8("video/wvm"); return String8("video/wvm");
} }