diff options
| author | Emilian Peev <epeev@mm-sol.com> | 2011-09-14 17:16:11 +0300 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-07-25 08:55:35 -0500 |
| commit | d45b9f865e062490eac128c5817fa9b73b8aa0e4 (patch) | |
| tree | 11c790ceb424cce97fd458ce2f5646f36697673f /test | |
| parent | 99709df225531801a91561a0134fa79ced48c78f (diff) | |
| download | hardware_ti_omap4-d45b9f865e062490eac128c5817fa9b73b8aa0e4.zip hardware_ti_omap4-d45b9f865e062490eac128c5817fa9b73b8aa0e4.tar.gz hardware_ti_omap4-d45b9f865e062490eac128c5817fa9b73b8aa0e4.tar.bz2 | |
Camera_test: Adds support for configurable AF timeout
- Can be set via "I" switch
- For tuning purposes
Signed-off-by: Dimitar Borisov <dborisov@mm-sol.com>
Signed-off-by: Vicky Martinez-DeFrain <a0869710@ti.com>
Change-Id: I155b9d0f9f7fac63c3e39d8faeea586d9e9b2587
Diffstat (limited to 'test')
| -rw-r--r-- | test/CameraHal/camera_test.h | 1 | ||||
| -rw-r--r-- | test/CameraHal/camera_test_menu.cpp | 14 | ||||
| -rw-r--r-- | test/CameraHal/camera_test_script.cpp | 8 |
3 files changed, 23 insertions, 0 deletions
diff --git a/test/CameraHal/camera_test.h b/test/CameraHal/camera_test.h index ad750ff..ffd36f9 100644 --- a/test/CameraHal/camera_test.h +++ b/test/CameraHal/camera_test.h @@ -36,6 +36,7 @@ #define KEY_STEREO_CAMERA "s3d-supported" #define KEY_EXIF_MODEL "exif-model" #define KEY_EXIF_MAKE "exif-make" +#define KEY_AF_TIMEOUT "af-timeout" #define KEY_AUTO_EXPOSURE_LOCK "auto-exposure-lock" #define KEY_AUTO_WHITEBALANCE_LOCK "auto-whitebalance-lock" diff --git a/test/CameraHal/camera_test_menu.cpp b/test/CameraHal/camera_test_menu.cpp index 84cf4e9..f8a5342 100644 --- a/test/CameraHal/camera_test_menu.cpp +++ b/test/CameraHal/camera_test_menu.cpp @@ -93,6 +93,7 @@ int prevcnt = 0; int videoFd = -1; int elockidx = 0; int wblockidx = 0; +int afTimeoutIdx = 0; char dir_path[80] = SDCARD_PATH; @@ -104,6 +105,7 @@ const char *expBracketingRange[] = {"", "-30,0,30,0,-30"}; const char *tempBracketing[] = {"disable", "enable"}; const char *faceDetection[] = {"disable", "enable"}; const char *lock[] = {"false", "true"}; +const char *afTimeout[] = {"enable", "disable" }; #if defined(OMAP_ENHANCEMENT) && defined(TARGET_OMAP3) const char *ipp_mode[] = { "off", "Chroma Suppression", "Edge Enhancement" }; @@ -1117,6 +1119,7 @@ void initDefaults() { antibanding_mode = 0; focus_mode = 0; fpsRangeIdx = 0; + afTimeoutIdx = 0; previewSizeIDX = 1; /* Default resolution set to WVGA */ captureSizeIDX = 3; /* Default capture resolution is 8MP */ frameRateIDX = ARRAY_SIZE(fpsConstRanges) - 1; /* Default frame rate is 30 FPS */ @@ -1362,6 +1365,7 @@ int functional_menu() { printf(" T. Stop face detection \n"); printf(" G. Touch/Focus area AF\n"); printf(" f. Auto Focus/Half Press\n"); + printf(" I. AF Timeout %s\n", afTimeout[afTimeoutIdx]); printf(" J.Flash: %s\n", flashModes[flashIdx]); printf(" 7. EV offset: %4.1f\n", compensation); printf(" 8. AWB mode: %s\n", strawb_mode[awb_mode]); @@ -1735,6 +1739,16 @@ int functional_menu() { break; + case 'I': + afTimeoutIdx++; + afTimeoutIdx %= ARRAY_SIZE(afTimeout); + params.set(KEY_AF_TIMEOUT, afTimeout[afTimeoutIdx]); + + if ( hardwareActive ) + camera->setParameters(params.flatten()); + + break; + case 'T': if ( hardwareActive ) diff --git a/test/CameraHal/camera_test_script.cpp b/test/CameraHal/camera_test_script.cpp index 36dd58f..9b13087 100644 --- a/test/CameraHal/camera_test_script.cpp +++ b/test/CameraHal/camera_test_script.cpp @@ -583,6 +583,14 @@ int execute_functional_script(char *script) { break; + case 'I': + params.set(KEY_AF_TIMEOUT, (cmd + 1)); + + if ( hardwareActive ) + camera->setParameters(params.flatten()); + + break; + case 'T': if ( hardwareActive ) |