android/android_hardware_qcom_display
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am c9949de5: libcamera: dlopen() libqcamera in the AF thread

Browse Source 
Merge commit 'c9949de51b0f7d585bd4185ee1e682cc2a5cab8e'

* commit 'c9949de51b0f7d585bd4185ee1e682cc2a5cab8e':
  libcamera: dlopen() libqcamera in the AF thread
This commit is contained in:
Iliyan Malchev 2009-07-01 00:06:51 -07:00 committed by The Android Open Source Project
commit 84a23831dd
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libcamera2/QualcommCameraHardware.cpp
View File

@ -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()