ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 18bd1d6d: Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev

Browse Source 
* commit '18bd1d6d55a275d23188251169dfe3cc74882665':
  Implement async event callout from drm plugin to Java app
This commit is contained in:
Jeff Tinker 2013-04-04 18:19:32 -07:00 committed by Android Git Automerger
commit c809d2c721
1 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
include/media/drm/DrmAPI.h
View File

@ -22,6 +22,7 @@
#include <utils/Vector.h> #include <utils/Vector.h>
#include <utils/KeyedVector.h> #include <utils/KeyedVector.h>
#include <utils/RefBase.h> #include <utils/RefBase.h>
#include <utils/Mutex.h>
#include <media/stagefright/foundation/ABase.h> #include <media/stagefright/foundation/ABase.h>
// Loadable DrmEngine shared libraries should define the entry points // Loadable DrmEngine shared libraries should define the entry points
@ -34,7 +35,8 @@
namespace android { namespace android {
struct DrmPlugin; class DrmPlugin;
class DrmPluginListener;
// DRMs are implemented in DrmEngine plugins, which are dynamically // DRMs are implemented in DrmEngine plugins, which are dynamically
// loadable shared libraries that implement the entry points // loadable shared libraries that implement the entry points
@ -70,7 +72,7 @@ namespace android {
class DrmPlugin { class DrmPlugin {
public: public:
enum EventType { enum EventType {
kDrmPluginEventProvisionRequired, kDrmPluginEventProvisionRequired = 1,
kDrmPluginEventKeyNeeded, kDrmPluginEventKeyNeeded,
kDrmPluginEventKeyExpired, kDrmPluginEventKeyExpired,
kDrmPluginEventVendorDefined kDrmPluginEventVendorDefined
@ -261,12 +263,46 @@ namespace android {
bool &match) = 0; bool &match) = 0;
status_t setListener(const sp<DrmPluginListener>& listener) {
Mutex::Autolock lock(mEventLock);
mListener = listener;
return OK;
}
protected:
// Plugins call sendEvent to deliver events to the java app
void sendEvent(EventType eventType, int extra,
Vector<uint8_t> const *sessionId,
Vector<uint8_t> const *data);
// TODO: provide way to send an event
private: private:
Mutex mEventLock;
sp<DrmPluginListener> mListener;
DISALLOW_EVIL_CONSTRUCTORS(DrmPlugin); DISALLOW_EVIL_CONSTRUCTORS(DrmPlugin);
}; };
class DrmPluginListener: virtual public RefBase
{
public:
virtual void sendEvent(DrmPlugin::EventType eventType, int extra,
Vector<uint8_t> const *sesionId,
Vector<uint8_t> const *data) = 0;
};
inline void DrmPlugin::sendEvent(EventType eventType, int extra,
Vector<uint8_t> const *sessionId,
Vector<uint8_t> const *data) {
mEventLock.lock();
sp<DrmPluginListener> listener = mListener;
mEventLock.unlock();
if (listener != NULL) {
listener->sendEvent(eventType, extra, sessionId, data);
}
}
} // namespace android } // namespace android
#endif // DRM_API_H_ #endif // DRM_API_H_