summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitar Borisov <x0152684@ti.com>2012-08-23 14:34:20 +0300
committerDaniel Levin <dendy@ti.com>2012-12-05 15:44:54 +0200
commitf31faef4c309412049a5916e002ec4d1cf32a958 (patch)
tree993542d730c51d2b7b6d58ed1cccd481aac137e3
parent558822acbb1b2a02c22979f22ef3fe928ef564f5 (diff)
downloadhardware_ti_omap4-f31faef4c309412049a5916e002ec4d1cf32a958.zip
hardware_ti_omap4-f31faef4c309412049a5916e002ec4d1cf32a958.tar.gz
hardware_ti_omap4-f31faef4c309412049a5916e002ec4d1cf32a958.tar.bz2
camera_test: Camera test handling of Ducati exceptions
Fixes an issue with Ducati exeptions handling Change-Id: I3508b846968191d0be0a606b3b02119ba6c06d42 Signed-off-by: Dimitar Borisov <x0152684@ti.com>
-rw-r--r--test/CameraHal/camera_test_menu.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/test/CameraHal/camera_test_menu.cpp b/test/CameraHal/camera_test_menu.cpp
index 51edcf1..c4e8ec9 100644
--- a/test/CameraHal/camera_test_menu.cpp
+++ b/test/CameraHal/camera_test_menu.cpp
@@ -858,9 +858,7 @@ void CameraHandler::notify(int32_t msgType, int32_t ext1, int32_t ext2) {
if ( msgType & CAMERA_MSG_SHUTTER )
printf("Shutter done in %llu us\n", timeval_delay(&picture_start));
-
- if ( msgType & CAMERA_MSG_ERROR && (ext1 == 1))
- {
+ if ( msgType == 1) {
printf("Camera Test CAMERA_MSG_ERROR.....\n");
if (stressTest)
{
@@ -872,7 +870,7 @@ void CameraHandler::notify(int32_t msgType, int32_t ext1, int32_t ext2) {
printf("Camera Test Notified of Error Stopping.....\n");
stopScript =false;
stopPreview();
-
+ closeCamera();
if (recordingMode)
{
stopRecording();
@@ -4014,6 +4012,7 @@ int restartCamera() {
printf("+++Restarting Camera After Error+++\n");
stopPreview();
+ closeCamera();
if (recordingMode) {
stopRecording();