diff options
author | ty83.chung <ty83.chung@samsung.com> | 2015-01-15 10:51:54 +0900 |
---|---|---|
committer | Jeongmo Yang <jm80.yang@samsung.com> | 2015-01-15 15:00:22 +0900 |
commit | 35c0cbe525ced1bc6dc4d2abc4a16c26247b2751 (patch) | |
tree | d403a7f94d0a9fd8e3ee076f49ad19f0abc5113a /include/camera_private.h | |
parent | ee51fbcb94cc80c037acc9860e813dd95334cc57 (diff) | |
download | camera-tizen_3.0.2014.q4_common.tar.gz camera-tizen_3.0.2014.q4_common.tar.bz2 camera-tizen_3.0.2014.q4_common.zip |
1. Remove TC and test directoriessubmit/tizen_mobile/20150119.020413submit/tizen/20150115.085052accepted/tizen/wearable/20150116.010321accepted/tizen/tv/20150116.010654accepted/tizen/mobile/20150119.023402accepted/tizen/common/20150115.180942tizen_3.0.2015.q1_commontizen_3.0.2014.q4_common
2. Remove face_zoom API
3. Remove deprecated APIs related to hdr_capture
4. Add or fix comments of APIs on header files
5. Add new APIs to support media packet
6. Fix build error on 64bit build
Change-Id: Ia3742af9a162f59fe81c88ab63ca93fb6467c6d8
Diffstat (limited to 'include/camera_private.h')
-rw-r--r--[-rwxr-xr-x] | include/camera_private.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/include/camera_private.h b/include/camera_private.h index 4b43ae6..0e27f59 100755..100644 --- a/include/camera_private.h +++ b/include/camera_private.h @@ -34,14 +34,21 @@ typedef enum { _CAMERA_EVENT_TYPE_FOCUS_CHANGE, _CAMERA_EVENT_TYPE_CAPTURE_COMPLETE, _CAMERA_EVENT_TYPE_PREVIEW, + _CAMERA_EVENT_TYPE_MEDIA_PACKET_PREVIEW, _CAMERA_EVENT_TYPE_CAPTURE, _CAMERA_EVENT_TYPE_ERROR, _CAMERA_EVENT_TYPE_HDR_PROGRESS, _CAMERA_EVENT_TYPE_INTERRUPTED, _CAMERA_EVENT_TYPE_FACE_DETECTION, + _CAMERA_EVENT_TYPE_VIDEO_FRAME_RENDER_ERROR, _CAMERA_EVENT_TYPE_NUM }_camera_event_e; +typedef struct _camera_cb_data { + int event_type; + void *handle; +} camera_cb_data; + typedef struct _camera_s{ MMHandleType mm_handle; @@ -49,7 +56,7 @@ typedef struct _camera_s{ void* user_data[_CAMERA_EVENT_TYPE_NUM]; void* display_handle; camera_display_type_e display_type; - int state; + unsigned int state; MMMessageCallback relay_message_callback; void* relay_user_data; @@ -68,6 +75,10 @@ typedef struct _camera_s{ bool is_used_in_recorder; bool on_continuous_focusing; int cached_focus_mode; + media_format_h pkt_fmt; + + GList *cb_data_list; + GMutex idle_cb_lock; } camera_s; int _camera_get_mm_handle(camera_h camera , MMHandleType *handle); @@ -75,6 +86,11 @@ int _camera_set_relay_mm_message_callback(camera_h camera, MMMessageCallback cal int __camera_start_continuous_focusing(camera_h camera); int _camera_set_use(camera_h camera, bool used); bool _camera_is_used(camera_h camera); +void _camera_remove_cb_message(camera_s *handle); +int _camera_get_tbm_surface_format(int in_format, uint32_t *out_format); +int _camera_get_media_packet_mimetype(int in_format, media_format_mimetype_e *mimetype); +int _camera_media_packet_finalize(media_packet_h pkt, int error_code, void *user_data); +int __convert_camera_error_code(const char* func, int code); #ifdef __cplusplus } |