| author | guosong.zhou <guosong.zhou@amlogic.com> | 2014-12-12 06:12:39 (GMT) |
|---|---|---|
| committer | guosong.zhou <guosong.zhou@amlogic.com> | 2014-12-12 06:12:39 (GMT) |
| commit | f441e17f40f5c787acede174216d1a98f3dc5dc5 (patch) | |
| tree | 3bf2a06ec19ff16c4c5e0471b091198646505634 | |
| parent | 53c530982e86390f47cc6c2314fcde21812c49ce (diff) | |
| download | camera-f441e17f40f5c787acede174216d1a98f3dc5dc5.zip camera-f441e17f40f5c787acede174216d1a98f3dc5dc5.tar.gz camera-f441e17f40f5c787acede174216d1a98f3dc5dc5.tar.bz2 | |
when camera don't support focus, delete ANDROID_CONTROL_AF_MODE_AUTO.
minFocusDistance value must set to 0 when is LIMITED devices. This modify
can resolve cts case testAfModes.
Change-Id: Idbf89d45712cc1ddd9a43c06e8d60d3234769b47
| -rwxr-xr-x | v3/EmulatedFakeCamera3.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/v3/EmulatedFakeCamera3.cpp b/v3/EmulatedFakeCamera3.cpp index 8f8bdf9..cbd95fd 100755 --- a/v3/EmulatedFakeCamera3.cpp +++ b/v3/EmulatedFakeCamera3.cpp @@ -1504,7 +1504,7 @@ status_t EmulatedFakeCamera3::constructStaticInfo() { // 5 cm min focus distance for back camera, infinity (fixed focus) for front // TODO read this ioctl from camera driver DBG_LOGB("mCameraID=%d,mCameraInfo=%p\n", mCameraID, mCameraInfo); - const float minFocusDistance = mFacingBack ? 1.0/0.05 : 0.0; + const float minFocusDistance = 0.0; info.update(ANDROID_LENS_INFO_MINIMUM_FOCUS_DISTANCE, &minFocusDistance, 1); @@ -1806,7 +1806,7 @@ status_t EmulatedFakeCamera3::constructStaticInfo() { if (count < 0) { static const uint8_t availableAfModesBack[] = { ANDROID_CONTROL_AF_MODE_OFF, - ANDROID_CONTROL_AF_MODE_AUTO, + //ANDROID_CONTROL_AF_MODE_AUTO, //ANDROID_CONTROL_AF_MODE_MACRO, //ANDROID_CONTROL_AF_MODE_CONTINUOUS_VIDEO, //ANDROID_CONTROL_AF_MODE_CONTINUOUS_PICTURE, |