LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix capture stopping

Browse Source 
When stopping the camera, the working thread should be stopped before sending
"stop" query to the emulator: we don't want "frame" queries to be floating around
while we're in the process of stopping the camera.

Change-Id: I16dc56ca1c2e304a07a074302001d2e27100f2ac
This commit is contained in:
Vladimir Chtchetkine
2011-09-14 07:06:23 -07:00
parent 16232484c7
commit 4d47360672
5 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/emulator/system/camera/EmulatedQemuCameraDevice.cpp
View File

@@ -126,7 +126,6 @@ status_t EmulatedQemuCameraDevice::startDevice()
{
LOGV("%s", __FUNCTION__);
Mutex::Autolock locker(&mObjectLock);
if (!isConnected()) {
LOGE("%s: Qemu camera device is not connected.", __FUNCTION__);
return EINVAL;
@@ -169,17 +168,16 @@ status_t EmulatedQemuCameraDevice::stopDevice()
{
LOGV("%s", __FUNCTION__);
Mutex::Autolock locker(&mObjectLock);
if (!isCapturing()) {
LOGW("%s: Qemu camera device is not capturing.", __FUNCTION__);
return NO_ERROR;
}
/* Stop the actual camera device. */
status_t res = mQemuClient.queryStop();
/* Stop the worker thread first. */
status_t res = stopWorkerThread();
if (res == NO_ERROR) {
/* Stop the worker thread. */
res = stopWorkerThread();
/* Stop the actual camera device. */
res = mQemuClient.queryStop();
if (res == NO_ERROR) {
if (mPreviewFrame == NULL) {
delete[] mPreviewFrame;
@@ -187,9 +185,11 @@ status_t EmulatedQemuCameraDevice::stopDevice()
}
mState = ECDS_CONNECTED;
LOGV("%s: Stopped", __FUNCTION__);
} else {
LOGE("%s: Stop failed", __FUNCTION__);
}
} else {
LOGE("%s: Stop failed", __FUNCTION__);
LOGE("%s: Unable to stop worker thread", __FUNCTION__);
}
return res;