Change timeout for waiting response

[Version] 0.2.87
[Profile] Common
[Issue Type] Update
[Dependency module] N/A
[Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=]

Change-Id: Ifb06f8930800de4a9f6e9dbada9aa5afd23733af
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/include/camera_private.h b/include/camera_private.h
index e197cb1..5cd5337 100644 (file)
--- a/include/camera_private.h
+++ b/include/camera_private.h
@@ -34,8 +34,7 @@ extern "C" {
 #endif /* BUFFER_MAX_PLANE_NUM */
 
 #define BUFFER_MAX_PLANE_NUM     4
-#define CAMERA_CB_TIMEOUT        5
-#define CAMERA_CB_TIMEOUT_LONG   8
+#define CAMERA_CB_TIMEOUT        4
 
 #define CAMERA_MSG_PARAM_SET(param, msg_type, set_value) { \
        param.type = MUSE_TYPE_##msg_type; \

diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec
index 1c17134..f29f917 100644 (file)
--- a/packaging/capi-media-camera.spec
+++ b/packaging/capi-media-camera.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-camera
 Summary:    A Camera API
-Version:    0.2.86
+Version:    0.2.87
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/camera.c b/src/camera.c
index 188fabc..b4f152d 100644 (file)
--- a/src/camera.c
+++ b/src/camera.c
@@ -2641,7 +2641,7 @@ int camera_start_preview(camera_h camera)
 
        LOGD("Enter");
 
-       _camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT_LONG);
+       _camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
        if (ret == CAMERA_ERROR_NONE && CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) {
                ret = _camera_start_evas_rendering(camera);
                if (ret != CAMERA_ERROR_NONE) {

diff --git a/test/camera_test.c b/test/camera_test.c
index 1d3b608..e2ae643 100644 (file)
--- a/test/camera_test.c
+++ b/test/camera_test.c
@@ -783,6 +783,8 @@ static void main_menu(gchar buf)
                        hcamcorder->menu_state = MENU_STATE_SETTING;
                        break;
                case '4': /* Change device (Rear <-> Front) */
+                       camera_set_display_reuse_hint(hcamcorder->camera, true);
+
                        camera_stop_preview(hcamcorder->camera);
 
                        if (hcamcorder->type == CAMERA_DEVICE_CAMERA0) {