am 819d2aa: Merge "EmulatedFakeCamera2: Add autofocus management" into jb-mr1-dev

* commit '819d2aac43d27100df59ee009c211169787b55dd':
  EmulatedFakeCamera2: Add autofocus management

Author: Eino-Ville Talvala

tools/emulator/system/camera/EmulatedCamera2.cpp

@@ -305,6 +305,7 @@ int EmulatedCamera2::trigger_action(const camera2_device_t *d,
 int EmulatedCamera2::set_notify_callback(const camera2_device_t *d,
         camera2_notify_callback notify_cb, void* user) {
     EmulatedCamera2* ec = getInstance(d);
+    Mutex::Autolock l(ec->mMutex);
     ec->mNotifyCb = notify_cb;
     ec->mNotifyUserPtr = user;
     return NO_ERROR;
@@ -355,6 +356,18 @@ int EmulatedCamera2::close(struct hw_device_t* device) {
     return ec->closeCamera();
 }
 
+void EmulatedCamera2::sendNotification(int32_t msgType,
+        int32_t ext1, int32_t ext2, int32_t ext3) {
+    camera2_notify_callback notifyCb;
+    {
+        Mutex::Autolock l(mMutex);
+        notifyCb = mNotifyCb;
+    }
+    if (notifyCb != NULL) {
+        notifyCb(msgType, ext1, ext2, ext3, mNotifyUserPtr);
+    }
+}
+
 camera2_device_ops_t EmulatedCamera2::sDeviceOps = {
     EmulatedCamera2::set_request_queue_src_ops,
     EmulatedCamera2::notify_request_queue_not_empty,

tools/emulator/system/camera/EmulatedCamera2.h

@@ -28,6 +28,8 @@
 #include "hardware/camera2.h"
 #include "system/camera_metadata.h"
 #include "EmulatedBaseCamera.h"
+#include <utils/Thread.h>
+#include <utils/Mutex.h>
 
 namespace android {
 
@@ -128,7 +130,7 @@ class EmulatedCamera2 : public camera2_device, public EmulatedBaseCamera {
 
     /** 3A action triggering */
     virtual int triggerAction(uint32_t trigger_id,
-            int ext1, int ext2);
+            int32_t ext1, int32_t ext2);
 
     /** Custom tag definitions */
     virtual const char* getVendorSectionName(uint32_t tag);
@@ -232,21 +234,27 @@ class EmulatedCamera2 : public camera2_device, public EmulatedBaseCamera {
      * Data members shared with implementations
      ***************************************************************************/
   protected:
+    /** Mutex for calls through camera2 device interface */
+    Mutex mMutex;
+
     const camera2_request_queue_src_ops *mRequestQueueSrc;
     const camera2_frame_queue_dst_ops *mFrameQueueDst;
-    camera2_notify_callback mNotifyCb;
-    void* mNotifyUserPtr;
 
     struct TagOps : public vendor_tag_query_ops {
         EmulatedCamera2 *parent;
     };
     TagOps      mVendorTagOps;
 
+    void sendNotification(int32_t msgType,
+            int32_t ext1, int32_t ext2, int32_t ext3);
+
     /****************************************************************************
      * Data members
      ***************************************************************************/
   private:
     static camera2_device_ops_t sDeviceOps;
+    camera2_notify_callback mNotifyCb;
+    void* mNotifyUserPtr;
 };
 
 }; /* namespace android */