diff options
| author | Jeongmo Yang <jm80.yang@samsung.com> | 2017-05-18 21:09:58 +0900 |
|---|---|---|
| committer | Jeongmo Yang <jm80.yang@samsung.com> | 2017-05-19 10:53:52 +0900 |
| commit | 2543d8cbaa4dcfd802b410b9f5345fc8e3b957e2 (patch) | |
| tree | fbcdd255a56afb961c1a240d80233d375949e38d | |
| parent | 4294cc5245b9b4c14322ae409db1ce8418c40752 (diff) | |
| download | camera-2543d8cbaa4dcfd802b410b9f5345fc8e3b957e2.tar.gz camera-2543d8cbaa4dcfd802b410b9f5345fc8e3b957e2.tar.bz2 camera-2543d8cbaa4dcfd802b410b9f5345fc8e3b957e2.zip | |
Update code for privilege changesubmit/tizen/20170612.030116accepted/tizen/unified/20170612.073914
camera privilege is removed from camera_create
and it will be checked in camera_start_preview API.
So, camera_start_preview could not be returned until get user's response.
[Version] 0.3.1
[Profile] Common
[Issue Type] Update
[Dependency module] N/A
Change-Id: Ic0409fdb46315a20ed78165b7080dd016a42b367
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
| -rw-r--r-- | packaging/capi-media-camera.spec | 2 | ||||
| -rw-r--r-- | src/camera.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec index 2a3b0e4..51b0ac8 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.3.0 +Version: 0.3.1 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/camera.c b/src/camera.c index 4e83dec..6b999f6 100644 --- a/src/camera.c +++ b/src/camera.c @@ -2560,7 +2560,7 @@ int camera_create(camera_device_e device, camera_h *camera) LOGD("cb info : %d", pc->cb_info->fd); - ret = _camera_client_wait_for_cb_return(api, pc->cb_info, CAMERA_CB_NO_TIMEOUT); + ret = _camera_client_wait_for_cb_return(api, pc->cb_info, CAMERA_CB_TIMEOUT); pc->cb_info->api_waiting[MUSE_CAMERA_API_CREATE] = 0; @@ -2689,7 +2689,7 @@ int camera_start_preview(camera_h camera) LOGD("Enter"); - _camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_TIMEOUT); + _camera_msg_send(api, pc->cb_info, &ret, CAMERA_CB_NO_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) { |