diff options
| author | Tyler Luu <tluu@ti.com> | 2011-10-12 17:39:00 -0500 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-10-15 13:44:35 -0700 |
| commit | c11c07d676f130e6e28ab1611f4862a01a160389 (patch) | |
| tree | 043a4cf195feea7bac8e634275354dd2090da016 /camera/BaseCameraAdapter.cpp | |
| parent | 73ffa5e393306d8a574e1540c4e1027f9e55a7fc (diff) | |
| download | hardware_ti_omap4xxx-c11c07d676f130e6e28ab1611f4862a01a160389.zip hardware_ti_omap4xxx-c11c07d676f130e6e28ab1611f4862a01a160389.tar.gz hardware_ti_omap4xxx-c11c07d676f130e6e28ab1611f4862a01a160389.tar.bz2 | |
CameraHal: Fixes for #testVideoSnapshot
1. Add raw notify callback for video snapshot
2. Add new state for video capture + AF
3. We were not populating focal length correctly for jhead. Need to send
focal length as a rational in this format "xx/yy"
4. Need to send GPSProcessingMethod as an UNDEFINED ASCII to jhead
b/5448171
Change-Id: Ie6be9ad821d1fa106d9c857681f2fa6427d4f283
Signed-off-by: Tyler Luu <tluu@ti.com>
Diffstat (limited to 'camera/BaseCameraAdapter.cpp')
| -rw-r--r-- | camera/BaseCameraAdapter.cpp | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/camera/BaseCameraAdapter.cpp b/camera/BaseCameraAdapter.cpp index 9670e4c..28dc5e5 100644 --- a/camera/BaseCameraAdapter.cpp +++ b/camera/BaseCameraAdapter.cpp @@ -1942,6 +1942,12 @@ status_t BaseCameraAdapter::setState(CameraCommands operation) mNextState = PREVIEW_STATE; break; + case CAMERA_PERFORM_AUTOFOCUS: + CAMHAL_LOGDB("Adapter state switch VIDEO_STATE->VIDEO_AF_STATE event = 0x%x", + operation); + mNextState = VIDEO_AF_STATE; + break; + case CAMERA_START_SMOOTH_ZOOM: CAMHAL_LOGDB("Adapter state switch VIDEO_STATE->VIDEO_ZOOM_STATE event = 0x%x", operation); @@ -1970,6 +1976,27 @@ status_t BaseCameraAdapter::setState(CameraCommands operation) break; + case VIDEO_AF_STATE: + + switch ( operation ) + { + + case CAMERA_CANCEL_AUTOFOCUS: + CAMHAL_LOGDB("Adapter state switch VIDEO_AF_STATE->VIDEO_STATE event = 0x%x", + operation); + mNextState = VIDEO_STATE; + break; + + default: + CAMHAL_LOGEB("Adapter state switch VIDEO_AF_STATE Invalid Op! event = 0x%x", + operation); + ret = INVALID_OPERATION; + break; + + } + + break; + case VIDEO_LOADED_CAPTURE_STATE: switch ( operation ) |