diff options
| author | Jeongmo Yang <jm80.yang@samsung.com> | 2022-11-08 07:10:51 +0900 |
|---|---|---|
| committer | Jeongmo Yang <jm80.yang@samsung.com> | 2022-11-08 07:10:57 +0900 |
| commit | 674cc827a7524f3d05d54e6aa09ab1c7c4731a87 (patch) | |
| tree | 3260cf41874b9a8bdff977040edb73c4d2aefdbf | |
| parent | e1bb1efea2ae0a5e6925e7f3adb8fe07a78897e9 (diff) | |
| parent | 840df3b23ee51b68229d1fab60447df2b43d36e7 (diff) | |
| download | camera-674cc827a7524f3d05d54e6aa09ab1c7c4731a87.tar.gz camera-674cc827a7524f3d05d54e6aa09ab1c7c4731a87.tar.bz2 camera-674cc827a7524f3d05d54e6aa09ab1c7c4731a87.zip | |
Merge branch 'tizen' into tizen_7.0accepted/tizen/7.0/unified/20221110.061422accepted/tizen/7.0/unified/20221109.171221
Change-Id: I0d163632f97d2624e88a23a340a12203b1083986
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
| -rw-r--r-- | include/camera_private.h | 4 | ||||
| -rw-r--r-- | packaging/capi-media-camera.spec | 3 | ||||
| -rw-r--r-- | src/camera.c | 2 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/camera_test_headed.c | 1 |
5 files changed, 6 insertions, 6 deletions
diff --git a/include/camera_private.h b/include/camera_private.h index 69a01f3..40cbf5e 100644 --- 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 94be33d..5ace965 100644 --- 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.94 +Version: 0.4.96 Release: 0 Group: Multimedia/API License: Apache-2.0 @@ -19,7 +19,6 @@ BuildRequires: pkgconfig(capi-media-tool) BuildRequires: pkgconfig(libtbm) BuildRequires: pkgconfig(appcore-efl) BuildRequires: pkgconfig(elementary) -BuildRequires: pkgconfig(ecore) BuildRequires: pkgconfig(evas) Requires(post): /sbin/ldconfig diff --git a/src/camera.c b/src/camera.c index 5bc1b69..71e1bf7 100644 --- 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; diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index bc0f09d..807a61d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -9,7 +9,7 @@ SET(COMMON_SRC_NAME "camera_test.c") SET(fw_test_headed "${fw_test}-headed") INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(${fw_test_headed} REQUIRED elementary evas ecore appcore-efl libtbm) +PKG_CHECK_MODULES(${fw_test_headed} REQUIRED elementary evas appcore-efl libtbm) FOREACH(flag ${${fw_test_headed}_CFLAGS}) SET(EXTRA_CFLAGS_HEADED "${EXTRA_CFLAGS_HEADED} ${flag}") MESSAGE(${flag}) diff --git a/test/camera_test_headed.c b/test/camera_test_headed.c index a88255a..4dac241 100644 --- a/test/camera_test_headed.c +++ b/test/camera_test_headed.c @@ -18,7 +18,6 @@ * limitations under the License. * */ -#include <Ecore.h> #include <Elementary.h> #include <appcore-efl.h> #include "camera_test.h" |