commit 0cb126a34fe32f81c830858102471e7be2ce85b1
author Jeff Tinker <jtinker@google.com> Tue Apr 02 13:08:05 2013 -0700
committer Jeff Tinker <jtinker@google.com> Wed Apr 03 12:20:53 2013 -0700
tree a20999e4b89a78375a1b69cb3a0bef96fab74362
parent 8856c8b8777d0e0de11b2de863a336b001024e29

Implement async event callout from drm plugin to Java app

Change-Id: I007f147d693664e777b8758be2bb8a4c7ec0236b

media/libmediaplayerservice/Drm.cpp

diff --git a/media/libmediaplayerservice/Drm.cpp b/media/libmediaplayerservice/Drm.cpp
index 5fdb9f4..1e6cd94 100644
--- a/media/libmediaplayerservice/Drm.cpp
+++ b/media/libmediaplayerservice/Drm.cpp
@@ -47,6 +47,7 @@
 
 Drm::Drm()
     : mInitCheck(NO_INIT),
+      mListener(NULL),
       mFactory(NULL),
       mPlugin(NULL) {
 }
@@ -67,6 +68,41 @@
     return mInitCheck;
 }
 
+status_t Drm::setListener(const sp<IDrmClient>& listener)
+{
+    Mutex::Autolock lock(mEventLock);
+    mListener = listener;
+    return NO_ERROR;
+}
+
+void Drm::sendEvent(DrmPlugin::EventType eventType, int extra,
+                    Vector<uint8_t> const *sessionId,
+                    Vector<uint8_t> const *data)
+{
+    mEventLock.lock();
+    sp<IDrmClient> listener = mListener;
+    mEventLock.unlock();
+
+    if (listener != NULL) {
+        Parcel obj;
+        if (sessionId && sessionId->size()) {
+            obj.writeInt32(sessionId->size());
+            obj.write(sessionId->array(), sessionId->size());
+        } else {
+            obj.writeInt32(0);
+        }
+
+        if (data && data->size()) {
+            obj.writeInt32(data->size());
+            obj.write(data->array(), data->size());
+        } else {
+            obj.writeInt32(0);
+        }
+
+        Mutex::Autolock lock(mNotifyLock);
+        listener->notify(eventType, extra, &obj);
+    }
+}
 
 /*
  * Search the plugins directory for a plugin that supports the scheme
@@ -195,7 +231,9 @@
         return mInitCheck;
     }
 
-    return mFactory->createDrmPlugin(uuid, &mPlugin);
+    status_t result = mFactory->createDrmPlugin(uuid, &mPlugin);
+    mPlugin->setListener(this);
+    return result;
 }
 
 status_t Drm::destroyPlugin() {

media/libmediaplayerservice/Drm.h

diff --git a/media/libmediaplayerservice/Drm.h b/media/libmediaplayerservice/Drm.h
index f24921e..3da8ad4 100644
--- a/media/libmediaplayerservice/Drm.h
+++ b/media/libmediaplayerservice/Drm.h
@@ -21,6 +21,7 @@
 #include "SharedLibrary.h"
 
 #include <media/IDrm.h>
+#include <media/IDrmClient.h>
 #include <utils/threads.h>
 
 namespace android {
@@ -28,7 +29,7 @@
 struct DrmFactory;
 struct DrmPlugin;
 
-struct Drm : public BnDrm {
+struct Drm : public BnDrm, public DrmPluginListener {
     Drm();
     virtual ~Drm();
 
@@ -108,10 +109,21 @@
                             Vector<uint8_t> const &signature,
                             bool &match);
 
+    virtual status_t setListener(const sp<IDrmClient>& listener);
+
+    virtual void sendEvent(DrmPlugin::EventType eventType, int extra,
+                           Vector<uint8_t> const *sessionId,
+                           Vector<uint8_t> const *data);
+
 private:
     mutable Mutex mLock;
 
     status_t mInitCheck;
+
+    sp<IDrmClient> mListener;
+    mutable Mutex mEventLock;
+    mutable Mutex mNotifyLock;
+
     sp<SharedLibrary> mLibrary;
     DrmFactory *mFactory;
     DrmPlugin *mPlugin;