From adad411ea6aa1df5a2c2d0b9876a47f7ac1739e3 Mon Sep 17 00:00:00 2001 From: James Dong Date: Thu, 2 Aug 2012 19:31:15 -0700 Subject: [PATCH] Let getOriginalMimeType() take a fd passed from Java applications This patch completes the change needed for widevine drm plugin. o related-to-bug: 6426185 Change-Id: Ib9897be6264506f1c96eecca8be1de016f3b0b86 --- proprietary/drmwvmplugin/include/WVMDrmPlugin.h | 2 +- proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proprietary/drmwvmplugin/include/WVMDrmPlugin.h b/proprietary/drmwvmplugin/include/WVMDrmPlugin.h index 38be1d6b..ad92583c 100644 --- a/proprietary/drmwvmplugin/include/WVMDrmPlugin.h +++ b/proprietary/drmwvmplugin/include/WVMDrmPlugin.h @@ -41,7 +41,7 @@ protected: 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); diff --git a/proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp b/proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp index fb491c66..c24af8fc 100644 --- a/proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp +++ b/proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp @@ -539,7 +539,7 @@ bool WVMDrmPlugin::onCanHandle(int uniqueId, const String8& path) { * @return String8 * 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); return String8("video/wvm"); }