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

am efaedb94: Get the values returned from CAMERA_GET_PARM_ZOOM correctly.

Browse Source 
Merge commit 'efaedb948a67d90bc0a61fcdfd778e1ce5629e7f'

* commit 'efaedb948a67d90bc0a61fcdfd778e1ce5629e7f':
  Get the values returned from CAMERA_GET_PARM_ZOOM correctly.
This commit is contained in:
Wu-cheng Li 2009-06-16 08:37:47 -07:00 committed by The Android Open Source Project
commit 533e912361
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libcamera2/QualcommCameraHardware.cpp
View File

@ -1879,7 +1879,7 @@ bool QualcommCameraHardware::native_get_zoom(int camfd, void *pZm)
ctrlCmd.timeout_ms = 5000;
ctrlCmd.length = sizeof(cam_parm_info_t);
ctrlCmd.value = pZoom;
ctrlCmd.resp_fd = camfd; // FIXME: this will be put in by the kernel
ctrlCmd.resp_fd = camfd; // FIXME: this will be put in by the kernel
if(ioctl(camfd, MSM_CAM_IOCTL_CTRL_COMMAND, &ctrlCmd) < 0) {
LOGE("native_get_zoom: ioctl fd %d error %s",
@ -1887,14 +1887,14 @@ bool QualcommCameraHardware::native_get_zoom(int camfd, void *pZm)
return false;
}
LOGV("native_get_zoom::current val=%d max=%d min=%d step val=%d",
memcpy(pZoom, *(cam_parm_info_t **)ctrlCmd.value, sizeof(cam_parm_info_t));
LOGD("native_get_zoom::current val=%d max=%d min=%d step val=%d",
pZoom->current_value,
pZoom->maximum_value,
pZoom->minimum_value,
pZoom->step_value);
memcpy(pZoom, (cam_parm_info_t *)ctrlCmd.value, sizeof(cam_parm_info_t));
return ctrlCmd.status;
}