diff options
author | Jeongmo Yang <jm80.yang@samsung.com> | 2019-12-09 15:29:18 +0900 |
---|---|---|
committer | Jeongmo Yang <jm80.yang@samsung.com> | 2019-12-09 15:29:30 +0900 |
commit | 5d4cf95322dce528f5d2210fba9fe832971832b1 (patch) | |
tree | 1478323f4b2da30b5ffeb9a7f88cc0aac93cfed5 | |
parent | 4a0004e002da3f5022387741282295a635c79a51 (diff) | |
parent | 4edbbced453bd1a04e4c59462662d3838c0d1064 (diff) | |
download | mmsvc-camera-accepted/tizen_5.5_unified.tar.gz mmsvc-camera-accepted/tizen_5.5_unified.tar.bz2 mmsvc-camera-accepted/tizen_5.5_unified.zip |
Merge branch 'tizen' into tizen_5.5submit/tizen_5.5_wearable_hotfix/20201026.184304submit/tizen_5.5/20200107.013404submit/tizen_5.5/20191212.092802accepted/tizen/5.5/unified/wearable/hotfix/20201027.112556accepted/tizen/5.5/unified/20200107.111135tizen_5.5_wearable_hotfixaccepted/tizen_5.5_unified_wearable_hotfixaccepted/tizen_5.5_unified
Change-Id: Ie8f18a236c7941a56050e7fff933db124f135de7
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
-rw-r--r-- | muse/include/muse_camera_internal.h | 5 | ||||
-rw-r--r-- | muse/src/muse_camera_dispatcher.c | 17 | ||||
-rw-r--r-- | packaging/mmsvc-camera.spec | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/muse/include/muse_camera_internal.h b/muse/include/muse_camera_internal.h index cb087dd..2c8645d 100644 --- a/muse/include/muse_camera_internal.h +++ b/muse/include/muse_camera_internal.h @@ -30,8 +30,9 @@ extern "C" { #include <muse_camera.h> #include <legacy_camera_internal.h> -#define PREVIEW_CB_TYPE_USER 0x0000000F -#define PREVIEW_CB_TYPE_EVAS 0x000000F0 +#define PREVIEW_CB_TYPE_USER 0x0000000F +#define PREVIEW_CB_TYPE_EVAS 0x000000F0 +#define PREVIEW_CB_TYPE_MEDIA_PACKET 0x00000F00 #define CHECK_PREVIEW_CB(muse_camera, cb_type) ((muse_camera)->preview_cb_flag & cb_type) #define SET_PREVIEW_CB_TYPE(muse_camera, cb_type) ((muse_camera)->preview_cb_flag |= cb_type) diff --git a/muse/src/muse_camera_dispatcher.c b/muse/src/muse_camera_dispatcher.c index 8bc18ad..a9ee803 100644 --- a/muse/src/muse_camera_dispatcher.c +++ b/muse/src/muse_camera_dispatcher.c @@ -1154,16 +1154,12 @@ void _camera_dispatcher_preview_cb(MMCamcorderVideoStreamDataType *stream, void muse_core_msg_free(send_message); - /*LOGD("wait preview callback return message");*/ - - if (!CHECK_PREVIEW_CB(muse_camera, PREVIEW_CB_TYPE_EVAS) && send_ret > 0) { + if (stream->bo[0] && send_ret > 0 && + CHECK_PREVIEW_CB(muse_camera, PREVIEW_CB_TYPE_USER) && + CHECK_PREVIEW_CB(muse_camera, PREVIEW_CB_TYPE_MEDIA_PACKET)) { gint64 end_time = g_get_monotonic_time() + G_TIME_SPAN_SECOND; - - if (!g_cond_wait_until(&muse_camera->preview_cb_cond, &muse_camera->preview_cb_lock, end_time)) { + if (!g_cond_wait_until(&muse_camera->preview_cb_cond, &muse_camera->preview_cb_lock, end_time)) LOGW("preview callback return message timeout"); - } else { - /*LOGD("preview callback return message received");*/ - } } g_mutex_unlock(&muse_camera->preview_cb_lock); @@ -1457,8 +1453,11 @@ static void __camera_task_process_job(muse_camera_handle_s *muse_camera, muse_ca ret = legacy_camera_set_media_packet_preview_cb(muse_camera->camera_handle, (camera_preview_cb)_camera_dispatcher_preview_cb, (void *)muse_camera->module); + if (ret == CAMERA_ERROR_NONE) + SET_PREVIEW_CB_TYPE(muse_camera, PREVIEW_CB_TYPE_MEDIA_PACKET); break; case MUSE_CAMERA_API_UNSET_MEDIA_PACKET_PREVIEW_CB: + UNSET_PREVIEW_CB_TYPE(muse_camera, PREVIEW_CB_TYPE_MEDIA_PACKET); ret = legacy_camera_unset_media_packet_preview_cb(muse_camera->camera_handle); break; default: @@ -1617,7 +1616,7 @@ int camera_dispatcher_create(muse_module_h module) muse_camera_api_class_e class = MUSE_CAMERA_API_CLASS_IMMEDIATE; muse_camera_msg_get(device_type, muse_server_module_get_msg(module)); - muse_camera_msg_get(pid, muse_server_module_get_msg(module)); + pid = muse_server_ipc_get_client_pid(module); LOGD("device type : %d, client pid : %d", device_type, pid); diff --git a/packaging/mmsvc-camera.spec b/packaging/mmsvc-camera.spec index 2f1e4c8..4631b98 100644 --- a/packaging/mmsvc-camera.spec +++ b/packaging/mmsvc-camera.spec @@ -1,6 +1,6 @@ Name: mmsvc-camera Summary: A Camera module for muse server -Version: 0.3.25 +Version: 0.3.27 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 |