Remove condition of timeout for preview

[Version] 0.4.96
[Issue Type] Update

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

diff --git a/include/camera_private.h b/include/camera_private.h
index 69a01f3..40cbf5e 100644 (file)
--- a/include/camera_private.h
+++ b/include/camera_private.h
@@ -32,7 +32,9 @@ extern "C" {
 #endif
 
 #define CAMERA_CB_TIMEOUT                   4
-#define CAMERA_CB_NETWORK_PREVIEW_TIMEOUT   10
+#ifndef TIZEN_FEATURE_NO_TIMEOUT_FOR_PREVIEW
+#define CAMERA_CB_TIMEOUT_FOR_PREVIEW       10
+#endif
 #define CAMERA_CB_NO_TIMEOUT                0
 #define CAMERA_FD_INIT                      -1
 #define CAMERA_IS_FD_VALID(fd)              (fd > CAMERA_FD_INIT)

diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec
index 8142d3c..5ace965 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.4.95
+Version:    0.4.96
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/camera.c b/src/camera.c
index 5bc1b69..71e1bf7 100644 (file)
--- a/src/camera.c
+++ b/src/camera.c
@@ -2790,7 +2790,7 @@ int camera_start_preview(camera_h camera)
 #ifdef TIZEN_FEATURE_NO_TIMEOUT_FOR_PREVIEW
                CAMERA_CB_NO_TIMEOUT);
 #else
-               (pc->cb_info->is_network ? CAMERA_CB_NETWORK_PREVIEW_TIMEOUT : CAMERA_CB_TIMEOUT));
+               CAMERA_CB_TIMEOUT_FOR_PREVIEW);
 #endif
        if (ret != CAMERA_ERROR_NONE)
                goto _START_FAILED;