diff options
| author | Jeongmo Yang <jm80.yang@samsung.com> | 2015-11-17 12:03:43 +0900 |
|---|---|---|
| committer | Jeongmo Yang <jm80.yang@samsung.com> | 2015-11-17 12:36:23 +0900 |
| commit | d90e458ccfdce23b9727f60a4369c781c00fcc06 (patch) | |
| tree | fa9b35e0ce6834f5522495daf0a3996cba91de8e /include | |
| parent | bfd24de0578fa53277428826732e00b2935d9c02 (diff) | |
| download | camera-accepted/tizen/tv/20151117.093920.tar.gz camera-accepted/tizen/tv/20151117.093920.tar.bz2 camera-accepted/tizen/tv/20151117.093920.zip | |
Release version 0.2.22submit/tizen/20151117.053652accepted/tizen/wearable/20151117.093927accepted/tizen/tv/20151117.093920accepted/tizen/mobile/20151117.093901
1. Update code for message handling
- Fix TC : Timeout return in case of calling another API in foreach callback
Change-Id: I3982e67055499184a6cad796b44757105468dda0
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera_private.h | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/include/camera_private.h b/include/camera_private.h index 913b9f8..905e2d7 100644 --- a/include/camera_private.h +++ b/include/camera_private.h @@ -56,40 +56,44 @@ typedef struct _camera_cb_data { typedef struct _callback_cb_info { GThread *msg_rcv_thread; - GThread *event_thread; + GThread *message_handler_thread; gint rcv_thread_running; - gint event_thread_running; + gint message_handler_running; gint fd; gint id; gpointer user_cb[MUSE_CAMERA_EVENT_TYPE_NUM]; gpointer user_cb_completed[MUSE_CAMERA_EVENT_TYPE_NUM]; gpointer user_data[MUSE_CAMERA_EVENT_TYPE_NUM]; - gchar recvMsg[MUSE_CAMERA_MSG_MAX_LENGTH]; - gchar recvApiMsg[MUSE_CAMERA_MSG_MAX_LENGTH]; - gchar recvEventMsg[MUSE_CAMERA_MSG_MAX_LENGTH]; + gchar recv_msg[MUSE_CAMERA_MSG_MAX_LENGTH]; GCond *pCond; GMutex *pMutex; - GCond event_cond; - GMutex event_mutex; + GCond message_handler_cond; + GMutex message_handler_mutex; GList *idle_event_list; GCond idle_event_cond; GMutex idle_event_mutex; gint *activating; + gint *ret; tbm_bufmgr bufmgr; - GQueue *event_queue; + GQueue *message_queue; gint prev_state; media_format_h pkt_fmt; } callback_cb_info_s; +typedef struct _camera_message_s { + gchar recv_msg[MUSE_CAMERA_MSG_MAX_LENGTH]; + muse_camera_api_e api; +} camera_message_s; + typedef struct _camera_event_s { callback_cb_info_s *cb_info; - gchar recvMsg[MUSE_CAMERA_MSG_MAX_LENGTH]; + gchar recv_msg[MUSE_CAMERA_MSG_MAX_LENGTH]; muse_camera_event_e event; } camera_event_s; typedef struct _camera_idle_event_s { callback_cb_info_s *cb_info; - gchar recvMsg[MUSE_CAMERA_MSG_MAX_LENGTH]; + gchar recv_msg[MUSE_CAMERA_MSG_MAX_LENGTH]; muse_camera_event_e event; GMutex event_mutex; } camera_idle_event_s; |