From 3c05a4483c4c5f9eba830fb3b626d97a68c0d4a2 Mon Sep 17 00:00:00 2001
From: Iliyan Malchev <malchev@google.com>
Date: Mon, 29 Jun 2009 13:09:24 -0700
Subject: [PATCH] libcamera: dlopen() libqcamera in the AF thread

Signed-off-by: Iliyan Malchev <malchev@google.com>
---
 libcamera2/QualcommCameraHardware.cpp | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/libcamera2/QualcommCameraHardware.cpp b/libcamera2/QualcommCameraHardware.cpp
index 212b3f0..c5ca2cf 100644
--- a/libcamera2/QualcommCameraHardware.cpp
+++ b/libcamera2/QualcommCameraHardware.cpp
@@ -678,7 +678,7 @@ void QualcommCameraHardware::runFrameThread(void *data)
     // lifetime of this object.  We do not want to dlclose() libqcamera while
     // LINK_cam_frame is still running.
     void *libhandle = ::dlopen("libqcamera.so", RTLD_NOW);
-    LOGV("loading libqcamera at %p", libhandle);
+    LOGV("FRAME: loading libqcamera at %p", libhandle);
     if (!libhandle) {
         LOGE("FATAL ERROR: could not dlopen libqcamera.so: %s", dlerror());
     }
@@ -1097,6 +1097,23 @@ void QualcommCameraHardware::runAutoFocus()
         return;
     }
 
+#if DLOPEN_LIBMMCAMERA
+    // We need to maintain a reference to libqcamera.so for the duration of the
+    // AF thread, because we do not know when it will exit relative to the
+    // lifetime of this object.  We do not want to dlclose() libqcamera while
+    // LINK_cam_frame is still running.
+    void *libhandle = ::dlopen("libqcamera.so", RTLD_NOW);
+    LOGV("AF: loading libqcamera at %p", libhandle);
+    if (!libhandle) {
+        LOGE("FATAL ERROR: could not dlopen libqcamera.so: %s", dlerror());
+        close(mAutoFocusFd);
+        mAutoFocusFd = -1;
+        mAutoFocusThreadRunning = false;
+        mAutoFocusThreadLock.unlock();
+        return;
+    }
+#endif
+
     /* This will block until either AF completes or is cancelled. */
     LOGV("af start (fd %d)", mAutoFocusFd);
     bool status = native_set_afmode(mAutoFocusFd, AF_MODE_AUTO);
@@ -1117,6 +1134,13 @@ void QualcommCameraHardware::runAutoFocus()
     mAutoFocusCallback = NULL;
     mAutoFocusCallbackCookie = NULL;
     mCallbackLock.unlock();
+
+#if DLOPEN_LIBMMCAMERA
+    if (libhandle) {
+        ::dlclose(libhandle);
+        LOGV("AF: dlclose(libqcamera)");
+    }
+#endif
 }
 
 void QualcommCameraHardware::cancelAutoFocus()