#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#include <mm.h>
#include <mm_types.h>
-#include <camera.h>
-#include <muse_camera.h>
+#include <mm_camcorder.h>
#include <muse_camera_msg.h>
#include <camera_private.h>
-#include <muse_core.h>
#include <muse_client.h>
-#include <dlog.h>
-#include <tbm_surface_internal.h>
#include <gio/gio.h>
+#include <dlfcn.h>
#ifdef LOG_TAG
#undef LOG_TAG
#endif
-#define LOG_TAG "TIZEN_N_CAMERA"
-#define MODULE_NAME "camera"
+#define LOG_TAG "TIZEN_N_CAMERA"
+#define MODULE_NAME "camera"
+
/* for device changed callback */
static GMutex g_cam_dev_state_changed_cb_lock;
static guint g_cam_dev_state_changed_cb_subscribe_id;
static GMutex g_cam_idle_event_lock;
-static void _camera_msg_send(int api, int *fds, camera_cb_info_s *cb_info,
- int *ret, int timeout);
-static void _camera_msg_send_param1(int api, camera_cb_info_s *cb_info,
- int *ret, camera_msg_param *param, int timeout);
-static void _camera_msg_send_param2_int(int api, camera_cb_info_s *cb_info,
- int *ret, camera_msg_param *param0, camera_msg_param *param1, int timeout);
-static void _camera_msg_return_buffer(int ret_fd, camera_cb_info_s *cb_info);
-static bool _camera_import_tbm_fd(tbm_bufmgr bufmgr, int fd, tbm_bo *bo, tbm_bo_handle *bo_handle);
-static void _camera_release_imported_bo(tbm_bo *bo);
-static void _camera_preview_frame_create(camera_stream_data_s *stream, int num_buffer_fd,
- tbm_bo_handle *buffer_bo_handle, tbm_bo_handle *data_bo_handle, camera_preview_data_s *frame);
-static int _camera_media_packet_create(camera_cb_info_s *cb_info, camera_stream_data_s *stream,
+/* log level */
+static int g_camera_log_level = CAMERA_LOG_LEVEL_INFO;
+
+static bool __camera_import_tbm_fd(tbm_bufmgr bufmgr, int fd, tbm_bo *bo, tbm_bo_handle *bo_handle);
+static void __camera_release_imported_bo(tbm_bo *bo);
+
+static int __camera_create_media_packet(camera_cb_info_s *cb_info, MMCamcorderVideoStreamDataType *stream,
camera_media_packet_data *mp_data, media_packet_h *packet);
-static int _camera_media_packet_data_create(int ret_fd, int *tfd, int num_buffer_fd, tbm_bo bo,
+static int __camera_create_media_packet_data(int ret_fd, int *tfd, int num_buffer_fd, tbm_bo bo,
tbm_bo *buffer_bo, tbm_bo data_bo, camera_media_packet_data **mp_data);
-static void _camera_media_packet_data_release(camera_media_packet_data *mp_data, camera_cb_info_s *cb_info);
-static gboolean _camera_allocate_preview_buffer(camera_h camera);
-static void _camera_release_preview_buffer(camera_h camera);
+static void __camera_release_media_packet_data(camera_media_packet_data *mp_data, camera_cb_info_s *cb_info);
+
+static gboolean __camera_allocate_preview_buffer(camera_h camera);
+static void __camera_release_preview_buffer(camera_h camera);
+static void __camera_release_tfd(int tfd[MUSE_NUM_FD]);
+
+static bool __create_msg_handler_thread(camera_msg_handler_info_s *handler_info,
+ int type, const char *thread_name, camera_cb_info_s *cb_info);
+static void __destroy_msg_handler_thread(camera_msg_handler_info_s *handler_info);
-static gboolean _camera_allocate_preview_buffer(camera_h camera)
+//LCOV_EXCL_START
+static gboolean __camera_allocate_preview_buffer(camera_h camera)
{
int i = 0;
int ret = CAMERA_ERROR_NONE;
camera_cli_s *pc = (camera_cli_s *)camera;
camera_cb_info_s *cb_info = NULL;
- if (!pc || !pc->cb_info) {
- LOGE("invalid pointer %p %p", pc, pc ? pc->cb_info : NULL);
- return FALSE;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, FALSE);
cb_info = pc->cb_info;
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
/* get preview info and calculate size */
ret = camera_get_preview_format(camera, &format);
if (ret != CAMERA_ERROR_NONE) {
- LOGE("get preview format failed 0x%x", ret);
+ CAM_LOG_ERROR("get preview format failed 0x%x", ret);
return FALSE;
}
ret = camera_get_preview_resolution(camera, &width, &height);
if (ret != CAMERA_ERROR_NONE) {
- LOGE("get preview resolution failed 0x%x", ret);
+ CAM_LOG_ERROR("get preview resolution failed 0x%x", ret);
return FALSE;
}
- LOGD("preview %dx%d, format %d", width, height, format);
+ CAM_LOG_INFO("preview %dx%d, format %d", width, height, format);
switch (format) {
case CAMERA_PIXEL_FORMAT_INVZ:
buffer_size = width * height * 2;
break;
default:
- LOGE("unhandled format %d", format);
+ CAM_LOG_ERROR("unhandled format %d", format);
goto _ALLOCATE_PREVIEW_BUFFER_FAILED;
}
- LOGD("buffer size %d, num %d", buffer_size, MUSE_NUM_FD);
+ CAM_LOG_INFO("buffer size %d, num %d", buffer_size, MUSE_NUM_FD);
for (i = 0 ; i < MUSE_NUM_FD ; i++) {
cb_info->bos[i] = tbm_bo_alloc(cb_info->bufmgr, buffer_size, TBM_BO_DEFAULT);
if (!cb_info->bos[i]) {
- LOGE("bo alloc failed [%d,i:%d]", buffer_size, i);
+ CAM_LOG_ERROR("bo alloc failed [%d,i:%d]", buffer_size, i);
goto _ALLOCATE_PREVIEW_BUFFER_FAILED;
}
cb_info->fds[i] = tbm_bo_export_fd(cb_info->bos[i]);
if (cb_info->fds[i] < 0) {
- LOGE("export fd failed [%d,i:%d] errno %d", buffer_size, i, errno);
+ CAM_LOG_ERROR("export fd failed [%d,i:%d] errno %d", buffer_size, i, errno);
goto _ALLOCATE_PREVIEW_BUFFER_FAILED;
}
- LOGD("bo %p, fd %d", cb_info->bos[i], cb_info->fds[i]);
+ CAM_LOG_INFO("bo %p, fd %d", cb_info->bos[i], cb_info->fds[i]);
}
- LOGD("Done");
+ CAM_LOG_INFO("Done");
return TRUE;
_ALLOCATE_PREVIEW_BUFFER_FAILED:
- _camera_release_preview_buffer(camera);
+ __camera_release_preview_buffer(camera);
return FALSE;
}
-static void _camera_release_preview_buffer(camera_h camera)
+static void __camera_release_preview_buffer(camera_h camera)
{
int i = 0;
camera_cli_s *pc = (camera_cli_s *)camera;
camera_cb_info_s *cb_info = NULL;
- if (!pc || !pc->cb_info) {
- LOGE("invalid pointer %p %p", pc, pc ? pc->cb_info : NULL);
- return;
- }
+ CAMERA_CHECK_HANDLE_RETURN(pc);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
cb_info = pc->cb_info;
/* close exported fd and bos */
for (i = 0 ; i < MUSE_NUM_FD ; i++) {
- LOGD("unref bo %p, close fd %d", cb_info->bos[i], cb_info->fds[i]);
+ CAM_LOG_INFO("unref bo %p, close fd %d", cb_info->bos[i], cb_info->fds[i]);
if (cb_info->bos[i]) {
tbm_bo_unref(cb_info->bos[i]);
break;
}
- if (cb_info->fds[i] >= 0) {
+ if (CAMERA_IS_FD_VALID(cb_info->fds[i])) {
close(cb_info->fds[i]);
- cb_info->fds[i] = -1;
+ cb_info->fds[i] = CAMERA_FD_INIT;
}
}
- LOGD("Done");
+ CAM_LOG_INFO("Done");
+}
+//LCOV_EXCL_STOP
+
+static void __camera_release_tfd(int tfd[MUSE_NUM_FD])
+{
+ int i;
+
+ if (!tfd) {
+ CAM_LOG_WARNING("NULL tfd");
+ return;
+ }
+
+ for (i = 0 ; i < MUSE_NUM_FD ; i++) {
+ if (!CAMERA_IS_FD_VALID(tfd[i]))
+ break;
- return;
+ close(tfd[i]);
+ tfd[i] = CAMERA_FD_INIT;
+ }
}
-static void __camera_update_api_waiting(camera_cb_info_s *cb_info, int api, int value)
+void _camera_update_api_waiting(camera_cb_info_s *cb_info, int api, int value)
{
if (!cb_info ||
api < 0 || api >= MUSE_CAMERA_API_MAX) {
- LOGE("invalid param %p %d", cb_info, api);
+ CAM_LOG_ERROR("invalid param %p %d", cb_info, api);
return;
}
cb_info->api_waiting[api] += value;
g_mutex_unlock(&(cb_info->api_mutex[api]));
- /*LOGD("api %d, value %d, waiting %d",
- api, value, cb_info->api_waiting[api]);*/
-
- return;
+ CAM_LOG_DEBUG("api[%d], value[%d], waiting[%d]",
+ api, value, cb_info->api_waiting[api]);
}
g_mutex_lock(&g_cam_dev_state_changed_cb_lock);
if (!g_cam_dev_state_changed_cb_list || !param) {
- LOGW("no callback or NULL param %p", param);
+ CAM_LOG_WARNING("no callback or NULL param %p", param);
goto _DONE;
}
device = value >> 16;
state = 0x0000ffff & value;
- LOGD("device %d, state %d", device, state);
+ CAM_LOG_INFO("device %d, state %d", device, state);
tmp_list = g_cam_dev_state_changed_cb_list;
if (info) {
if (info->callback) {
- LOGD("start id[%d] callback", info->id);
+ CAM_LOG_INFO("start id[%d] callback", info->id);
((camera_device_state_changed_cb)info->callback)(device, state, info->user_data);
- LOGD("returned id[%d] callback", info->id);
+ CAM_LOG_INFO("returned id[%d] callback", info->id);
} else {
- LOGW("NULL callback for id %d", info->id);
+ CAM_LOG_WARNING("NULL callback for id %d", info->id);
}
}
_DONE:
g_mutex_unlock(&g_cam_dev_state_changed_cb_lock);
+}
+
+
+static void __camera_preview_cb_monitoring_info_sub_reset(monitoring_info_sub_s *info_sub)
+{
+ if (!info_sub) {
+ CAM_LOG_ERROR("NULL info_sub");
+ return;
+ }
+
+ info_sub->frame_count = 0;
+ info_sub->elapsed_sec_accum = 0.0;
+ info_sub->elapsed_sec_peak = 0.0;
+}
+
+
+static void __camera_preview_cb_monitoring_info_reset(camera_preview_cb_monitoring_info_s *info)
+{
+ if (!info) {
+ CAM_LOG_ERROR("NULL info");
+ return;
+ }
+
+ __camera_preview_cb_monitoring_info_sub_reset(info->total);
+ __camera_preview_cb_monitoring_info_sub_reset(info->interval);
+}
+
+
+static void __camera_preview_cb_monitoring_info_start(camera_preview_cb_monitoring_info_s *info)
+{
+ if (!info) {
+ CAM_LOG_ERROR("NULL info");
+ return;
+ }
+
+ g_timer_start(info->timer_calling);
+
+ if (info->interval->frame_count == 0)
+ g_timer_start(info->timer_interval);
+}
+
+
+static void __camera_preview_cb_monitoring_info_sub_update(monitoring_info_sub_s *info_sub, gdouble elapsed_sec)
+{
+ if (!info_sub) {
+ CAM_LOG_ERROR("NULL info_sub");
+ return;
+ }
+
+ info_sub->frame_count++;
+ info_sub->elapsed_sec_accum += elapsed_sec;
+
+ if (info_sub->elapsed_sec_peak < elapsed_sec)
+ info_sub->elapsed_sec_peak = elapsed_sec;
+}
+
+
+static void __camera_preview_cb_monitoring_info_end(camera_preview_cb_monitoring_info_s *info)
+{
+ gdouble elapsed_sec = 0.0;
+ gdouble elapsed_sec_interval = 0.0;
+
+ if (!info) {
+ CAM_LOG_ERROR("NULL info");
+ return;
+ }
- return;
+ elapsed_sec = g_timer_elapsed(info->timer_calling, NULL);
+ elapsed_sec_interval = g_timer_elapsed(info->timer_interval, NULL);
+
+ __camera_preview_cb_monitoring_info_sub_update(info->total, elapsed_sec);
+ __camera_preview_cb_monitoring_info_sub_update(info->interval, elapsed_sec);
+
+ if (elapsed_sec_interval >= 1.0) {
+ CAM_LOG_INFO("id[%d], frame count[t:%llu,i:%llu], elapsed - avg[t:%dms,i:%dms], peak[t:%dms,i:%dms]",
+ info->stream_id, info->total->frame_count, info->interval->frame_count,
+ (int)((info->total->elapsed_sec_accum / (gdouble)info->total->frame_count) * 1000),
+ (int)((info->interval->elapsed_sec_accum / (gdouble)info->interval->frame_count) * 1000),
+ (int)(info->total->elapsed_sec_peak * 1000), (int)(info->interval->elapsed_sec_peak * 1000));
+
+ __camera_preview_cb_monitoring_info_sub_reset(info->interval);
+ }
}
{
int i = 0;
int ret = 0;
- int ret_fd = -1;
- int preview_fd = -1;
+ int ret_fd = CAMERA_FD_INIT;
+ int preview_fd = CAMERA_FD_INIT;
int num_buffer_fd = 0;
unsigned char *buf_pos = NULL;
camera_msg_param param;
camera_preview_data_s frame;
- camera_stream_data_s *stream = NULL;
+ MMCamcorderVideoStreamDataType *stream = NULL;
camera_media_packet_data *mp_data = NULL;
media_packet_h pkt = NULL;
- media_packet_h pkt_evas = NULL;
+ camera_preview_cb_monitoring_info_s *monitoring_info = NULL;
/* tfd[0]: MMCamcorderVideoStreamDataType
tfd[1]: data_bo or zero copy bo[0]
tfd[3]: zero copy bo[2] */
if (!cb_info || !recv_msg || !tfd) {
- LOGE("invalid param %p %p %p", cb_info, recv_msg, tfd);
+ CAM_LOG_ERROR("invalid param %p %p %p", cb_info, recv_msg, tfd);
return;
}
muse_camera_msg_get(preview_fd, recv_msg);
muse_camera_msg_get(num_buffer_fd, recv_msg);
- /*LOGD("preview_fd %d, num_buffer_fd %d", preview_fd, num_buffer_fd);*/
+ CAM_LOG_DEBUG("preview_fd %d, num_buffer_fd %d", preview_fd, num_buffer_fd);
memset(&frame, 0x0, sizeof(camera_preview_data_s));
if (tfd[0] < 0) {
- LOGE("invalid fd %d", tfd[0]);
+ CAM_LOG_ERROR("invalid fd %d", tfd[0]);
return;
}
ret_fd = preview_fd;
CAMERA_MSG_PARAM_SET(param, INT, ret_fd);
- if (num_buffer_fd < 0 || num_buffer_fd > BUFFER_MAX_PLANE_NUM) {
- LOGE("invalid num buffer fd %d", num_buffer_fd);
+ if (cb_info->invoke_preview_cb == FALSE) {
+ CAM_LOG_WARNING("Skip preview callback for fd[%d] due to preview stop.", ret_fd);
goto _PREVIEW_CB_HANDLER_DONE;
}
- if (num_buffer_fd == 0 && tfd[1] >= 0) {
- /* import tbm data_bo and get virtual address */
- if (!_camera_import_tbm_fd(cb_info->bufmgr, tfd[1], &data_bo, &data_bo_handle)) {
- LOGE("failed to import data fd %d", tfd[1]);
- goto _PREVIEW_CB_HANDLER_DONE;
- }
+ if (num_buffer_fd < 0 || num_buffer_fd > BUFFER_MAX_PLANE_NUM) {
+ CAM_LOG_ERROR("invalid num buffer fd %d", num_buffer_fd);
+ goto _PREVIEW_CB_HANDLER_DONE;
}
/* import tbm bo and get virtual address */
- if (!_camera_import_tbm_fd(cb_info->bufmgr, tfd[0], &bo, &bo_handle)) {
- LOGE("failed to import fd %d", tfd[0]);
+ if (!__camera_import_tbm_fd(cb_info->bufmgr, tfd[0], &bo, &bo_handle)) {
+ CAM_LOG_ERROR("failed to import fd %d", tfd[0]);
goto _PREVIEW_CB_HANDLER_DONE;
}
buf_pos = (unsigned char *)bo_handle.ptr;
/* get stream info */
- stream = (camera_stream_data_s *)buf_pos;
+ stream = (MMCamcorderVideoStreamDataType *)buf_pos;
- for (i = 0 ; i < num_buffer_fd ; i++) {
- /* import buffer bo and get virtual address */
- if (!_camera_import_tbm_fd(cb_info->bufmgr, tfd[i + 1], &buffer_bo[i], &buffer_bo_handle[i])) {
- LOGE("failed to import buffer fd %d", tfd[i + 1]);
+ CAM_LOG_VERBOSE("meta [%llu] [%llu] [%llu] [%llu] [%llu] [%llu] [%llu] [%llu] [%llu] [%llu] [%llu] [%llu]",
+ stream->frame_meta.ts_soe, stream->frame_meta.ts_eoe,
+ stream->frame_meta.ts_sof, stream->frame_meta.ts_eof,
+ stream->frame_meta.ts_hal, stream->frame_meta.ts_qmf,
+ stream->frame_meta.ts_gst, stream->frame_meta.td_exp,
+ stream->frame_meta.ts_aux, stream->frame_meta.td_aux,
+ stream->frame_meta.seqnum, stream->frame_meta.flags);
+
+ if (num_buffer_fd == 0 && CAMERA_IS_FD_VALID(tfd[1])) {
+ /* import tbm data_bo and get virtual address */
+ if (!__camera_import_tbm_fd(cb_info->bufmgr, tfd[1], &data_bo, &data_bo_handle)) {
+ CAM_LOG_ERROR("failed to import data fd %d", tfd[1]);
goto _PREVIEW_CB_HANDLER_DONE;
}
+
+ if (stream->data_type == MM_CAM_STREAM_DATA_ENCODED)
+ stream->data.encoded.data = data_bo_handle.ptr;
+ } else {
+ for (i = 0 ; i < num_buffer_fd ; i++) {
+ /* import buffer bo and get virtual address */
+ if (!__camera_import_tbm_fd(cb_info->bufmgr, tfd[i + 1], &buffer_bo[i], &buffer_bo_handle[i])) {
+ CAM_LOG_ERROR("failed to import buffer fd %d", tfd[i + 1]);
+ goto _PREVIEW_CB_HANDLER_DONE;
+ }
+ }
+
+ if (stream->data_type == MM_CAM_STREAM_DATA_ENCODED)
+ stream->data.encoded.data = buffer_bo_handle[0].ptr;
}
- /* call preview callback */
- if (cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_PREVIEW]) {
- _camera_preview_frame_create(stream, num_buffer_fd, buffer_bo_handle, &data_bo_handle, &frame);
+ /* preview callback */
+ if (cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_PREVIEW] ||
+ cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_EXTRA_PREVIEW]) {
+ camera_create_preview_frame(stream, num_buffer_fd, buffer_bo_handle, &data_bo_handle, &frame);
+
+ /* set stream data for camera_get_preview_frame_rotation() */
+ cb_info->stream_data = stream;
+
+ if (stream->extra_stream_id < 0) {
+ monitoring_info = cb_info->monitoring_info_preview;
+ __camera_preview_cb_monitoring_info_start(monitoring_info);
+
+ if (cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_PREVIEW])
+ ((camera_preview_cb)cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_PREVIEW])(&frame,
+ cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_PREVIEW]);
+ } else {
+ monitoring_info = cb_info->monitoring_info_preview_ex[stream->extra_stream_id];
+ __camera_preview_cb_monitoring_info_start(monitoring_info);
+
+ if (cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_EXTRA_PREVIEW])
+ ((camera_extra_preview_cb)cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_EXTRA_PREVIEW])(&frame,
+ stream->extra_stream_id, cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_EXTRA_PREVIEW]);
+ }
+
+ __camera_preview_cb_monitoring_info_end(monitoring_info);
- ((camera_preview_cb)cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_PREVIEW])(&frame,
- cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_PREVIEW]);
+ cb_info->stream_data = NULL;
}
- if (CHECK_PREVIEW_CB(cb_info, PREVIEW_CB_TYPE_EVAS)) {
- ret = _camera_media_packet_data_create(ret_fd, tfd, num_buffer_fd, bo, buffer_bo, data_bo, &mp_data);
+ if (stream->extra_stream_id >= 0)
+ goto _PREVIEW_CB_HANDLER_DONE;
- if (ret == CAMERA_ERROR_NONE) {
- ret = _camera_media_packet_create(cb_info, stream, mp_data, &pkt_evas);
- if (ret != CAMERA_ERROR_NONE) {
- LOGE("create pkt for evas failed");
- _camera_media_packet_data_release(mp_data, cb_info);
- mp_data = NULL;
- }
+ /* make media packet with below cases.
+ * 1. media_packet_preview_cb is set
+ * 2. EVAS display rendering
+ * 3. media bridge is set
+ */
+ if (cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_MEDIA_PACKET_PREVIEW] ||
+ cb_info->is_evas_render ||
+ cb_info->bridge) {
+ ret = __camera_create_media_packet_data(ret_fd, tfd, num_buffer_fd, bo, buffer_bo, data_bo, &mp_data);
+ if (ret != CAMERA_ERROR_NONE) {
+ CAM_LOG_ERROR("__camera_create_media_packet_data failed[0x%x]", ret);
+ goto _PREVIEW_CB_HANDLER_DONE;
+ }
+
+ ret = __camera_create_media_packet(cb_info, stream, mp_data, &pkt);
+ if (ret != CAMERA_ERROR_NONE) {
+ CAM_LOG_ERROR("__camera_create_media_packet failed[0x%x]", ret);
+ __camera_release_media_packet_data(mp_data, cb_info);
+ mp_data = NULL;
+ goto _PREVIEW_CB_HANDLER_DONE;
}
}
- /* call media packet callback */
+ /* 1. media packet preview callback */
if (cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_MEDIA_PACKET_PREVIEW]) {
- ret = _camera_media_packet_data_create(ret_fd, tfd, num_buffer_fd, bo, buffer_bo, data_bo, &mp_data);
+ media_packet_ref(pkt);
- if (ret == CAMERA_ERROR_NONE) {
- ret = _camera_media_packet_create(cb_info, stream, mp_data, &pkt);
+ monitoring_info = cb_info->monitoring_info_preview_mp;
+ __camera_preview_cb_monitoring_info_start(monitoring_info);
- if (ret == CAMERA_ERROR_NONE) {
- ((camera_media_packet_preview_cb)cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_MEDIA_PACKET_PREVIEW])(pkt,
- cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_MEDIA_PACKET_PREVIEW]);
- } else {
- _camera_media_packet_data_release(mp_data, cb_info);
- mp_data = NULL;
- }
- }
+ ((camera_media_packet_preview_cb)cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_MEDIA_PACKET_PREVIEW])(pkt,
+ cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_MEDIA_PACKET_PREVIEW]);
+
+ __camera_preview_cb_monitoring_info_end(monitoring_info);
}
- /* call evas renderer */
- if (pkt_evas) {
+ /* 2. call evas renderer */
+ if (cb_info->is_evas_render) {
if (cb_info->run_evas_render) {
- mm_display_interface_evas_render(cb_info->dp_interface, pkt_evas);
+ media_packet_ref(pkt);
+ ret = mm_display_interface_evas_render(cb_info->dp_interface, pkt);
+ if (ret != MM_ERROR_NONE) {
+ CAM_LOG_ERROR("mm_display_interface_evas_render failed[0x%x]", ret);
+ media_packet_unref(pkt);
+ }
} else {
- LOGW("evas renderer is stopped, skip this buffer...");
- media_packet_destroy(pkt_evas);
+ CAM_LOG_WARNING("evas renderer is stopped, skip this buffer...");
}
- pkt_evas = NULL;
}
- /* send message for preview callback return */
- if (!CHECK_PREVIEW_CB(cb_info, PREVIEW_CB_TYPE_EVAS))
- _camera_msg_send(MUSE_CAMERA_API_PREVIEW_CB_RETURN, NULL, cb_info, NULL, 0);
+//LCOV_EXCL_START
+ /* 3. media bridge */
+ g_mutex_lock(&cb_info->bridge_lock);
-_PREVIEW_CB_HANDLER_DONE:
- if (mp_data == NULL) {
- /* release imported bo */
- for (i = 0 ; i < num_buffer_fd && i < BUFFER_MAX_PLANE_NUM ; i++)
- _camera_release_imported_bo(&buffer_bo[i]);
-
- /* unmap and unref tbm bo */
- _camera_release_imported_bo(&data_bo);
- _camera_release_imported_bo(&bo);
-
- /* close imported fd */
- for (i = 0 ; i < MUSE_NUM_FD ; i++) {
- if (tfd[i] >= 0) {
- close(tfd[i]);
- tfd[i] = -1;
- } else {
- break;
- }
+ if (cb_info->bridge) {
+ media_packet_ref(pkt);
+ ret = media_bridge_push_packet(cb_info->bridge, pkt);
+ if (ret != MEDIA_BRIDGE_ERROR_NONE) {
+ CAM_LOG_ERROR("push packet to bridge failed[0x%x]", ret);
+ media_packet_unref(pkt);
}
+ }
+//LCOV_EXCL_STOP
- /* return buffer */
- _camera_msg_send_param1(MUSE_CAMERA_API_RETURN_BUFFER, cb_info, NULL, ¶m, 0);
+ g_mutex_unlock(&cb_info->bridge_lock);
+
+_PREVIEW_CB_HANDLER_DONE:
+ /* send PREVIEW_CB_RETURN message if zero copy buffer is used(num_buffer_fd is bigger than 0)
+ and preview callback(normal or media packet) is set. */
+ if (num_buffer_fd > 0 &&
+ (cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_PREVIEW] ||
+ cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_MEDIA_PACKET_PREVIEW]))
+ _camera_msg_send(MUSE_CAMERA_API_PREVIEW_CB_RETURN, NULL, cb_info, NULL, 0);
- /*LOGD("return buffer Done");*/
+ if (pkt) {
+ media_packet_unref(pkt);
+ return;
}
- return;
+ /* return buffer */
+ _camera_msg_send_param1(MUSE_CAMERA_API_RETURN_BUFFER, cb_info, NULL, ¶m, 0);
+
+ CAM_LOG_DEBUG("return buffer Done[tfd:%d, ret fd:%d]", tfd[0], ret_fd);
+
+ /* release imported bo and fd */
+ __camera_release_imported_bo(&data_bo);
+ __camera_release_imported_bo(&bo);
+
+ for (i = 0 ; i < num_buffer_fd && i < BUFFER_MAX_PLANE_NUM ; i++)
+ __camera_release_imported_bo(&buffer_bo[i]);
+
+ __camera_release_tfd(tfd);
}
static void __camera_event_handler_capture(camera_cb_info_s *cb_info, char *recv_msg, int *tfd)
{
- int i = 0;
int tfd_index = 0;
int capture_fd_main = 0;
int capture_fd_post = 0;
tbm_bo_handle bo_thumb_handle = {.ptr = NULL};
if (!cb_info || !recv_msg || !tfd) {
- LOGE("invalid param %p %p %p", cb_info, recv_msg, tfd);
+ CAM_LOG_ERROR("invalid param %p %p %p", cb_info, recv_msg, tfd);
return;
}
muse_camera_msg_get(capture_fd_post, recv_msg);
muse_camera_msg_get(capture_fd_thumb, recv_msg);
- LOGD("capture fd %d %d %d, received fd %d %d %d",
+ CAM_LOG_INFO("capture fd %d %d %d, received fd %d %d %d",
capture_fd_main, capture_fd_post, capture_fd_thumb,
tfd[0], tfd[1], tfd[2]);
if (capture_fd_main < 0 || tfd[tfd_index] < 0) {
- LOGE("invalid main fd %d %d", capture_fd_main, tfd[tfd_index]);
+ CAM_LOG_ERROR("invalid main fd %d %d", capture_fd_main, tfd[tfd_index]);
goto _CAPTURE_CB_HANDLER_DONE;
}
if (cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_CAPTURE] == NULL) {
- LOGW("NULL callback");
+ CAM_LOG_WARNING("NULL callback");
goto _CAPTURE_CB_HANDLER_DONE;
}
/* import tbm bo and get virtual address */
- if (!_camera_import_tbm_fd(cb_info->bufmgr, tfd[tfd_index], &bo_main, &bo_main_handle)) {
- LOGE("failed to import fd [%d] for main", tfd[tfd_index]);
+ if (!__camera_import_tbm_fd(cb_info->bufmgr, tfd[tfd_index], &bo_main, &bo_main_handle)) {
+ CAM_LOG_ERROR("failed to import fd [%d] for main", tfd[tfd_index]);
goto _CAPTURE_CB_HANDLER_DONE;
}
rImage->exif_size = 0;
}
- LOGD("image info %dx%d, size %d, EXIF info %p, size %d",
+ CAM_LOG_INFO("image info %dx%d, size %d, EXIF info %p, size %d",
rImage->width, rImage->height, rImage->size, rImage->exif, rImage->exif_size);
- if (capture_fd_post >= 0) {
+//LCOV_EXCL_START
+ if (CAMERA_IS_FD_VALID(capture_fd_post)) {
/* import tbm bo and get virtual address */
tfd_index++;
- if (_camera_import_tbm_fd(cb_info->bufmgr, tfd[tfd_index], &bo_post, &bo_post_handle)) {
+ if (__camera_import_tbm_fd(cb_info->bufmgr, tfd[tfd_index], &bo_post, &bo_post_handle)) {
buf_pos = (unsigned char *)bo_post_handle.ptr;
rPostview = (camera_image_data_s *)buf_pos;
- LOGD("rPostview->size : %d", rPostview->size);
+ CAM_LOG_INFO("rPostview->size : %d", rPostview->size);
rPostview->data = buf_pos + sizeof(camera_image_data_s);
} else {
- LOGE("failed to import fd [i:%d][%d] for postview", tfd_index, tfd[tfd_index]);
+ CAM_LOG_ERROR("failed to import fd [i:%d][%d] for postview", tfd_index, tfd[tfd_index]);
}
}
- if (capture_fd_thumb >= 0) {
+ if (CAMERA_IS_FD_VALID(capture_fd_thumb)) {
/* import tbm bo and get virtual address */
tfd_index++;
- if (_camera_import_tbm_fd(cb_info->bufmgr, tfd[tfd_index], &bo_thumb, &bo_thumb_handle)) {
+ if (__camera_import_tbm_fd(cb_info->bufmgr, tfd[tfd_index], &bo_thumb, &bo_thumb_handle)) {
buf_pos = (unsigned char *)bo_thumb_handle.ptr;
rThumbnail = (camera_image_data_s *)buf_pos;
- LOGD("rThumbnail->size : %d", rThumbnail->size);
+ CAM_LOG_INFO("rThumbnail->size : %d", rThumbnail->size);
rThumbnail->data = buf_pos + sizeof(camera_image_data_s);
} else {
- LOGE("failed to import fd [%d] for thumbnail", tfd[tfd_index]);
+ CAM_LOG_ERROR("failed to import fd [%d] for thumbnail", tfd[tfd_index]);
}
}
+//LCOV_EXCL_STOP
((camera_capturing_cb)cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_CAPTURE])(rImage,
rPostview, rThumbnail, cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_CAPTURE]);
_CAPTURE_CB_HANDLER_DONE:
/* return buffer */
- if (capture_fd_main >= 0) {
- _camera_release_imported_bo(&bo_main);
+ if (CAMERA_IS_FD_VALID(capture_fd_main)) {
+ __camera_release_imported_bo(&bo_main);
_camera_msg_return_buffer(capture_fd_main, cb_info);
}
- if (capture_fd_post >= 0) {
- _camera_release_imported_bo(&bo_post);
+ if (CAMERA_IS_FD_VALID(capture_fd_post)) {
+ __camera_release_imported_bo(&bo_post);
_camera_msg_return_buffer(capture_fd_post, cb_info);
}
- if (capture_fd_thumb >= 0) {
- _camera_release_imported_bo(&bo_thumb);
+ if (CAMERA_IS_FD_VALID(capture_fd_thumb)) {
+ __camera_release_imported_bo(&bo_thumb);
_camera_msg_return_buffer(capture_fd_thumb, cb_info);
}
- for (i = 0 ; i < MUSE_NUM_FD ; i++) {
- if (tfd[i] >= 0) {
- LOGD("close %d", tfd[i]);
- close(tfd[i]);
- tfd[i] = -1;
- } else {
- break;
- }
- }
-
- LOGD("return buffer done");
+ __camera_release_tfd(tfd);
- return;
+ CAM_LOG_INFO("return buffer done");
}
+//LCOV_EXCL_START
static void __camera_event_handler_face_detection(camera_cb_info_s *cb_info, char *recv_msg, int *tfd)
{
int count = 0;
- int face_fd = -1;
+ int face_fd = CAMERA_FD_INIT;
camera_detected_face_s *faces = NULL;
tbm_bo bo = NULL;
tbm_bo_handle bo_handle = {.ptr = NULL};
if (!cb_info || !recv_msg || !tfd) {
- LOGE("invalid param %p %p %p", cb_info, recv_msg, tfd);
+ CAM_LOG_ERROR("invalid param %p %p %p", cb_info, recv_msg, tfd);
return;
}
muse_camera_msg_get(face_fd, recv_msg);
if (count >= 0 && cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FACE_DETECTION]) {
- LOGD("FACE_DETECTION - count %d, fd %d", count, tfd[0]);
+ CAM_LOG_INFO("FACE_DETECTION - count %d, fd %d", count, tfd[0]);
- if (tfd[0] >= 0) {
- if (_camera_import_tbm_fd(cb_info->bufmgr, tfd[0], &bo, &bo_handle)) {
+ if (CAMERA_IS_FD_VALID(tfd[0])) {
+ if (__camera_import_tbm_fd(cb_info->bufmgr, tfd[0], &bo, &bo_handle)) {
/* set face info */
faces = bo_handle.ptr;
}
close(tfd[0]);
- tfd[0] = -1;
+ tfd[0] = CAMERA_FD_INIT;
}
((camera_face_detected_cb)cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FACE_DETECTION])(faces,
count, cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FACE_DETECTION]);
/* release bo */
- _camera_release_imported_bo(&bo);
+ __camera_release_imported_bo(&bo);
} else {
- LOGW("skip face detection message [count %d, fd %d, cb %p]",
+ CAM_LOG_WARNING("skip face detection message [count %d, fd %d, cb %p]",
count, tfd[0], cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FACE_DETECTION]);
}
/* return buffer */
_camera_msg_return_buffer(face_fd, cb_info);
-
- return;
}
+//LCOV_EXCL_STOP
-static bool _camera_import_tbm_fd(tbm_bufmgr bufmgr, int fd, tbm_bo *bo, tbm_bo_handle *bo_handle)
+static bool __camera_import_tbm_fd(tbm_bufmgr bufmgr, int fd, tbm_bo *bo, tbm_bo_handle *bo_handle)
{
tbm_bo tmp_bo = NULL;
tbm_bo_handle tmp_bo_handle = {NULL, };
if (!bufmgr || !bo || !bo_handle || fd < 0) {
- LOGE("invalid parameter - %p %p %p, fd %d",
+ CAM_LOG_ERROR("invalid parameter - %p %p %p, fd %d",
bufmgr, bo, bo_handle, fd);
return false;
}
tmp_bo = tbm_bo_import_fd(bufmgr, (tbm_fd)fd);
if (tmp_bo == NULL) {
- LOGE("import failed - fd %d", fd);
+ CAM_LOG_ERROR("import failed - fd %d", fd);
return false;
}
- tmp_bo_handle = tbm_bo_map(tmp_bo, TBM_DEVICE_CPU, TBM_OPTION_READ);
+ tmp_bo_handle = tbm_bo_get_handle(tmp_bo, TBM_DEVICE_CPU);
if (tmp_bo_handle.ptr == NULL) {
- LOGE("map failed %p", tmp_bo);
+ CAM_LOG_ERROR("tbm_bo_get_handle() failed %p", tmp_bo);
tbm_bo_unref(tmp_bo);
tmp_bo = NULL;
return false;
}
- tbm_bo_unmap(tmp_bo);
-
/* set bo and bo_handle */
*bo = tmp_bo;
*bo_handle = tmp_bo_handle;
+ CAM_LOG_VERBOSE("fd[%d] -> bo[%p]", fd, tmp_bo);
+
return true;
}
-static void _camera_release_imported_bo(tbm_bo *bo)
+static void __camera_release_imported_bo(tbm_bo *bo)
{
if (!bo || !(*bo)) {
- /*LOGW("NULL bo");*/
+ CAM_LOG_DEBUG("NULL bo");
return;
}
tbm_bo_unref(*bo);
*bo = NULL;
-
- return;
}
-static int _camera_client_wait_for_cb_return(muse_camera_api_e api, camera_cb_info_s *cb_info, int time_out)
+
+static bool __is_supported(camera_h camera, muse_camera_api_e api)
{
int ret = CAMERA_ERROR_NONE;
- gint64 end_time;
-
- /*LOGD("Enter api : %d", api);*/
+ camera_cli_s *pc = (camera_cli_s *)camera;
- if (!cb_info->is_server_connected) {
- LOGE("server is disconnected");
- return CAMERA_ERROR_SERVICE_DISCONNECTED;
+ if (!pc || !pc->cb_info) {
+ CAM_LOG_ERROR("api[%d] NULL handle[%p]", api, pc);
+ set_last_result(CAMERA_ERROR_INVALID_PARAMETER);
+ return false;
}
- g_mutex_lock(&(cb_info->api_mutex[api]));
+ CAM_LOG_INFO("Enter - api[%d]", api);
- if (cb_info->api_activating[api] == 0) {
- if (time_out == CAMERA_CB_NO_TIMEOUT) {
- LOGW("wait for api %d", api);
- g_cond_wait(&(cb_info->api_cond[api]), &(cb_info->api_mutex[api]));
- ret = cb_info->api_ret[api];
- cb_info->api_activating[api] = 0;
- LOGW("api %d returned 0x%x", api, ret);
- } else {
- end_time = g_get_monotonic_time() + time_out * G_TIME_SPAN_SECOND;
- if (g_cond_wait_until(&(cb_info->api_cond[api]), &(cb_info->api_mutex[api]), end_time)) {
- ret = cb_info->api_ret[api];
- cb_info->api_activating[api] = 0;
- /*LOGD("return value : 0x%x", ret);*/
- } else {
- ret = CAMERA_ERROR_INVALID_OPERATION;
- LOGE("api %d was TIMED OUT!", api);
- }
- }
- } else {
- ret = cb_info->api_ret[api];
- cb_info->api_activating[api] = 0;
+ _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+
+ CAM_LOG_INFO("Leave - api[%d], ret[%d]", api, ret);
+
+ return !!ret;
+}
+
+
+static int __set_mode(camera_h camera, muse_camera_api_e api, int set_mode)
+{
+ int ret = CAMERA_ERROR_NONE;
+ camera_cli_s *pc = (camera_cli_s *)camera;
+ camera_msg_param param;
- /*LOGD("condition is already checked for the api[%d], return[0x%x]", api, ret);*/
+ if (!pc || !pc->cb_info) {
+ CAM_LOG_ERROR("api[%d] NULL handle[%p]", api, pc);
+ return CAMERA_ERROR_INVALID_PARAMETER;
}
- g_mutex_unlock(&(cb_info->api_mutex[api]));
+ CAM_LOG_INFO("Enter - api[%d], mode[%d]", api, set_mode);
- if (ret != CAMERA_ERROR_NONE)
- LOGE("api %d : error 0x%x", api, ret);
+ CAMERA_MSG_PARAM_SET(param, INT, set_mode);
+
+ _camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
+
+ CAM_LOG_INFO("Leave - api[%d], ret[0x%x]", api, ret);
return ret;
}
-static void _camera_msg_send(int api, int *fds, camera_cb_info_s *cb_info,
- int *ret, int timeout)
+static int __set_enable(camera_h camera, muse_camera_api_e api, int set_enable)
{
- int send_ret = 0;
- char *msg = NULL;
+ int ret = CAMERA_ERROR_NONE;
+ camera_cli_s *pc = (camera_cli_s *)camera;
+ camera_msg_param param;
- if (!cb_info) {
- LOGE("NULL info - api %d", api);
+ if (!pc || !pc->cb_info) {
+ CAM_LOG_ERROR("api[%d] NULL handle[%p]", api, pc);
+ return CAMERA_ERROR_INVALID_PARAMETER;
+ }
- if (ret)
- *ret = CAMERA_ERROR_INVALID_PARAMETER;
+ CAM_LOG_INFO("Enter - api[%d], enable[%d]", api, set_enable);
- return;
- }
+ CAMERA_MSG_PARAM_SET(param, INT, set_enable);
- msg = muse_core_msg_new(api, NULL);
- if (!msg) {
- LOGE("msg failed: api %d", api);
+ _camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
+
+ CAM_LOG_INFO("Leave - api[%d], ret[0x%x]", api, ret);
+
+ return ret;
+}
+
+
+void _camera_send_message_get_return(camera_cb_info_s *cb_info, muse_camera_api_e api, char *msg, int time_out, int *ret)
+{
+ int send_ret = 0;
+ if (!msg) {
+ CAM_LOG_ERROR("api[%d] message failed", api);
if (ret)
*ret = CAMERA_ERROR_OUT_OF_MEMORY;
return;
}
- /*LOGD("send msg %s", msg);*/
+ if (api != MUSE_CAMERA_API_RETURN_BUFFER && api != MUSE_CAMERA_API_PREVIEW_CB_RETURN)
+ CAM_LOG_INFO("api[%d], message[%s]", api, msg);
+ else
+ CAM_LOG_DEBUG("api[%d], message[%s]", api, msg);
if (cb_info->is_server_connected) {
- __camera_update_api_waiting(cb_info, api, 1);
+ _camera_update_api_waiting(cb_info, api, 1);
g_mutex_lock(&cb_info->fd_lock);
- send_ret = muse_core_msg_send_fd(cb_info->fd, fds, msg);
+ send_ret = muse_core_msg_send(cb_info->fd, msg);
g_mutex_unlock(&cb_info->fd_lock);
}
if (send_ret < 0) {
- LOGE("msg send failed");
+ CAM_LOG_ERROR("message send failed");
if (ret)
*ret = CAMERA_ERROR_INVALID_OPERATION;
} else {
if (ret)
- *ret = _camera_client_wait_for_cb_return(api, cb_info, timeout);
+ *ret = _camera_client_wait_for_cb_return(api, cb_info, time_out);
}
- __camera_update_api_waiting(cb_info, api, -1);
+ _camera_update_api_waiting(cb_info, api, -1);
muse_core_msg_free(msg);
- return;
+ if (api != MUSE_CAMERA_API_RETURN_BUFFER && api != MUSE_CAMERA_API_PREVIEW_CB_RETURN)
+ CAM_LOG_INFO("api[%d] ret[0x%x]", api, ret ? *ret : 0x0);
+ else
+ CAM_LOG_DEBUG("api[%d] ret[0x%x]", api, ret ? *ret : 0x0);
+}
+
+
+int _camera_client_wait_for_cb_return(muse_camera_api_e api, camera_cb_info_s *cb_info, int time_out)
+{
+ int ret = CAMERA_ERROR_NONE;
+ gint64 end_time;
+
+ if (!cb_info->is_server_connected) {
+ CAM_LOG_ERROR("server is disconnected");
+ return CAMERA_ERROR_SERVICE_DISCONNECTED;
+ }
+
+ g_mutex_lock(&(cb_info->api_mutex[api]));
+
+ CAM_LOG_INFO("api [%d], timeout [%d sec]", api, time_out);
+
+ end_time = g_get_monotonic_time() + time_out * G_TIME_SPAN_SECOND;
+
+ while (!cb_info->api_activating[api]) {
+ if (time_out == CAMERA_CB_NO_TIMEOUT) {
+ g_cond_wait(&(cb_info->api_cond[api]), &(cb_info->api_mutex[api]));
+ CAM_LOG_WARNING("api %d returned 0x%x", api, cb_info->api_ret[api]);
+ } else if (!g_cond_wait_until(&(cb_info->api_cond[api]), &(cb_info->api_mutex[api]), end_time)) {
+ CAM_LOG_ERROR("api %d TIMED OUT!", api);
+ ret = CAMERA_ERROR_INVALID_OPERATION;
+ goto _CB_RETURN_END;
+ }
+
+ if (!cb_info->is_server_connected) {
+ ret = CAMERA_ERROR_SERVICE_DISCONNECTED;
+ goto _CB_RETURN_END;
+ }
+
+ if (!cb_info->api_activating[api])
+ CAM_LOG_WARNING("invalid signal received, wait again...");
+ }
+
+ ret = cb_info->api_ret[api];
+ cb_info->api_activating[api] = FALSE;
+
+_CB_RETURN_END:
+ g_mutex_unlock(&(cb_info->api_mutex[api]));
+
+ if (ret != CAMERA_ERROR_NONE)
+ CAM_LOG_ERROR("api %d : error 0x%x", api, ret);
+
+ return ret;
+}
+
+
+void _camera_msg_send(int api, int *fds, camera_cb_info_s *cb_info,
+ int *ret, int timeout)
+{
+ char *msg = NULL;
+
+ if (!cb_info) {
+ CAM_LOG_ERROR("NULL info - api %d", api);
+
+ if (ret)
+ *ret = CAMERA_ERROR_INVALID_PARAMETER;
+
+ return;
+ }
+
+ msg = muse_core_msg_new(api, NULL);
+
+ _camera_send_message_get_return(cb_info, api, msg, timeout, ret);
}
-static void _camera_msg_send_param1(int api, camera_cb_info_s *cb_info,
+void _camera_msg_send_param1(int api, camera_cb_info_s *cb_info,
int *ret, camera_msg_param *param, int timeout)
{
- int send_ret = 0;
+ int array_length;
char *msg = NULL;
if (!cb_info || !param) {
- LOGE("invalid pointer : api %d - %p %p", api, cb_info, param);
+ CAM_LOG_ERROR("invalid pointer : api %d - %p %p", api, cb_info, param);
if (ret)
*ret = CAMERA_ERROR_INVALID_PARAMETER;
return;
}
- /*LOGD("type %d, name %s", param->type, param->name);*/
+ CAM_LOG_DEBUG("type[%d], name[%s]", param->type, param->name);
switch (param->type) {
case MUSE_TYPE_INT:
param->type, param->name, param->value.value_STRING,
NULL);
break;
+ case MUSE_TYPE_ARRAY:
+ array_length = param->value_size / sizeof(int) + \
+ (param->value_size % sizeof(int) ? 1 : 0);
+
+ msg = muse_core_msg_new(api,
+ param->type, param->name, array_length, param->value.value_ARRAY,
+ NULL);
+ break;
default:
- LOGE("unknown type %d", param->type);
+ CAM_LOG_ERROR("unknown type %d", param->type);
break;
}
- if (!msg) {
- LOGE("msg failed: api %d", api);
-
- if (ret)
- *ret = CAMERA_ERROR_OUT_OF_MEMORY;
+ _camera_send_message_get_return(cb_info, api, msg, timeout, ret);
+}
- return;
- }
- /*LOGD("send msg %s", msg);*/
-
- if (cb_info->is_server_connected) {
- __camera_update_api_waiting(cb_info, api, 1);
-
- g_mutex_lock(&cb_info->fd_lock);
- send_ret = muse_core_msg_send(cb_info->fd, msg);
- g_mutex_unlock(&cb_info->fd_lock);
- }
-
- if (send_ret < 0) {
- LOGE("msg send failed");
-
- if (ret)
- *ret = CAMERA_ERROR_INVALID_OPERATION;
- } else {
- if (ret)
- *ret = _camera_client_wait_for_cb_return(api, cb_info, timeout);
- }
-
- __camera_update_api_waiting(cb_info, api, -1);
-
- muse_core_msg_free(msg);
-
- return;
-}
-
-
-static void _camera_msg_send_param2_int(int api, camera_cb_info_s *cb_info,
+void _camera_msg_send_param2_int(int api, camera_cb_info_s *cb_info,
int *ret, camera_msg_param *param0, camera_msg_param *param1, int timeout)
{
- int func_ret = CAMERA_ERROR_NONE;
- int send_ret = 0;
char *msg = NULL;
if (!cb_info || !param0 || !param1) {
- LOGE("invalid ptr %p %p %p : api %d",
+ CAM_LOG_ERROR("invalid ptr %p %p %p : api %d",
cb_info, param0, param1, api);
- func_ret = CAMERA_ERROR_INVALID_PARAMETER;
- goto _SEND_PARAM2_INT_DONE;
+
+ if (ret)
+ *ret = CAMERA_ERROR_INVALID_PARAMETER;
+
+ return;
}
- /*LOGD("api %d, param0 [%s:%d], param1 [%s:%d]",
+ CAM_LOG_DEBUG("api[%d], param0[%s:%d], param1[%s:%d]",
api,
param0->name, param0->value.value_INT,
- param1->name, param1->value.value_INT);*/
+ param1->name, param1->value.value_INT);
msg = muse_core_msg_new(api,
param0->type, param0->name, param0->value.value_INT,
param1->type, param1->name, param1->value.value_INT,
NULL);
- if (!msg) {
- LOGE("msg failed: api %d", api);
- func_ret = CAMERA_ERROR_OUT_OF_MEMORY;
- goto _SEND_PARAM2_INT_DONE;
- }
-
- /*LOGD("send msg [%s]", msg);*/
-
- if (cb_info->is_server_connected) {
- __camera_update_api_waiting(cb_info, api, 1);
-
- g_mutex_lock(&cb_info->fd_lock);
- send_ret = muse_core_msg_send(cb_info->fd, msg);
- g_mutex_unlock(&cb_info->fd_lock);
- }
-
- if (send_ret < 0) {
- LOGE("msg send failed");
- func_ret = CAMERA_ERROR_INVALID_OPERATION;
- } else {
- func_ret = _camera_client_wait_for_cb_return(api, cb_info, timeout);
- }
-
- __camera_update_api_waiting(cb_info, api, -1);
-
- muse_core_msg_free(msg);
-
-_SEND_PARAM2_INT_DONE:
- if (ret)
- *ret = func_ret;
-
- return;
+ _camera_send_message_get_return(cb_info, api, msg, timeout, ret);
}
-static void _camera_msg_return_buffer(int ret_fd, camera_cb_info_s *cb_info)
+void _camera_msg_return_buffer(int ret_fd, camera_cb_info_s *cb_info)
{
camera_msg_param param;
if (ret_fd < 0) {
- LOGW("invalid fd %d", ret_fd);
+ CAM_LOG_WARNING("invalid fd %d", ret_fd);
return;
}
CAMERA_MSG_PARAM_SET(param, INT, ret_fd);
_camera_msg_send_param1(MUSE_CAMERA_API_RETURN_BUFFER, cb_info, NULL, ¶m, 0);
-
- return;
}
-int _camera_get_tbm_surface_format(int in_format, uint32_t *out_format)
+int _camera_get_tbm_format(int in_format, uint32_t *out_format)
{
if (in_format <= MM_PIXEL_FORMAT_INVALID ||
in_format >= MM_PIXEL_FORMAT_NUM ||
out_format == NULL) {
- LOGE("INVALID_PARAMETER : in_format %d, out_format ptr %p", in_format, out_format);
+ CAM_LOG_ERROR("INVALID_PARAMETER : in_format %d, out_format ptr %p", in_format, out_format);
return CAMERA_ERROR_INVALID_PARAMETER;
}
case MM_PIXEL_FORMAT_NV12T:
*out_format = TBM_FORMAT_NV12;
break;
+//LCOV_EXCL_START
case MM_PIXEL_FORMAT_NV16:
*out_format = TBM_FORMAT_NV16;
break;
*out_format = TBM_FORMAT_ARGB8888;
break;
default:
- LOGE("invalid in_format %d", in_format);
+ CAM_LOG_ERROR("invalid in_format %d", in_format);
return CAMERA_ERROR_INVALID_PARAMETER;
+//LCOV_EXCL_STOP
}
return CAMERA_ERROR_NONE;
if (in_format <= MM_PIXEL_FORMAT_INVALID ||
in_format >= MM_PIXEL_FORMAT_NUM ||
mimetype == NULL) {
- LOGE("INVALID_PARAMETER : in_format %d, mimetype ptr %p", in_format, mimetype);
+ CAM_LOG_ERROR("INVALID_PARAMETER : in_format %d, mimetype ptr %p", in_format, mimetype);
return CAMERA_ERROR_INVALID_PARAMETER;
}
case MM_PIXEL_FORMAT_NV12T:
*mimetype = MEDIA_FORMAT_NV12;
break;
+//LCOV_EXCL_START
case MM_PIXEL_FORMAT_NV16:
*mimetype = MEDIA_FORMAT_NV16;
break;
case MM_PIXEL_FORMAT_ARGB:
*mimetype = MEDIA_FORMAT_ARGB;
break;
+ case MM_PIXEL_FORMAT_ENCODED_H264:
+ /* TODO: How can we determine the profile for H.264 format? */
+ *mimetype = MEDIA_FORMAT_H264_SP;
+ break;
+ case MM_PIXEL_FORMAT_ENCODED_MJPEG:
+ *mimetype = MEDIA_FORMAT_MJPEG;
+ break;
+ case MM_PIXEL_FORMAT_ENCODED_VP8:
+ *mimetype = MEDIA_FORMAT_VP8;
+ break;
+ case MM_PIXEL_FORMAT_ENCODED_VP9:
+ *mimetype = MEDIA_FORMAT_VP9;
+ break;
default:
- LOGE("invalid in_format %d", in_format);
- return CAMERA_ERROR_INVALID_PARAMETER;
+ CAM_LOG_ERROR("unsupported format[%d]", in_format);
+ return CAMERA_ERROR_NOT_SUPPORTED;
+//LCOV_EXCL_STOP
}
return CAMERA_ERROR_NONE;
}
-static void _camera_preview_frame_create(camera_stream_data_s *stream, int num_buffer_fd,
- tbm_bo_handle *buffer_bo_handle, tbm_bo_handle *data_bo_handle, camera_preview_data_s *frame)
+
+static int __camera_create_media_packet_data(int ret_fd, int *tfd, int num_buffer_fd, tbm_bo bo,
+ tbm_bo *buffer_bo, tbm_bo data_bo, camera_media_packet_data **mp_data)
{
- int total_size = 0;
- unsigned char *buf_pos = NULL;
+ int i = 0;
+ int ret = CAMERA_ERROR_NONE;
+ camera_media_packet_data *new_mp_data = NULL;
- if (stream == NULL || buffer_bo_handle == NULL || frame == NULL) {
- LOGE("invalid parameter - stream:%p, buffer_bo_handle:%p", stream, buffer_bo_handle);
- return;
+ if (!tfd || !mp_data) {
+ CAM_LOG_ERROR("NULL param[%p,%p]", tfd, mp_data);
+ return CAMERA_ERROR_INVALID_PARAMETER;
}
- /* set frame info */
- if (stream->format == MM_PIXEL_FORMAT_ITLV_JPEG_UYVY)
- frame->format = MM_PIXEL_FORMAT_UYVY;
- else
- frame->format = stream->format;
+ new_mp_data = g_new0(camera_media_packet_data, 1);
- frame->width = stream->width;
- frame->height = stream->height;
- frame->timestamp = stream->timestamp;
- frame->num_of_planes = stream->num_planes;
+ new_mp_data->ret_fd = ret_fd;
+ new_mp_data->fd = tfd[0];
+ new_mp_data->num_buffer_fd = num_buffer_fd;
+ new_mp_data->bo = bo;
- if (num_buffer_fd == 0) {
+ CAM_LOG_VERBOSE("tfd[%d], ret fd[%d]", new_mp_data->fd, new_mp_data->ret_fd);
+
+ if (data_bo) {
/* non-zero copy */
- if (!data_bo_handle || !data_bo_handle->ptr) {
- LOGE("NULL pointer");
- return;
- }
+ new_mp_data->data_bo = data_bo;
+ new_mp_data->data_fd = tfd[1];
- buf_pos = data_bo_handle->ptr;
-
- if (stream->format == MM_PIXEL_FORMAT_ENCODED_H264) {
- frame->data.encoded_plane.data = buf_pos;
- frame->data.encoded_plane.size = stream->data.encoded.length_data;
- total_size = stream->data.encoded.length_data;
- } else if (stream->format == MM_PIXEL_FORMAT_INVZ) {
- frame->data.depth_plane.data = buf_pos;
- frame->data.depth_plane.size = stream->data.depth.length_data;
- total_size = stream->data.depth.length_data;
- } else if (stream->format == MM_PIXEL_FORMAT_RGBA ||
- stream->format == MM_PIXEL_FORMAT_ARGB) {
- frame->data.rgb_plane.data = buf_pos;
- frame->data.rgb_plane.size = stream->data.rgb.length_data;
- total_size = stream->data.rgb.length_data;
- } else {
- switch (stream->num_planes) {
- case 1:
- frame->data.single_plane.yuv = buf_pos;
- frame->data.single_plane.size = stream->data.yuv420.length_yuv;
- total_size = stream->data.yuv420.length_yuv;
- break;
- case 2:
- frame->data.double_plane.y = buf_pos;
- frame->data.double_plane.y_size = stream->data.yuv420sp.length_y;
- buf_pos += stream->data.yuv420sp.length_y;
- frame->data.double_plane.uv = buf_pos;
- frame->data.double_plane.uv_size = stream->data.yuv420sp.length_uv;
- total_size = stream->data.yuv420sp.length_y + \
- stream->data.yuv420sp.length_uv;
- break;
- case 3:
- frame->data.triple_plane.y = buf_pos;
- frame->data.triple_plane.y_size = stream->data.yuv420p.length_y;
- buf_pos += stream->data.yuv420p.length_y;
- frame->data.triple_plane.u = buf_pos;
- frame->data.triple_plane.u_size = stream->data.yuv420p.length_u;
- buf_pos += stream->data.yuv420p.length_u;
- frame->data.triple_plane.v = buf_pos;
- frame->data.triple_plane.v_size = stream->data.yuv420p.length_v;
- total_size = stream->data.yuv420p.length_y + \
- stream->data.yuv420p.length_u + \
- stream->data.yuv420p.length_v;
- break;
- default:
- break;
- }
- }
+ CAM_LOG_VERBOSE("bo[%p], fd[%d]",
+ new_mp_data->data_bo, new_mp_data->data_fd);
} else {
/* zero copy */
- switch (stream->num_planes) {
- case 1:
- frame->data.single_plane.yuv = buffer_bo_handle[0].ptr;
- frame->data.single_plane.size = stream->data.yuv420.length_yuv;
- total_size = stream->data.yuv420.length_yuv;
- break;
- case 2:
- frame->data.double_plane.y = buffer_bo_handle[0].ptr;
- if (stream->num_planes == (unsigned int)num_buffer_fd)
- frame->data.double_plane.uv = buffer_bo_handle[1].ptr;
- else
- frame->data.double_plane.uv = buffer_bo_handle[0].ptr + stream->data.yuv420sp.length_y;
- frame->data.double_plane.y_size = stream->data.yuv420sp.length_y;
- frame->data.double_plane.uv_size = stream->data.yuv420sp.length_uv;
- total_size = stream->data.yuv420sp.length_y + \
- stream->data.yuv420sp.length_uv;
- break;
- case 3:
- frame->data.triple_plane.y = buffer_bo_handle[0].ptr;
- if (stream->num_planes == (unsigned int)num_buffer_fd) {
- frame->data.triple_plane.u = buffer_bo_handle[1].ptr;
- frame->data.triple_plane.v = buffer_bo_handle[2].ptr;
- } else {
- frame->data.triple_plane.u = buffer_bo_handle[0].ptr + stream->data.yuv420p.length_y;
- frame->data.triple_plane.v = buffer_bo_handle[1].ptr + stream->data.yuv420p.length_u;
- }
- frame->data.triple_plane.y_size = stream->data.yuv420p.length_y;
- frame->data.triple_plane.u_size = stream->data.yuv420p.length_u;
- frame->data.triple_plane.v_size = stream->data.yuv420p.length_v;
- total_size = stream->data.yuv420p.length_y + \
- stream->data.yuv420p.length_u + \
- stream->data.yuv420p.length_v;
- break;
- default:
- break;
+ for (i = 0 ; i < num_buffer_fd ; i++) {
+ new_mp_data->buffer_bo[i] = buffer_bo[i];
+ new_mp_data->buffer_fd[i] = (tbm_fd)tfd[i + 1];
+
+ CAM_LOG_VERBOSE(" [%d] bo[%p], fd[%d]",
+ i, new_mp_data->buffer_bo[i], new_mp_data->buffer_fd[i]);
}
+
+ for (i = num_buffer_fd ; i < MUSE_NUM_FD ; i++)
+ new_mp_data->buffer_fd[i] = CAMERA_FD_INIT;
+
+ new_mp_data->data_fd = CAMERA_FD_INIT;
}
- /*
- LOGD("format %d, %dx%d, size %d plane num %d",
- frame.format, frame.width, frame.height, total_size, frame.num_of_planes);
- */
+ *mp_data = new_mp_data;
+
+ CAM_LOG_DEBUG("mp_data %p", new_mp_data);
- return;
+ return ret;
}
-static int _camera_media_packet_data_create(int ret_fd, int *tfd, int num_buffer_fd, tbm_bo bo,
- tbm_bo *buffer_bo, tbm_bo data_bo, camera_media_packet_data **mp_data)
+static void __camera_release_media_packet_data(camera_media_packet_data *mp_data, camera_cb_info_s *cb_info)
{
int i = 0;
- int ret = CAMERA_ERROR_NONE;
- camera_media_packet_data *tmp_mp_data = NULL;
- if (!tfd) {
- LOGE("NULL tfd");
- return CAMERA_ERROR_INVALID_PARAMETER;
+ if (!mp_data || !cb_info) {
+ CAM_LOG_ERROR("NULL pointer %p %p", mp_data, cb_info);
+ return;
}
- if (*mp_data == NULL) {
- tmp_mp_data = g_new0(camera_media_packet_data, 1);
- if (tmp_mp_data) {
- tmp_mp_data->ret_fd = ret_fd;
- tmp_mp_data->fd = tfd[0];
- tmp_mp_data->num_buffer_fd = num_buffer_fd;
- tmp_mp_data->bo = bo;
+ CAM_LOG_VERBOSE("tfd[%d], ret fd[%d]", mp_data->fd, mp_data->ret_fd);
- if (data_bo) {
- /* non-zero copy */
- tmp_mp_data->data_bo = data_bo;
- tmp_mp_data->data_fd = tfd[1];
- } else {
- /* zero copy */
- for (i = 0 ; i < num_buffer_fd ; i++) {
- tmp_mp_data->buffer_bo[i] = buffer_bo[i];
- tmp_mp_data->buffer_fd[i] = (tbm_fd)tfd[i + 1];
- }
- }
+ /* release imported bo and close fd */
+ for (i = 0 ; i < mp_data->num_buffer_fd ; i++) {
+ CAM_LOG_VERBOSE(" release buffer[%d] fd[%d],bo[%p]",
+ i, mp_data->buffer_fd[i], mp_data->buffer_bo[i]);
- tmp_mp_data->ref_cnt++;
+ tbm_bo_unref(mp_data->buffer_bo[i]);
- *mp_data = tmp_mp_data;
- /*LOGD("mp_data %p", tmp_mp_data);*/
- } else {
- ret = CAMERA_ERROR_OUT_OF_MEMORY;
- LOGE("failed to alloc media packet data");
- }
- } else {
- ((camera_media_packet_data *)*mp_data)->ref_cnt++;
+ if (CAMERA_IS_FD_VALID(mp_data->buffer_fd[i]))
+ close(mp_data->buffer_fd[i]);
+ else
+ CAM_LOG_WARNING("invalid fd[%d] for buffer[%d]", mp_data->buffer_fd[i], i);
}
- return ret;
+ if (mp_data->data_bo) {
+ CAM_LOG_VERBOSE("release data_fd[%d],data_bo[%p]",
+ mp_data->data_fd, mp_data->data_bo);
+
+ tbm_bo_unref(mp_data->data_bo);
+
+ if (CAMERA_IS_FD_VALID(mp_data->data_fd))
+ close(mp_data->data_fd);
+ else
+ CAM_LOG_WARNING("invalid data_fd[%d]", mp_data->data_fd);
+ }
+
+ CAM_LOG_VERBOSE("release fd[%d],bo[%p]", mp_data->fd, mp_data->bo);
+
+ tbm_bo_unref(mp_data->bo);
+
+ if (CAMERA_IS_FD_VALID(mp_data->fd))
+ close(mp_data->fd);
+ else
+ CAM_LOG_WARNING("invalid fd[%d]", mp_data->fd);
+
+ /* return buffer */
+ _camera_msg_return_buffer(mp_data->ret_fd, cb_info);
+
+ g_free(mp_data);
}
-static void _camera_media_packet_data_release(camera_media_packet_data *mp_data, camera_cb_info_s *cb_info)
+
+static tbm_surface_h __camera_get_tbm_surface(MMCamcorderVideoStreamDataType *stream, camera_media_packet_data *mp_data)
{
int i = 0;
+ int ret = CAMERA_ERROR_NONE;
+ uint32_t tbm_format = 0;
+ tbm_bo bos[BUFFER_MAX_PLANE_NUM] = {NULL, };
+ tbm_surface_info_s tsurf_info;
- if (!mp_data || !cb_info) {
- LOGE("NULL pointer %p %p", mp_data, cb_info);
- return;
+ if (!stream || !mp_data) {
+ CAM_LOG_ERROR("NULL param [%p,%p]", stream, mp_data);
+ return NULL;
}
- if (mp_data->ref_cnt > 1) {
- mp_data->ref_cnt--;
- LOGD("ref count %d", mp_data->ref_cnt);
- } else {
- /* release imported bo and close imported fd */
- for (i = 0 ; i < mp_data->num_buffer_fd ; i++) {
- tbm_bo_unref(mp_data->buffer_bo[i]);
- mp_data->buffer_bo[i] = NULL;
+ if (mp_data->num_buffer_fd < 1 && !mp_data->data_bo) {
+ CAM_LOG_ERROR("No valid data");
+ return NULL;
+ }
- close(mp_data->buffer_fd[i]);
- mp_data->buffer_fd[i] = -1;
+ ret = _camera_get_tbm_format(stream->format, &tbm_format);
+ if (ret != CAMERA_ERROR_NONE)
+ return NULL;
+
+ memset(&tsurf_info, 0x0, sizeof(tbm_surface_info_s));
+
+ if (mp_data->num_buffer_fd > 0) {
+ for (i = 0 ; i < mp_data->num_buffer_fd ; i++)
+ bos[i] = mp_data->buffer_bo[i];
+ } else {
+ bos[0] = mp_data->data_bo;
+ }
+
+ tsurf_info.width = stream->width;
+ tsurf_info.height = stream->height;
+ tsurf_info.format = tbm_format;
+ tsurf_info.bpp = tbm_surface_internal_get_bpp(tbm_format);
+ tsurf_info.num_planes = tbm_surface_internal_get_num_planes(tbm_format);
+
+ switch (tbm_format) {
+ case TBM_FORMAT_NV12: /* fall through */
+ case TBM_FORMAT_NV21: /* fall through */
+ case TBM_FORMAT_YUV420: /* fall through */
+ case TBM_FORMAT_YVU420: /* fall through */
+ case TBM_FORMAT_UYVY: /* fall through */
+ case TBM_FORMAT_YUYV:
+ for (i = 0 ; i < (int)tsurf_info.num_planes ; i++) {
+ tsurf_info.planes[i].stride = stream->stride[i];
+ tsurf_info.planes[i].size = stream->stride[i] * stream->elevation[i];
+ if (i != 0 && mp_data->num_buffer_fd <= 1)
+ tsurf_info.planes[i].offset = tsurf_info.planes[i - 1].offset + tsurf_info.planes[i - 1].size;
+ tsurf_info.size += tsurf_info.planes[i].size;
+
+ CAM_LOG_VERBOSE("[plane:%d] st[%d], el[%d], size[%d]",
+ i, stream->stride[i], stream->elevation[i], tsurf_info.planes[i].size);
}
+ break;
+//LCOV_EXCL_START
+ case TBM_FORMAT_RGB565: /* fall through */
+ case TBM_FORMAT_RGB888: /* fall through */
+ case TBM_FORMAT_RGBA8888: /* fall through */
+ case TBM_FORMAT_ARGB8888:
+ tsurf_info.planes[0].size = stream->data.rgb.length_data;
+ tsurf_info.planes[0].offset = 0;
+ tsurf_info.size = stream->data.rgb.length_data;
+ break;
+ default:
+ CAM_LOG_ERROR("Not supported format[%d]", stream->format);
+ return NULL;
+//LCOV_EXCL_STOP
+ }
- /* unref tbm bo and close imported fd */
- close(mp_data->fd);
- mp_data->fd = -1;
- _camera_release_imported_bo(&mp_data->bo);
+ return tbm_surface_internal_create_with_bos(&tsurf_info, bos,
+ mp_data->num_buffer_fd > 0 ? mp_data->num_buffer_fd : 1);
+}
- if (mp_data->data_bo && mp_data->data_fd >= 0) {
- close(mp_data->data_fd);
- mp_data->data_fd = -1;
+
+static int __camera_update_media_packet_format(camera_cb_info_s *cb_info, MMCamcorderVideoStreamDataType *stream)
+{
+ int ret = CAMERA_ERROR_NONE;
+ int pkt_fmt_width = 0;
+ int pkt_fmt_height = 0;
+ bool make_pkt_fmt = false;
+ media_format_mimetype_e mimetype = MEDIA_FORMAT_NV12;
+ media_format_mimetype_e pkt_fmt_mimetype = MEDIA_FORMAT_NV12;
+
+ if (!cb_info || !stream) {
+ CAM_LOG_ERROR("invalid parameter - %p, %p", cb_info, stream);
+ return CAMERA_ERROR_INVALID_PARAMETER;
+ }
+
+ ret = _camera_get_media_packet_mimetype(stream->format, &mimetype);
+ if (ret != CAMERA_ERROR_NONE)
+ return ret;
+
+ /* check media packet format */
+ if (cb_info->pkt_fmt) {
+ media_format_get_video_info(cb_info->pkt_fmt,
+ &pkt_fmt_mimetype, &pkt_fmt_width, &pkt_fmt_height, NULL, NULL);
+
+ CAM_LOG_DEBUG("pkt_fmt %dx%d - stream %dx%d",
+ pkt_fmt_width, pkt_fmt_height, stream->width, stream->height);
+
+ if (pkt_fmt_mimetype != mimetype ||
+ pkt_fmt_width != stream->width ||
+ pkt_fmt_height != stream->height) {
+ CAM_LOG_WARNING("change fmt[previous:0x%x,%dx%d]",
+ pkt_fmt_mimetype, pkt_fmt_width, pkt_fmt_height);
+
+ media_format_unref(cb_info->pkt_fmt);
+ cb_info->pkt_fmt = NULL;
+ make_pkt_fmt = true;
}
- _camera_release_imported_bo(&mp_data->data_bo);
+ } else {
+ make_pkt_fmt = true;
+ }
- /* return buffer */
- _camera_msg_return_buffer(mp_data->ret_fd, cb_info);
+ /* create packet format */
+ if (make_pkt_fmt) {
+ CAM_LOG_WARNING("make new fmt - 0x%x, %dx%d",
+ mimetype, stream->width, stream->height);
+
+ ret = media_format_create(&cb_info->pkt_fmt);
+ if (ret != MEDIA_FORMAT_ERROR_NONE) {
+ CAM_LOG_ERROR("media_format_create failed 0x%x", ret);
+ return CAMERA_ERROR_INVALID_OPERATION;
+ }
- g_free(mp_data);
- mp_data = NULL;
+ ret = media_format_set_video_mime(cb_info->pkt_fmt, mimetype);
+ ret |= media_format_set_video_width(cb_info->pkt_fmt, stream->width);
+ ret |= media_format_set_video_height(cb_info->pkt_fmt, stream->height);
+ if (ret != MEDIA_FORMAT_ERROR_NONE) {
+ CAM_LOG_ERROR("media format set failed 0x%x", ret);
+ return CAMERA_ERROR_INVALID_OPERATION;
+ }
}
- return;
+ return CAMERA_ERROR_NONE;
}
-static int _camera_media_packet_create(camera_cb_info_s *cb_info, camera_stream_data_s *stream,
+
+static int __camera_create_media_packet(camera_cb_info_s *cb_info, MMCamcorderVideoStreamDataType *stream,
camera_media_packet_data *mp_data, media_packet_h *packet)
{
media_packet_h pkt = NULL;
- bool make_pkt_fmt = false;
tbm_surface_h tsurf = NULL;
- tbm_surface_info_s tsurf_info;
- media_format_mimetype_e mimetype = MEDIA_FORMAT_NV12;
- uint32_t bo_format = 0;
- int ret = 0;
- int i = 0;
- int num_buffer_fd = 0;
- tbm_bo *buffer_bo = NULL;
+ int ret = CAMERA_ERROR_NONE;
- if (cb_info == NULL || stream == NULL || mp_data == NULL || packet == NULL) {
- LOGE("invalid parameter - cb_info:%p, stream:%p, mp_data:%p, packet:%p",
+ if (!cb_info || !stream || !mp_data || !packet) {
+ CAM_LOG_ERROR("invalid parameter - %p, %p, %p, %p",
cb_info, stream, mp_data, packet);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- memset(&tsurf_info, 0x0, sizeof(tbm_surface_info_s));
- buffer_bo = mp_data->buffer_bo;
- num_buffer_fd = mp_data->num_buffer_fd;
-
- /* create tbm surface */
- for (i = 0 ; i < BUFFER_MAX_PLANE_NUM ; i++)
- tsurf_info.planes[i].stride = stream->stride[i];
-
- /* get tbm surface format */
- ret = _camera_get_tbm_surface_format(stream->format, &bo_format);
- ret |= _camera_get_media_packet_mimetype(stream->format, &mimetype);
+ ret = __camera_update_media_packet_format(cb_info, stream);
+ if (ret != CAMERA_ERROR_NONE)
+ return ret;
- if (ret == CAMERA_ERROR_NONE) {
- tsurf_info.width = stream->width;
- tsurf_info.height = stream->height;
- tsurf_info.format = bo_format;
- tsurf_info.bpp = tbm_surface_internal_get_bpp(bo_format);
- tsurf_info.num_planes = tbm_surface_internal_get_num_planes(bo_format);
-
- if (num_buffer_fd > 0) {
- switch (bo_format) {
- case TBM_FORMAT_NV12:
- case TBM_FORMAT_NV21:
- tsurf_info.planes[0].size = stream->stride[0] * stream->elevation[0];
- tsurf_info.planes[1].size = stream->stride[1] * stream->elevation[1];
- tsurf_info.planes[0].offset = 0;
- if (num_buffer_fd == 1)
- tsurf_info.planes[1].offset = tsurf_info.planes[0].size;
- tsurf_info.size = tsurf_info.planes[0].size + tsurf_info.planes[1].size;
- break;
- case TBM_FORMAT_YUV420:
- case TBM_FORMAT_YVU420:
- tsurf_info.planes[0].size = stream->stride[0] * stream->elevation[0];
- tsurf_info.planes[1].size = stream->stride[1] * stream->elevation[1];
- tsurf_info.planes[2].size = stream->stride[2] * stream->elevation[2];
- tsurf_info.planes[0].offset = 0;
- if (num_buffer_fd == 1) {
- tsurf_info.planes[1].offset = tsurf_info.planes[0].size;
- tsurf_info.planes[2].offset = tsurf_info.planes[0].size + tsurf_info.planes[1].size;
- }
- tsurf_info.size = tsurf_info.planes[0].size + tsurf_info.planes[1].size + tsurf_info.planes[2].size;
- break;
- case TBM_FORMAT_UYVY:
- case TBM_FORMAT_YUYV:
- tsurf_info.planes[0].size = (stream->stride[0] * stream->elevation[0]) << 1;
- tsurf_info.planes[0].offset = 0;
- tsurf_info.size = tsurf_info.planes[0].size;
- break;
- default:
- break;
- }
+ if (stream->data_type == MM_CAM_STREAM_DATA_ENCODED) {
+ ret = media_packet_new_from_external_memory(cb_info->pkt_fmt,
+ stream->data.encoded.data, stream->data.encoded.length_data,
+ (media_packet_dispose_cb)_camera_media_packet_dispose, (void *)cb_info,
+ &pkt);
- tsurf = tbm_surface_internal_create_with_bos(&tsurf_info, buffer_bo, num_buffer_fd);
- } else if (mp_data->data_bo) {
- switch (bo_format) {
- case TBM_FORMAT_NV12:
- case TBM_FORMAT_NV21:
- tsurf_info.planes[0].size = stream->width * stream->height;
- tsurf_info.planes[1].size = (tsurf_info.planes[0].size) >> 1;
- tsurf_info.planes[0].offset = 0;
- tsurf_info.planes[1].offset = tsurf_info.planes[0].size;
- tsurf_info.size = tsurf_info.planes[0].size + tsurf_info.planes[1].size;
- break;
- case TBM_FORMAT_YUV420:
- case TBM_FORMAT_YVU420:
- tsurf_info.planes[0].size = stream->width * stream->height;
- tsurf_info.planes[1].size = (stream->width >> 1) * (stream->height >> 1);
- tsurf_info.planes[2].size = tsurf_info.planes[1].size;
- tsurf_info.planes[0].offset = 0;
- tsurf_info.planes[1].offset = tsurf_info.planes[0].size;
- tsurf_info.planes[2].offset = tsurf_info.planes[0].size + tsurf_info.planes[1].size;
- tsurf_info.size = tsurf_info.planes[0].size + tsurf_info.planes[1].size + tsurf_info.planes[2].size;
- break;
- case TBM_FORMAT_UYVY:
- case TBM_FORMAT_YUYV:
- tsurf_info.planes[0].size = (stream->width * stream->height) << 1;
- tsurf_info.planes[0].offset = 0;
- tsurf_info.size = tsurf_info.planes[0].size;
- break;
- default:
- break;
- }
+ if (pkt) {
+ if (!stream->data.encoded.is_delta_frame)
+ media_packet_set_flags(pkt, MEDIA_PACKET_SYNC_FRAME);
- tsurf = tbm_surface_internal_create_with_bos(&tsurf_info, &mp_data->data_bo, 1);
- }
- /*LOGD("tbm surface %p", tsurf);*/
- }
-
- if (tsurf) {
- /* check media packet format */
- if (cb_info->pkt_fmt) {
- int pkt_fmt_width = 0;
- int pkt_fmt_height = 0;
- media_format_mimetype_e pkt_fmt_mimetype = MEDIA_FORMAT_NV12;
-
- media_format_get_video_info(cb_info->pkt_fmt, &pkt_fmt_mimetype, &pkt_fmt_width, &pkt_fmt_height, NULL, NULL);
- if (pkt_fmt_mimetype != mimetype ||
- pkt_fmt_width != stream->width ||
- pkt_fmt_height != stream->height) {
- LOGW("change fmt: current 0x%x, %dx%d",
- pkt_fmt_mimetype, pkt_fmt_width, pkt_fmt_height);
- media_format_unref(cb_info->pkt_fmt);
- cb_info->pkt_fmt = NULL;
- make_pkt_fmt = true;
+ if (stream->data.encoded.is_header_included) {
+ media_packet_set_flags(pkt, MEDIA_PACKET_CODEC_CONFIG);
+ CAM_LOG_INFO("Codec config in buffer");
}
- } else {
- make_pkt_fmt = true;
}
-
- /* create packet format */
- if (make_pkt_fmt) {
- LOGW("make new pkt_fmt - 0x%x, %dx%d", mimetype, stream->width, stream->height);
- ret = media_format_create(&cb_info->pkt_fmt);
- if (ret == MEDIA_FORMAT_ERROR_NONE) {
- ret = media_format_set_video_mime(cb_info->pkt_fmt, mimetype);
- ret |= media_format_set_video_width(cb_info->pkt_fmt, stream->width);
- ret |= media_format_set_video_height(cb_info->pkt_fmt, stream->height);
- LOGW("media_format_set : 0x%x", ret);
- } else {
- LOGW("media_format_create failed 0x%x", ret);
- }
+ } else {
+ tsurf = __camera_get_tbm_surface(stream, mp_data);
+ if (!tsurf) {
+ CAM_LOG_ERROR("get tbm surface failed");
+ ret = CAMERA_ERROR_INVALID_OPERATION;
+ goto _PACKET_CREATE_FAILED;
}
- /* create media packet */
- ret = media_packet_create_from_tbm_surface(cb_info->pkt_fmt,
- tsurf, (media_packet_finalize_cb)_camera_media_packet_finalize,
+ ret = media_packet_new_from_tbm_surface(cb_info->pkt_fmt,
+ tsurf, (media_packet_dispose_cb)_camera_media_packet_dispose,
(void *)cb_info, &pkt);
- if (ret != MEDIA_PACKET_ERROR_NONE) {
- LOGE("media_packet_create failed 0x%x", ret);
- tbm_surface_destroy(tsurf);
- tsurf = NULL;
- }
- } else {
- LOGE("tbm surface failed. %dx%d, format %d, num_buffer_fd %d, data_bo %p",
- stream->width, stream->height, stream->format, num_buffer_fd, mp_data->data_bo);
}
- if (pkt) {
- /*LOGD("media packet %p, internal buffer %p", pkt, stream->internal_buffer);*/
- /* set media packet data */
- ret = media_packet_set_extra(pkt, (void *)mp_data);
- if (ret != MEDIA_PACKET_ERROR_NONE) {
- LOGE("media_packet_set_extra failed");
+ if (ret != MEDIA_PACKET_ERROR_NONE) {
+ CAM_LOG_ERROR("media_packet_new[t:%d] failed 0x%x", stream->data_type, ret);
+ goto _PACKET_CREATE_FAILED;
+ }
- _camera_media_packet_data_release(mp_data, cb_info);
- mp_data = NULL;
+ ret = media_packet_set_extra(pkt, (void *)mp_data);
+ if (ret != MEDIA_PACKET_ERROR_NONE) {
+ CAM_LOG_ERROR("media_packet_set_extra failed");
+ goto _PACKET_CREATE_FAILED;
+ }
- media_packet_destroy(pkt);
- pkt = NULL;
- } else {
- /* set timestamp : msec -> nsec */
- if (media_packet_set_pts(pkt, (uint64_t)(stream->timestamp) * 1000000) != MEDIA_PACKET_ERROR_NONE)
- LOGW("media_packet_set_pts failed");
+ if (media_packet_set_pts(pkt, stream->timestamp_nsec) != MEDIA_PACKET_ERROR_NONE)
+ CAM_LOG_WARNING("media_packet_set_pts failed");
- *packet = pkt;
- }
- }
+ if (media_packet_set_rotate_method(pkt, (media_packet_rotate_method_e)stream->rotation) != MEDIA_PACKET_ERROR_NONE)
+ CAM_LOG_WARNING("media_packet_set_rotate_method failed");
- return ret;
+ CAM_LOG_VERBOSE("new media packet[%p], tbm surface[%p]", pkt, tsurf);
+
+ *packet = pkt;
+
+ return CAMERA_ERROR_NONE;
+
+_PACKET_CREATE_FAILED:
+ if (tsurf)
+ tbm_surface_destroy(tsurf);
+ if (pkt)
+ media_packet_unref(pkt);
+
+ return CAMERA_ERROR_INVALID_OPERATION;
}
-int _camera_media_packet_finalize(media_packet_h pkt, int error_code, void *user_data)
+void _camera_media_packet_dispose(media_packet_h pkt, void *user_data)
{
int ret = 0;
camera_cb_info_s *cb_info = (camera_cb_info_s *)user_data;
tbm_surface_h tsurf = NULL;
if (!pkt || !cb_info) {
- LOGE("NULL pointer %p %p", pkt, cb_info);
- return MEDIA_PACKET_FINALIZE;
+ CAM_LOG_ERROR("NULL pointer %p %p", pkt, cb_info);
+ return;
}
ret = media_packet_get_extra(pkt, (void **)&mp_data);
- if (ret != MEDIA_PACKET_ERROR_NONE) {
- LOGE("media_packet_get_extra failed 0x%x", ret);
- return MEDIA_PACKET_FINALIZE;
+ if (ret != MEDIA_PACKET_ERROR_NONE || !mp_data) {
+ CAM_LOG_ERROR("media_packet_get_extra failed 0x%x", ret);
+ return;
}
- /*LOGD("mp_data %p", mp_data);*/
-
- g_mutex_lock(&cb_info->mp_data_mutex);
-
- _camera_media_packet_data_release(mp_data, cb_info);
- mp_data = NULL;
-
- g_mutex_unlock(&cb_info->mp_data_mutex);
-
ret = media_packet_get_tbm_surface(pkt, &tsurf);
- if (ret != MEDIA_PACKET_ERROR_NONE)
- LOGE("get tbm_surface failed 0x%x", ret);
- if (tsurf) {
+ CAM_LOG_VERBOSE("media packet[%p] - mp_data[%p],tsurf[%p]",
+ pkt, mp_data, tsurf);
+
+ if (tsurf)
tbm_surface_destroy(tsurf);
- tsurf = NULL;
- }
- return MEDIA_PACKET_FINALIZE;
+ g_mutex_lock(&cb_info->mp_data_mutex);
+ __camera_release_media_packet_data(mp_data, cb_info);
+ g_mutex_unlock(&cb_info->mp_data_mutex);
}
-static void _camera_client_user_callback(camera_cb_info_s *cb_info, char *recv_msg, muse_camera_event_e event, int *tfd)
+static void __camera_client_user_callback(camera_cb_info_s *cb_info, char *recv_msg, muse_camera_event_e event, int *tfd)
{
int param1 = 0;
int param2 = 0;
if (!recv_msg || event >= MUSE_CAMERA_EVENT_TYPE_NUM) {
- LOGE("invalid parameter - camera msg %p, event %d", recv_msg, event);
+ CAM_LOG_ERROR("invalid parameter - camera msg %p, event %d", recv_msg, event);
return;
}
- /*LOGD("get camera msg %s, event %d", recv_msg, event);*/
+ CAM_LOG_DEBUG("get camera msg[%s], event[%d]", recv_msg, event);
g_mutex_lock(&cb_info->user_cb_mutex[event]);
event != MUSE_CAMERA_EVENT_TYPE_FACE_DETECTION &&
event != MUSE_CAMERA_EVENT_TYPE_CAPTURE) {
g_mutex_unlock(&cb_info->user_cb_mutex[event]);
- LOGW("NULL callback for event %d, return here", event);
+ CAM_LOG_WARNING("NULL callback for event %d, return here", event);
return;
}
muse_camera_msg_get(current, recv_msg);
muse_camera_msg_get(by_policy, recv_msg);
- LOGD("STATE CHANGE - previous %d, current %d, by_policy %d",
+ CAM_LOG_INFO("STATE CHANGE - previous %d, current %d, by_policy %d",
previous, current, by_policy);
((camera_state_changed_cb)cb_info->user_cb[event])((camera_state_e)previous,
muse_camera_msg_get(state, recv_msg);
- LOGD("FOCUS state - %d", state);
+ CAM_LOG_INFO("FOCUS state - %d", state);
((camera_focus_changed_cb)cb_info->user_cb[event])((camera_focus_state_e)state, cb_info->user_data[event]);
}
break;
case MUSE_CAMERA_EVENT_TYPE_CAPTURE_COMPLETE:
- LOGD("CAPTURE_COMPLETED");
+ CAM_LOG_INFO("CAPTURE_COMPLETED");
((camera_capture_completed_cb)cb_info->user_cb[event])(cb_info->user_data[event]);
break;
case MUSE_CAMERA_EVENT_TYPE_PREVIEW:
case MUSE_CAMERA_EVENT_TYPE_MEDIA_PACKET_PREVIEW:
__camera_event_handler_preview(cb_info, recv_msg, tfd);
break;
+//LCOV_EXCL_START
case MUSE_CAMERA_EVENT_TYPE_HDR_PROGRESS:
{
int percent = 0;
muse_camera_msg_get(percent, recv_msg);
- LOGD("HDR progress - %d %%", percent);
+ CAM_LOG_INFO("HDR progress - %d %%", percent);
((camera_attr_hdr_progress_cb)cb_info->user_cb[event])(percent, cb_info->user_data[event]);
}
muse_camera_msg_get(previous, recv_msg);
muse_camera_msg_get(current, recv_msg);
- LOGW("INTERRUPTED - policy %d, state %d -> %d", policy, previous, current);
+ CAM_LOG_WARNING("INTERRUPTED - policy %d, state %d -> %d", policy, previous, current);
((camera_interrupted_cb)cb_info->user_cb[event])((camera_policy_e)policy,
(camera_state_e)previous, (camera_state_e)current, cb_info->user_data[event]);
muse_camera_msg_get(policy, recv_msg);
muse_camera_msg_get(state, recv_msg);
- LOGW("INTERRUPT_STARTED - policy %d, state %d", policy, state);
+ CAM_LOG_WARNING("INTERRUPT_STARTED - policy %d, state %d", policy, state);
((camera_interrupt_started_cb)cb_info->user_cb[event])((camera_policy_e)policy,
(camera_state_e)state, cb_info->user_data[event]);
muse_camera_msg_get(error, recv_msg);
muse_camera_msg_get(current_state, recv_msg);
- LOGE("ERROR - error 0x%x, current_state %d", error, current_state);
+ CAM_LOG_ERROR("ERROR - error 0x%x, current_state %d", error, current_state);
((camera_error_cb)cb_info->user_cb[event])((camera_error_e)error,
(camera_state_e)current_state, cb_info->user_data[event]);
}
break;
+//LCOV_EXCL_STOP
case MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_PREVIEW_RESOLUTION:
/* fall through */
case MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_CAPTURE_RESOLUTION:
muse_camera_msg_get(param1, recv_msg);
muse_camera_msg_get(param2, recv_msg);
- /*LOGD("event %d SUPPORTED %d, %d", event, param1, param2);*/
+ CAM_LOG_DEBUG("event[%d] SUPPORTED[%d],[%d]", event, param1, param2);
if (((camera_supported_cb_param2)cb_info->user_cb[event])(param1, param2, cb_info->user_data[event]) == false) {
cb_info->user_cb[event] = NULL;
cb_info->user_data[event] = NULL;
- LOGW("stop foreach callback for event %d", event);
+ CAM_LOG_WARNING("stop foreach callback for event %d", event);
}
break;
case MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_CAPTURE_FORMAT:
/* fall through */
case MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_STREAM_ROTATION:
/* fall through */
+//LCOV_EXCL_START
case MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_THEATER_MODE:
/* fall through */
case MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_PTZ_TYPE:
muse_camera_msg_get(param1, recv_msg);
- /*LOGD("event %d SUPPORTED %d ", event, param1);*/
+ CAM_LOG_DEBUG("event[%d], SUPPORTED[%d] ", event, param1);
if (((camera_supported_cb_param1)cb_info->user_cb[event])(param1, cb_info->user_data[event]) == false) {
cb_info->user_cb[event] = NULL;
cb_info->user_data[event] = NULL;
- LOGW("stop foreach callback for event %d", event);
+ CAM_LOG_WARNING("stop foreach callback for event %d", event);
}
break;
+//LCOV_EXCL_STOP
case MUSE_CAMERA_EVENT_TYPE_CAPTURE:
__camera_event_handler_capture(cb_info, recv_msg, tfd);
break;
default:
- LOGW("unhandled event %d", event);
+ CAM_LOG_WARNING("unhandled event %d", event);
break;
}
g_mutex_unlock(&cb_info->user_cb_mutex[event]);
-
- return;
}
-static gboolean _camera_idle_event_callback(gpointer data)
+static gboolean __camera_idle_event_callback(gpointer data)
{
camera_cb_info_s *cb_info = NULL;
camera_idle_event_s *cam_idle_event = (camera_idle_event_s *)data;
if (cam_idle_event == NULL) {
- LOGE("cam_idle_event is NULL");
+ CAM_LOG_ERROR("cam_idle_event is NULL");
return FALSE;
}
cb_info = cam_idle_event->cb_info;
if (cb_info == NULL) {
- LOGW("camera cb_info is NULL. event %p %d", cam_idle_event, cam_idle_event->event);
+ CAM_LOG_WARNING("camera cb_info is NULL. event %p %d", cam_idle_event, cam_idle_event->event);
g_mutex_unlock(&g_cam_idle_event_lock);
goto IDLE_EVENT_CALLBACK_DONE;
}
g_mutex_unlock(&g_cam_idle_event_lock);
/* user callback */
- _camera_client_user_callback(cb_info, cam_idle_event->recv_msg, cam_idle_event->event, cam_idle_event->tfd);
+ __camera_client_user_callback(cb_info, cam_idle_event->recv_msg, cam_idle_event->event, cam_idle_event->tfd);
IDLE_EVENT_CALLBACK_DONE:
/* release event */
return FALSE;
}
-static void *_camera_msg_handler_func(gpointer data)
+static gpointer __camera_msg_handler_func(gpointer data)
{
int api = 0;
int type = 0;
camera_idle_event_s *cam_idle_event = NULL;
camera_msg_handler_info_s *handler_info = (camera_msg_handler_info_s *)data;
camera_cb_info_s *cb_info = NULL;
+ GThread *thread = NULL;
if (!handler_info || !handler_info->cb_info) {
- LOGE("NULL handler %p", handler_info);
+ CAM_LOG_ERROR("NULL handler %p", handler_info);
return NULL;
}
cb_info = (camera_cb_info_s *)handler_info->cb_info;
type = handler_info->type;
+ thread = handler_info->thread;
- LOGD("t:%d start", type);
+ CAM_LOG_INFO("t:%d start[thread:%p]", type, thread);
g_mutex_lock(&handler_info->mutex);
while (g_atomic_int_get(&handler_info->running)) {
if (g_queue_is_empty(handler_info->queue)) {
- /*LOGD("t:%d signal wait...", type);*/
+ CAM_LOG_VERBOSE("t[%d] signal wait...", type);
g_cond_wait(&handler_info->cond, &handler_info->mutex);
- /*LOGD("t:%d signal received", type);*/
+ CAM_LOG_VERBOSE("t[%d] signal received", type);
if (g_atomic_int_get(&handler_info->running) == 0) {
- LOGD("t:%d stop event thread", type);
+ CAM_LOG_INFO("t:%d stop event thread", type);
break;
}
}
g_mutex_unlock(&handler_info->mutex);
if (cam_msg == NULL) {
- LOGE("t:%d NULL message", type);
+ CAM_LOG_ERROR("t:%d NULL message", type);
g_mutex_lock(&handler_info->mutex);
continue;
}
if (muse_camera_msg_get(ret, cam_msg->recv_msg)) {
if (cb_info->api_waiting[api] > 0) {
cb_info->api_ret[api] = ret;
- cb_info->api_activating[api] = 1;
+ cb_info->api_activating[api] = TRUE;
- /*LOGD("t:%d camera api %d - return 0x%x", type, ret);*/
+ CAM_LOG_DEBUG("t[%d] camera api[%d] - return[0x%x]", type, api, ret);
- g_cond_signal(&cb_info->api_cond[api]);
+ g_cond_broadcast(&cb_info->api_cond[api]);
} else {
- LOGW("no waiting for this api [%d]", api);
+ CAM_LOG_WARNING("no waiting for this api [%d]", api);
}
} else {
- LOGE("t:%d failed to get camera ret for api %d, msg %s", type, api, cam_msg->recv_msg);
+ CAM_LOG_ERROR("t:%d failed to get camera ret for api %d, msg %s", type, api, cam_msg->recv_msg);
}
g_mutex_unlock(&cb_info->api_mutex[api]);
} else if (api == MUSE_CAMERA_CB_EVENT) {
+ if (cam_msg->event == MUSE_CAMERA_EVENT_TYPE_INTERRUPTED) {
+ CAM_LOG_WARNING("INTERRUPTED, release thread for preview cb");
+ __destroy_msg_handler_thread(&cb_info->preview_cb_info);
+ }
+
switch (cam_msg->event_class) {
case MUSE_CAMERA_EVENT_CLASS_THREAD_SUB:
- _camera_client_user_callback(cb_info, cam_msg->recv_msg, cam_msg->event, cam_msg->tfd);
+ __camera_client_user_callback(cb_info, cam_msg->recv_msg, cam_msg->event, cam_msg->tfd);
break;
case MUSE_CAMERA_EVENT_CLASS_THREAD_MAIN:
cam_idle_event = g_new0(camera_idle_event_s, 1);
if (cam_idle_event == NULL) {
- LOGE("t:%d cam_idle_event alloc failed", type);
+ CAM_LOG_ERROR("t:%d cam_idle_event alloc failed", type);
break;
}
cam_idle_event->event = cam_msg->event;
cam_idle_event->cb_info = cb_info;
- strncpy(cam_idle_event->recv_msg, cam_msg->recv_msg, sizeof(cam_idle_event->recv_msg) - 1);
+ strncpy(cam_idle_event->recv_msg, cam_msg->recv_msg, sizeof(cam_idle_event->recv_msg));
memcpy(cam_idle_event->tfd, cam_msg->tfd, sizeof(cam_idle_event->tfd));
- /*LOGD("t:%d add camera event[%d, %p] to IDLE", type, cam_msg->event, cam_idle_event);*/
+ CAM_LOG_DEBUG("t[%d] add camera event[%d, %p] to IDLE",
+ type, cam_msg->event, cam_idle_event);
g_mutex_lock(&g_cam_idle_event_lock);
cb_info->idle_event_list = g_list_append(cb_info->idle_event_list, (gpointer)cam_idle_event);
g_mutex_unlock(&g_cam_idle_event_lock);
g_idle_add_full(G_PRIORITY_DEFAULT,
- (GSourceFunc)_camera_idle_event_callback,
+ (GSourceFunc)__camera_idle_event_callback,
(gpointer)cam_idle_event,
NULL);
break;
default:
- LOGE("t:%d not handled event class %d", type, cam_msg->event_class);
+ CAM_LOG_ERROR("t:%d not handled event class %d", type, cam_msg->event_class);
break;
}
} else {
- LOGE("t:%d unknown camera api[%d] message[%s]", type, api, cam_msg->recv_msg);
+ CAM_LOG_ERROR("t:%d unknown camera api[%d] message[%s]", type, api, cam_msg->recv_msg);
}
g_free(cam_msg);
- cam_msg = NULL;
g_mutex_lock(&handler_info->mutex);
}
while (!g_queue_is_empty(handler_info->queue)) {
cam_msg = (camera_message_s *)g_queue_pop_head(handler_info->queue);
if (cam_msg) {
- LOGD("t:%d remove camera message %p", type, cam_msg);
- free(cam_msg);
- cam_msg = NULL;
+ CAM_LOG_INFO("t:%d remove message %p", type, cam_msg);
+ __camera_release_tfd(cam_msg->tfd);
+ g_free(cam_msg);
} else {
- LOGW("t:%d NULL camera message", type);
+ CAM_LOG_WARNING("t:%d NULL message", type);
}
}
g_mutex_unlock(&handler_info->mutex);
- LOGD("t:%d return", type);
+ CAM_LOG_INFO("t:%d return[thread:%p]", type, thread);
return NULL;
}
-static void _camera_deactivate_idle_event_all(camera_cb_info_s *cb_info)
+static void __camera_deactivate_idle_event_all(camera_cb_info_s *cb_info)
{
camera_idle_event_s *cam_idle_event = NULL;
GList *list = NULL;
if (cb_info == NULL) {
- LOGE("cb_info is NULL");
+ CAM_LOG_ERROR("cb_info is NULL");
return;
}
g_mutex_lock(&g_cam_idle_event_lock);
if (cb_info->idle_event_list == NULL) {
- LOGD("No remained idle event");
+ CAM_LOG_INFO("No remained idle event");
g_mutex_unlock(&g_cam_idle_event_lock);
return;
}
list = g_list_next(list);
if (!cam_idle_event) {
- LOGW("Fail to remove idle event. The event is NULL");
+ CAM_LOG_WARNING("Fail to remove idle event. The event is NULL");
continue;
}
if (g_idle_remove_by_data(cam_idle_event)) {
- LOGW("remove idle event %p done", cam_idle_event);
+ CAM_LOG_WARNING("remove idle event %p done", cam_idle_event);
cb_info->idle_event_list = g_list_remove(cb_info->idle_event_list, (gpointer)cam_idle_event);
g_free(cam_idle_event);
- cam_idle_event = NULL;
continue;
}
- LOGW("set NULL cb_info for event %p %d, it will be freed on idle callback",
+ CAM_LOG_WARNING("set NULL cb_info for event %p %d, it will be freed on idle callback",
cam_idle_event, cam_idle_event->event);
cam_idle_event->cb_info = NULL;
cb_info->idle_event_list = NULL;
g_mutex_unlock(&g_cam_idle_event_lock);
-
- return;
}
camera_message_s *cam_msg = NULL;
if (!cb_info || !msg) {
- LOGE("NULL pointer %p %p", cb_info, msg);
+ CAM_LOG_ERROR("NULL pointer %p %p", cb_info, msg);
return;
}
cam_msg = g_new0(camera_message_s, 1);
if (!cam_msg) {
- LOGE("failed to alloc cam_msg for [%s]", msg);
+ CAM_LOG_ERROR("failed to alloc cam_msg for [%s]", msg);
return;
}
cam_msg->event = event;
cam_msg->event_class = event_class;
- if (tfd && tfd[0] >= 0)
+ if (tfd)
memcpy(cam_msg->tfd, tfd, sizeof(cam_msg->tfd));
strncpy(cam_msg->recv_msg, msg, sizeof(cam_msg->recv_msg) - 1);
- /*LOGD("add camera message to queue : api %d, event %d, event_class %d", api, event, event_class);*/
+ CAM_LOG_DEBUG("add message to queue : api[%d], event[%d], event_class[%d]",
+ api, event, event_class);
if (event == MUSE_CAMERA_EVENT_TYPE_PREVIEW) {
+ if (!cb_info->preview_cb_info.thread) {
+ LOGI("The thread for preview cb is not created yet, create it now");
+ if (!__create_msg_handler_thread(&cb_info->preview_cb_info,
+ CAMERA_MESSAGE_HANDLER_TYPE_PREVIEW_CB, "cam:preview_cb", cb_info)) {
+ CAM_LOG_ERROR("failed to create thread for preview cb");
+ g_free(cam_msg);
+ return;
+ }
+ }
+
g_mutex_lock(&cb_info->preview_cb_info.mutex);
g_queue_push_tail(cb_info->preview_cb_info.queue, (gpointer)cam_msg);
g_cond_signal(&cb_info->preview_cb_info.cond);
}
cam_msg = NULL;
-
- return;
}
int get_index = -1;
if (!cb_info || !msg) {
- LOGE("invalid ptr %p %p", cb_info, msg);
+ CAM_LOG_ERROR("invalid ptr %p %p", cb_info, msg);
return;
}
- /*LOGD("msg [%s]", msg);*/
+ CAM_LOG_DEBUG("msg[%s]", msg);
if (!muse_camera_msg_get(api, msg)) {
- LOGE("failed to get camera api");
+ CAM_LOG_ERROR("failed to get camera api");
return;
}
if (api == MUSE_CAMERA_CB_EVENT) {
if (!muse_camera_msg_get(event, msg) ||
!muse_camera_msg_get(event_class, msg)) {
- LOGE("failed to get camera event or event_class [%s]", msg);
+ CAM_LOG_ERROR("failed to get camera event or event_class [%s]", msg);
return;
}
} else {
if (!muse_camera_msg_get(api_class, msg)) {
- LOGE("failed to get camera api_class [%s]", msg);
+ CAM_LOG_ERROR("failed to get camera api_class [%s]", msg);
return;
}
}
if (api_class == MUSE_CAMERA_API_CLASS_IMMEDIATE) {
if (api >= MUSE_CAMERA_API_MAX) {
- LOGE("invalid api %d", api);
+ CAM_LOG_ERROR("invalid api %d", api);
return;
}
if (!muse_camera_msg_get(ret, msg)) {
- LOGE("failed to get camera ret");
+ CAM_LOG_ERROR("failed to get camera ret");
return;
}
case MUSE_CAMERA_API_CREATE:
if (ret != CAMERA_ERROR_NONE) {
g_atomic_int_set(&cb_info->msg_recv_running, 0);
- LOGE("camera create error 0x%x. close client cb handler", ret);
+ CAM_LOG_ERROR("camera create error 0x%x. close client cb handler", ret);
}
break;
case MUSE_CAMERA_API_DESTROY:
if (ret == CAMERA_ERROR_NONE) {
g_atomic_int_set(&cb_info->msg_recv_running, 0);
- LOGD("camera destroy done. close client cb handler");
+ CAM_LOG_INFO("camera destroy done. close client cb handler");
}
break;
default:
muse_core_msg_deserialize("get_value1", msg, NULL, NULL, MUSE_TYPE_INT, &cb_info->get_int_pair[get_index][1]);
break;
case MUSE_CAMERA_GET_TYPE_ARRAY:
- if (api == MUSE_CAMERA_API_GET_DISPLAY_ROI_AREA) {
+ switch (api) {
+ case MUSE_CAMERA_API_GET_DISPLAY_ROI_AREA:
muse_core_msg_deserialize("get_value",
msg, NULL, NULL, MUSE_TYPE_ARRAY, cb_info->get_display_roi_area);
- LOGD("get display roi %d,%d,%dx%d",
+ CAM_LOG_INFO("get display roi %d,%d,%dx%d",
cb_info->get_display_roi_area[0],
cb_info->get_display_roi_area[1],
cb_info->get_display_roi_area[2],
cb_info->get_display_roi_area[3]);
- } else {
+ break;
+ case MUSE_CAMERA_API_ATTR_GET_GEOTAG:
muse_core_msg_deserialize("get_value",
msg, NULL, NULL, MUSE_TYPE_ARRAY, cb_info->get_geotag);
- LOGD("get geotag %lf, %lf, %lf",
+ CAM_LOG_INFO("get geotag %lf, %lf, %lf",
cb_info->get_geotag[0], cb_info->get_geotag[1], cb_info->get_geotag[2]);
+ break;
+ case MUSE_CAMERA_API_GET_EXTRA_PREVIEW_STREAM_FORMAT:
+ muse_core_msg_deserialize("get_value",
+ msg, NULL, NULL, MUSE_TYPE_ARRAY, cb_info->get_extra_preview_stream_format);
+ CAM_LOG_INFO("get extra preview stream format %d,%dx%d,%d",
+ cb_info->get_extra_preview_stream_format[0],
+ cb_info->get_extra_preview_stream_format[1],
+ cb_info->get_extra_preview_stream_format[2],
+ cb_info->get_extra_preview_stream_format[3]);
+ break;
+ default:
+ CAM_LOG_WARNING("unknown api[%d]", api);
+ break;
}
break;
case MUSE_CAMERA_GET_TYPE_STRING:
muse_core_msg_deserialize("get_value", msg, NULL, NULL, MUSE_TYPE_STRING, cb_info->get_string[get_index]);
break;
default:
- LOGW("unknown type %d", get_type);
+ CAM_LOG_WARNING("unknown type %d", get_type);
break;
}
}
if (cb_info->api_waiting[api] > 0) {
cb_info->api_ret[api] = ret;
- cb_info->api_activating[api] = 1;
+ cb_info->api_activating[api] = TRUE;
- g_cond_signal(&cb_info->api_cond[api]);
+ g_cond_broadcast(&cb_info->api_cond[api]);
} else {
- LOGW("no waiting for this api [%d]", api);
+ CAM_LOG_WARNING("no waiting for this api [%d]", api);
}
g_mutex_unlock(&cb_info->api_mutex[api]);
} else if (api_class == MUSE_CAMERA_API_CLASS_THREAD_SUB || api == MUSE_CAMERA_CB_EVENT) {
__camera_add_msg_to_queue(cb_info, api, event, event_class, msg, tfd);
} else {
- LOGW("unknown camera api %d, class %d", api, api_class);
+ CAM_LOG_WARNING("unknown camera api %d, class %d", api, api_class);
}
-
- return;
}
-static void *_camera_msg_recv_func(gpointer data)
+static gpointer __camera_msg_recv_func(gpointer data)
{
int i = 0;
int recv_length = 0;
- int tfd[MUSE_NUM_FD] = {-1, -1, -1, -1};
+ int tfd[MUSE_NUM_FD] = {CAMERA_FD_INIT, CAMERA_FD_INIT, CAMERA_FD_INIT, CAMERA_FD_INIT};
char *recv_msg = NULL;
camera_cb_info_s *cb_info = (camera_cb_info_s *)data;
if (!cb_info) {
- LOGE("cb_info NULL");
+ CAM_LOG_ERROR("cb_info NULL");
return NULL;
}
- LOGD("start - fd : %d", cb_info->fd);
+ CAM_LOG_INFO("start - fd : %d", cb_info->fd);
recv_msg = cb_info->recv_msg;
while (g_atomic_int_get(&cb_info->msg_recv_running)) {
for (i = 0 ; i < MUSE_NUM_FD ; i++)
- tfd[i] = -1;
+ tfd[i] = CAMERA_FD_INIT;
recv_length = muse_core_msg_recv_fd(cb_info->fd, recv_msg, MUSE_MSG_MAX_LENGTH, tfd);
if (recv_length <= 0) {
cb_info->is_server_connected = FALSE;
- LOGE("receive msg failed - server disconnected");
+ CAM_LOG_ERROR("receive msg failed - server disconnected");
break;
}
- /*
- if (tfd[0] >= 0)
- LOGD("%d %d %d %d", tfd[0], tfd[1], tfd[2], tfd[3]);
- */
+ if (CAMERA_IS_FD_VALID(tfd[0]))
+ CAM_LOG_DEBUG("tfd[%d/%d/%d/%d]", tfd[0], tfd[1], tfd[2], tfd[3]);
recv_msg[recv_length] = '\0';
- /*LOGD("recv msg : %s, length : %d", recv_msg, recv_length);*/
+ CAM_LOG_VERBOSE("recv msg[%s], length[%d]", recv_msg, recv_length);
__camera_process_msg(cb_info, recv_msg, tfd);
}
- LOGD("client cb exit - server connected %d", cb_info->is_server_connected);
+ CAM_LOG_INFO("client cb exit - server connected %d", cb_info->is_server_connected);
+//LCOV_EXCL_START
if (!cb_info->is_server_connected) {
char *error_msg = NULL;
+ if (cb_info->bufmgr == NULL) {
+ CAM_LOG_ERROR("No need to send error(handle is not created)");
+ return NULL;
+ }
+
if (cb_info->fd < 0) {
- LOGE("fd is closed in client side");
- goto CB_HANDLER_EXIT;
+ CAM_LOG_ERROR("fd is closed in client side");
+ return NULL;
}
/* send error msg for server disconnection */
NULL);
if (!error_msg) {
- LOGE("error_msg failed");
- goto CB_HANDLER_EXIT;
+ CAM_LOG_ERROR("error_msg failed");
+ return NULL;
}
__camera_add_msg_to_queue(cb_info,
muse_core_msg_free(error_msg);
error_msg = NULL;
- LOGE("add error msg for service disconnection done");
+ for (i = 0 ; i < MUSE_CAMERA_API_MAX ; i++) {
+ if (cb_info->api_waiting[i])
+ g_cond_broadcast(&cb_info->api_cond[i]);
+ }
+
+ CAM_LOG_ERROR("add error msg for service disconnection done");
}
+//LCOV_EXCL_STOP
-CB_HANDLER_EXIT:
return NULL;
}
int type, const char *thread_name, camera_cb_info_s *cb_info)
{
if (!handler_info || !thread_name || !cb_info) {
- LOGE("t:%d NULL %p %p %p",
+ CAM_LOG_ERROR("t:%d NULL %p %p %p",
type, handler_info, thread_name, cb_info);
return false;
}
- LOGD("t:%d", type);
+ g_autoptr(GMutexLocker) locker = g_mutex_locker_new(&handler_info->mutex);
+
+ if (handler_info->thread) {
+ CAM_LOG_WARNING("t:%d thread[%p] is already created", type, handler_info->thread);
+ return true;
+ }
+
+ CAM_LOG_INFO("t:%d [%s]", type, thread_name);
handler_info->type = type;
handler_info->queue = g_queue_new();
if (handler_info->queue == NULL) {
- LOGE("t:%d queue failed", type);
+ CAM_LOG_ERROR("t:%d queue failed", type);
return false;
}
- g_mutex_init(&handler_info->mutex);
- g_cond_init(&handler_info->cond);
-
handler_info->cb_info = (void *)cb_info;
g_atomic_int_set(&handler_info->running, 1);
handler_info->thread = g_thread_try_new(thread_name,
- _camera_msg_handler_func, (gpointer)handler_info, NULL);
+ __camera_msg_handler_func, (gpointer)handler_info, NULL);
if (handler_info->thread == NULL) {
- LOGE("t:%d thread failed", type);
+ CAM_LOG_ERROR("t:%d thread failed", type);
- g_mutex_clear(&handler_info->mutex);
- g_cond_clear(&handler_info->cond);
g_queue_free(handler_info->queue);
handler_info->queue = NULL;
return false;
}
- LOGD("t:%d done", type);
+ CAM_LOG_INFO("t:%d done[thread:%p]", type, handler_info->thread);
return true;
}
static void __destroy_msg_handler_thread(camera_msg_handler_info_s *handler_info)
{
- int type = 0;
+ GThread *thread = NULL;
if (!handler_info) {
- LOGE("NULL handler");
+ CAM_LOG_ERROR("NULL handler");
return;
}
+ g_autoptr(GMutexLocker) locker = g_mutex_locker_new(&handler_info->mutex);
+
if (!handler_info->thread) {
- LOGW("thread is not created");
+ CAM_LOG_WARNING("thread[t:%d] is not created", handler_info->type);
return;
}
- type = handler_info->type;
+ thread = handler_info->thread;
+ handler_info->thread = NULL;
- LOGD("t:%d thread %p", type, handler_info->thread);
+ CAM_LOG_INFO("t:%d thread[%p]", handler_info->type, thread);
- g_mutex_lock(&handler_info->mutex);
g_atomic_int_set(&handler_info->running, 0);
g_cond_signal(&handler_info->cond);
- g_mutex_unlock(&handler_info->mutex);
- g_thread_join(handler_info->thread);
- handler_info->thread = NULL;
+ g_clear_pointer(&locker, g_mutex_locker_free);
+
+ g_thread_join(thread);
- g_mutex_clear(&handler_info->mutex);
- g_cond_clear(&handler_info->cond);
g_queue_free(handler_info->queue);
handler_info->queue = NULL;
- LOGD("t:%d done", type);
-
- return;
+ CAM_LOG_INFO("t:%d done", handler_info->type);
}
-static camera_cb_info_s *_camera_client_callback_new(gint sockfd)
+static void __camera_mutex_cond_init(camera_cb_info_s *cb_info)
{
- camera_cb_info_s *cb_info = NULL;
- gint i = 0;
-
- g_return_val_if_fail(sockfd > 0, NULL);
+ int i = 0;
- cb_info = g_new0(camera_cb_info_s, 1);
- if (cb_info == NULL) {
- LOGE("cb_info failed");
- goto ErrorExit;
+ if (!cb_info) {
+ CAM_LOG_ERROR("NULL cb_info");
+ return;
}
- cb_info->api_waiting[MUSE_CAMERA_API_CREATE] = 1;
-
for (i = 0 ; i < MUSE_CAMERA_API_MAX ; i++) {
g_mutex_init(&cb_info->api_mutex[i]);
g_cond_init(&cb_info->api_cond[i]);
}
+ for (i = 0 ; i < MUSE_CAMERA_EVENT_TYPE_NUM ; i++)
+ g_mutex_init(&cb_info->user_cb_mutex[i]);
+
g_mutex_init(&cb_info->fd_lock);
g_mutex_init(&cb_info->mp_data_mutex);
+ g_mutex_init(&cb_info->bridge_lock);
+
+ g_mutex_init(&cb_info->msg_handler_info.mutex);
+ g_mutex_init(&cb_info->preview_cb_info.mutex);
+ g_mutex_init(&cb_info->capture_cb_info.mutex);
+ g_cond_init(&cb_info->msg_handler_info.cond);
+ g_cond_init(&cb_info->preview_cb_info.cond);
+ g_cond_init(&cb_info->capture_cb_info.cond);
+
+ CAM_LOG_INFO("done");
+}
+
+
+static void __camera_mutex_cond_clear(camera_cb_info_s *cb_info)
+{
+ int i = 0;
+
+ if (!cb_info) {
+ CAM_LOG_ERROR("NULL cb_info");
+ return;
+ }
+
+ g_mutex_clear(&cb_info->msg_handler_info.mutex);
+ g_mutex_clear(&cb_info->preview_cb_info.mutex);
+ g_mutex_clear(&cb_info->capture_cb_info.mutex);
+ g_cond_clear(&cb_info->msg_handler_info.cond);
+ g_cond_clear(&cb_info->preview_cb_info.cond);
+ g_cond_clear(&cb_info->capture_cb_info.cond);
+
+ g_mutex_clear(&cb_info->fd_lock);
+ g_mutex_clear(&cb_info->mp_data_mutex);
+ g_mutex_clear(&cb_info->bridge_lock);
for (i = 0 ; i < MUSE_CAMERA_EVENT_TYPE_NUM ; i++)
- g_mutex_init(&cb_info->user_cb_mutex[i]);
+ g_mutex_clear(&cb_info->user_cb_mutex[i]);
- /* message handler thread */
- if (!__create_msg_handler_thread(&cb_info->msg_handler_info,
- CAMERA_MESSAGE_HANDLER_TYPE_GENERAL, "camera_msg_handler", cb_info)) {
- LOGE("msg_handler_info failed");
+ for (i = 0 ; i < MUSE_CAMERA_API_MAX ; i++) {
+ g_mutex_clear(&cb_info->api_mutex[i]);
+ g_cond_clear(&cb_info->api_cond[i]);
+ }
+
+ CAM_LOG_INFO("done");
+}
+
+
+static camera_preview_cb_monitoring_info_s *__camera_preview_cb_monitoring_info_create(int stream_id)
+{
+ camera_preview_cb_monitoring_info_s *new_info = g_new0(camera_preview_cb_monitoring_info_s, 1);
+
+ new_info->stream_id = stream_id;
+ new_info->total = g_new0(monitoring_info_sub_s, 1);
+ new_info->interval = g_new0(monitoring_info_sub_s, 1);
+ new_info->timer_calling = g_timer_new();
+ new_info->timer_interval = g_timer_new();
+
+ CAM_LOG_INFO("create preview cb monitoring info[%p]", new_info);
+
+ return new_info;
+}
+
+
+static void __camera_preview_cb_monitoring_info_destroy(camera_preview_cb_monitoring_info_s *info)
+{
+ if (!info)
+ return;
+
+ g_timer_destroy(info->timer_calling);
+ g_timer_destroy(info->timer_interval);
+ g_free(info->total);
+ g_free(info->interval);
+
+ CAM_LOG_INFO("destroy preview cb monitoring info[%p]", info);
+
+ g_free(info);
+}
+
+
+static camera_cb_info_s *__camera_client_callback_new(gint sockfd)
+{
+ int i = 0;
+ camera_cb_info_s *cb_info = NULL;
+
+ g_return_val_if_fail(sockfd > 0, NULL);
+
+ cb_info = g_new0(camera_cb_info_s, 1);
+ if (!cb_info) {
+ CAM_LOG_ERROR("cb_info failed");
goto ErrorExit;
}
- /* message handler thread for preview callback */
- if (!__create_msg_handler_thread(&cb_info->preview_cb_info,
- CAMERA_MESSAGE_HANDLER_TYPE_PREVIEW_CB, "camera_msg_handler:preview_cb", cb_info)) {
- LOGE("preview_cb_info failed");
+ cb_info->api_waiting[MUSE_CAMERA_API_CREATE] = 1;
+
+ __camera_mutex_cond_init(cb_info);
+
+ /* message handler thread */
+ if (!__create_msg_handler_thread(&cb_info->msg_handler_info,
+ CAMERA_MESSAGE_HANDLER_TYPE_GENERAL, "cam:msg_handler", cb_info)) {
+ CAM_LOG_ERROR("msg_handler_info failed");
goto ErrorExit;
}
/* message handler thread for capture callback */
if (!__create_msg_handler_thread(&cb_info->capture_cb_info,
- CAMERA_MESSAGE_HANDLER_TYPE_CAPTURE_CB, "camera_msg_handler:capture_cb", cb_info)) {
- LOGE("capture_cb_info failed");
+ CAMERA_MESSAGE_HANDLER_TYPE_CAPTURE_CB, "cam:capture_cb", cb_info)) {
+ CAM_LOG_ERROR("capture_cb_info failed");
goto ErrorExit;
}
cb_info->fd = sockfd;
- cb_info->preview_cb_flag = 0;
/* message receive thread */
g_atomic_int_set(&cb_info->msg_recv_running, 1);
- cb_info->msg_recv_thread = g_thread_try_new("camera_msg_recv",
- _camera_msg_recv_func, (gpointer)cb_info, NULL);
+ cb_info->msg_recv_thread = g_thread_try_new("cam:msg_recv",
+ __camera_msg_recv_func, (gpointer)cb_info, NULL);
if (cb_info->msg_recv_thread == NULL) {
- LOGE("message receive thread creation failed");
+ CAM_LOG_ERROR("message receive thread creation failed");
goto ErrorExit;
}
/* initialize fd */
for (i = 0 ; i < MUSE_NUM_FD ; i++)
- cb_info->fds[i] = -1;
+ cb_info->fds[i] = CAMERA_FD_INIT;
cb_info->is_server_connected = TRUE;
- return cb_info;
+ cb_info->monitoring_info_preview = __camera_preview_cb_monitoring_info_create(CAMERA_MONITORING_INFO_STREAM_ID_PREVIEW);
+ cb_info->monitoring_info_preview_mp = __camera_preview_cb_monitoring_info_create(CAMERA_MONITORING_INFO_STREAM_ID_PREVIEW_MP);
+ for (i = 0 ; i < MM_CAMCORDER_EXTRA_PREVIEW_STREAM_MAX ; i++)
+ cb_info->monitoring_info_preview_ex[i] = __camera_preview_cb_monitoring_info_create(i);
+ return cb_info;
+//LCOV_EXCL_START
ErrorExit:
if (cb_info) {
__destroy_msg_handler_thread(&cb_info->msg_handler_info);
- __destroy_msg_handler_thread(&cb_info->preview_cb_info);
__destroy_msg_handler_thread(&cb_info->capture_cb_info);
- for (i = 0 ; i < MUSE_CAMERA_EVENT_TYPE_NUM ; i++)
- g_mutex_clear(&cb_info->user_cb_mutex[i]);
-
- g_mutex_clear(&cb_info->fd_lock);
- g_mutex_clear(&cb_info->mp_data_mutex);
-
- for (i = 0 ; i < MUSE_CAMERA_API_MAX ; i++) {
- g_mutex_clear(&cb_info->api_mutex[i]);
- g_cond_clear(&cb_info->api_cond[i]);
- }
+ __camera_mutex_cond_clear(cb_info);
g_free(cb_info);
cb_info = NULL;
}
return NULL;
+//LCOV_EXCL_STOP
}
-static void _camera_client_callback_destroy(camera_cb_info_s *cb_info)
+
+static void __camera_client_callback_destroy(camera_cb_info_s *cb_info)
{
int i = 0;
- g_return_if_fail(cb_info != NULL);
+ if (!cb_info) {
+ CAM_LOG_ERROR("NULL cb_info");
+ return;
+ }
- LOGD("msg_recv thread[%p] destroy", cb_info->msg_recv_thread);
+ CAM_LOG_INFO("msg_recv thread[%p] destroy", cb_info->msg_recv_thread);
g_thread_join(cb_info->msg_recv_thread);
cb_info->msg_recv_thread = NULL;
- LOGD("msg_recv thread removed");
+ CAM_LOG_INFO("msg_recv thread removed");
/* destroy msg handler threads */
- __destroy_msg_handler_thread(&cb_info->msg_handler_info);
__destroy_msg_handler_thread(&cb_info->preview_cb_info);
+ __destroy_msg_handler_thread(&cb_info->msg_handler_info);
__destroy_msg_handler_thread(&cb_info->capture_cb_info);
- for (i = 0 ; i < MUSE_CAMERA_EVENT_TYPE_NUM ; i++)
- g_mutex_clear(&cb_info->user_cb_mutex[i]);
-
- g_mutex_clear(&cb_info->fd_lock);
- g_mutex_clear(&cb_info->mp_data_mutex);
-
- for (i = 0 ; i < MUSE_CAMERA_API_MAX ; i++) {
- g_mutex_clear(&cb_info->api_mutex[i]);
- g_cond_clear(&cb_info->api_cond[i]);
- }
+ __camera_mutex_cond_clear(cb_info);
- if (cb_info->fd > -1) {
+ if (CAMERA_IS_FD_VALID(cb_info->fd)) {
muse_client_close(cb_info->fd);
- cb_info->fd = -1;
+ cb_info->fd = CAMERA_FD_INIT;
}
if (cb_info->bufmgr) {
cb_info->dp_interface = NULL;
}
- cb_info->preview_cb_flag = 0;
+ __camera_preview_cb_monitoring_info_destroy(cb_info->monitoring_info_preview);
+ __camera_preview_cb_monitoring_info_destroy(cb_info->monitoring_info_preview_mp);
+ for (i = 0 ; i < MM_CAMCORDER_EXTRA_PREVIEW_STREAM_MAX ; i++)
+ __camera_preview_cb_monitoring_info_destroy(cb_info->monitoring_info_preview_ex[i]);
g_free(cb_info);
- cb_info = NULL;
-
- return;
}
-
+//LCOV_EXCL_START
int _camera_start_evas_rendering(camera_h camera)
{
camera_cli_s *pc = (camera_cli_s *)camera;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("start");
+ CAM_LOG_INFO("start");
- if (!CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) {
- LOGE("EVAS surface is not set");
+ if (!pc->cb_info->is_evas_render) {
+ CAM_LOG_ERROR("EVAS surface is not set");
return CAMERA_ERROR_NONE;
}
int ret = CAMERA_ERROR_NONE;
camera_cli_s *pc = (camera_cli_s *)camera;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("stop - keep screen %d", keep_screen);
+ CAM_LOG_INFO("stop - keep screen %d", keep_screen);
- if (!CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) {
- LOGE("EVAS surface is not set");
+ if (!pc->cb_info->is_evas_render) {
+ CAM_LOG_ERROR("EVAS surface is not set");
return CAMERA_ERROR_NONE;
}
if (ret == MM_ERROR_NONE) {
ret = CAMERA_ERROR_NONE;
} else {
- LOGE("mm_evas_renderer_retrieve_all_packets failed 0x%x", ret);
+ CAM_LOG_ERROR("mm_evas_renderer_retrieve_all_packets failed 0x%x", ret);
ret = CAMERA_ERROR_INVALID_OPERATION;
}
return ret;
}
-
+//LCOV_EXCL_STOP
int _camera_independent_request(int api, int device_type, const char *key, int *value)
{
int ret = CAMERA_ERROR_NONE;
- int sock_fd = -1;
+ int sock_fd = CAMERA_FD_INIT;
int module_index = -1;
char *msg = NULL;
char recv_msg[MUSE_CAMERA_MSG_MAX_LENGTH] = {'\0',};
/* create muse connection */
if (!key || !value) {
- LOGE("NULL pointer");
+ CAM_LOG_ERROR("NULL pointer");
return CAMERA_ERROR_INVALID_PARAMETER;
}
sock_fd = muse_client_new();
if (sock_fd < 0) {
- LOGE("muse_client_new failed");
+ CAM_LOG_ERROR("muse_client_new failed");
return CAMERA_ERROR_INVALID_OPERATION;
}
if (muse_client_get_module_index(MODULE_NAME, &module_index) != MM_ERROR_NONE) {
- LOGE("muse client get module index failed");
+ CAM_LOG_ERROR("muse client get module index failed");
ret = CAMERA_ERROR_INVALID_OPERATION;
goto _REQUEST_EXIT;
}
MUSE_TYPE_INT, PARAM_DEVICE_TYPE, device_type,
0);
if (!msg) {
- LOGE("msg failed");
+ CAM_LOG_ERROR("msg failed");
ret = CAMERA_ERROR_OUT_OF_MEMORY;
goto _REQUEST_EXIT;
}
msg = NULL;
if (ret < 0) {
- LOGE("send msg failed");
+ CAM_LOG_ERROR("send msg failed");
ret = CAMERA_ERROR_INVALID_OPERATION;
goto _REQUEST_EXIT;
}
ret = muse_core_msg_recv(sock_fd, recv_msg, MUSE_CAMERA_MSG_MAX_LENGTH);
if (ret <= 0) {
- LOGE("recv msg failed %d", errno);
+ CAM_LOG_ERROR("recv msg failed %d", errno);
ret = CAMERA_ERROR_INVALID_OPERATION;
goto _REQUEST_EXIT;
}
if (!muse_camera_msg_get(ret, recv_msg)) {
- LOGE("failed to get return value from msg [%s]", recv_msg);
+ CAM_LOG_ERROR("failed to get return value from msg [%s]", recv_msg);
ret = CAMERA_ERROR_INVALID_OPERATION;
goto _REQUEST_EXIT;
}
if (ret == CAMERA_ERROR_NONE)
muse_core_msg_deserialize(key, recv_msg, NULL, NULL, MUSE_TYPE_ANY, value);
- LOGD("api %d - value %d", api, *value);
+ CAM_LOG_INFO("api %d - value %d", api, *value);
_REQUEST_EXIT:
- if (sock_fd > -1) {
+ if (CAMERA_IS_FD_VALID(sock_fd)) {
muse_client_close(sock_fd);
- sock_fd = -1;
+ sock_fd = CAMERA_FD_INIT;
}
return ret;
}
-int camera_create(camera_device_e device, camera_h *camera)
+int _camera_create_private(camera_device_e device, bool is_network, camera_h *camera)
{
- int sock_fd = -1;
+ int sock_fd = CAMERA_FD_INIT;
char *send_msg = NULL;
int send_ret = 0;
int ret = CAMERA_ERROR_NONE;
- int pid = 0;
camera_cli_s *pc = NULL;
tbm_bufmgr bufmgr = NULL;
int module_index = -1;
int device_type = (int)device;
- if (!camera) {
- LOGE("NULL pointer");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAM_LOG_INFO("device %d, is_network %d", device, is_network);
sock_fd = muse_client_new();
if (sock_fd < 0) {
- LOGE("muse_client_new failed - returned fd %d", sock_fd);
+ CAM_LOG_ERROR("muse_client_new failed - returned fd %d", sock_fd);
ret = CAMERA_ERROR_INVALID_OPERATION;
goto ErrorExit;
}
- pid = getpid();
-
if (muse_client_get_module_index(MODULE_NAME, &module_index) != MM_ERROR_NONE) {
- LOGE("muse client get module index failed");
+ CAM_LOG_ERROR("muse client get module index failed");
ret = CAMERA_ERROR_INVALID_OPERATION;
goto ErrorExit;
}
send_msg = muse_core_msg_new(api,
MUSE_TYPE_INT, "module", module_index,
MUSE_TYPE_INT, PARAM_DEVICE_TYPE, device_type,
- MUSE_TYPE_INT, "pid", pid,
+ MUSE_TYPE_INT, "is_network", (int)is_network,
0);
if (!send_msg) {
- LOGE("NULL msg");
+ CAM_LOG_ERROR("NULL msg");
ret = CAMERA_ERROR_OUT_OF_MEMORY;
goto ErrorExit;
}
send_msg = NULL;
if (send_ret < 0) {
- LOGE("send msg failed %d", errno);
+ CAM_LOG_ERROR("send msg failed %d", errno);
ret = CAMERA_ERROR_INVALID_OPERATION;
goto ErrorExit;
}
pc = g_new0(camera_cli_s, 1);
if (pc == NULL) {
- LOGE("camera_cli_s alloc failed");
+ CAM_LOG_ERROR("camera_cli_s alloc failed");
ret = CAMERA_ERROR_OUT_OF_MEMORY;
goto ErrorExit;
}
bufmgr = tbm_bufmgr_init(-1);
if (bufmgr == NULL) {
- LOGE("get tbm bufmgr failed");
+ CAM_LOG_ERROR("get tbm bufmgr failed");
ret = CAMERA_ERROR_INVALID_OPERATION;
goto ErrorExit;
}
- pc->cb_info = _camera_client_callback_new(sock_fd);
+ pc->cb_info = __camera_client_callback_new(sock_fd);
if (pc->cb_info == NULL) {
- LOGE("cb_info alloc failed");
+ CAM_LOG_ERROR("cb_info alloc failed");
ret = CAMERA_ERROR_OUT_OF_MEMORY;
goto ErrorExit;
}
- sock_fd = -1;
+ sock_fd = CAMERA_FD_INIT;
- LOGD("cb info : %d", pc->cb_info->fd);
+ CAM_LOG_INFO("cb info : %d", pc->cb_info->fd);
ret = _camera_client_wait_for_cb_return(api, pc->cb_info, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE) {
int preview_format = CAMERA_PIXEL_FORMAT_INVALID;
int user_buffer_supported = 0;
+ int log_level = CAMERA_LOG_LEVEL_INFO;
intptr_t handle = 0;
muse_camera_msg_get_pointer(handle, pc->cb_info->recv_msg);
if (handle == 0) {
- LOGE("Receiving Handle Failed!!");
+ CAM_LOG_ERROR("Receiving Handle Failed!!");
ret = CAMERA_ERROR_INVALID_OPERATION;
goto ErrorExit;
}
muse_camera_msg_get(preview_format, pc->cb_info->recv_msg);
muse_camera_msg_get(user_buffer_supported, pc->cb_info->recv_msg);
+ muse_camera_msg_get(log_level, pc->cb_info->recv_msg);
pc->remote_handle = handle;
pc->cb_info->bufmgr = bufmgr;
pc->cb_info->preview_format = preview_format;
- pc->cb_info->dp_type = CAMERA_DISPLAY_TYPE_NONE;
+ pc->cb_info->dp_info.type = CAMERA_DISPLAY_TYPE_NONE;
pc->cb_info->user_buffer_supported = (gboolean)user_buffer_supported;
+ pc->cb_info->is_network = is_network;
+ g_camera_log_level = log_level;
+
+ CAM_LOG_INFO("default preview format %d, user buffer %d, log level %d",
+ preview_format, user_buffer_supported, g_camera_log_level);
- LOGD("default preview format %d, user buffer %d",
- preview_format, user_buffer_supported);
+ if (!camera) {
+ CAM_LOG_ERROR("NULL out handle");
+ ret= CAMERA_ERROR_INVALID_PARAMETER;
+ goto ErrorExit;
+ }
*camera = (camera_h)pc;
/* get display interface handle */
if (mm_display_interface_init(&pc->cb_info->dp_interface) != MM_ERROR_NONE)
- LOGW("display interface init failed");
+ CAM_LOG_WARNING("display interface init failed");
} else {
goto ErrorExit;
}
return ret;
-
+//LCOV_EXCL_START
ErrorExit:
if (bufmgr) {
tbm_bufmgr_deinit(bufmgr);
bufmgr = NULL;
}
- if (sock_fd > -1) {
+ if (CAMERA_IS_FD_VALID(sock_fd)) {
muse_client_close(sock_fd);
- sock_fd = -1;
+ sock_fd = CAMERA_FD_INIT;
}
if (pc) {
/* pc->cb_info->fd should be closed,
because g_thread_join for msg_recv_thread is not returned
- in _camera_client_callback_destroy. */
- if (temp_fd > -1) {
- pc->cb_info->fd = -1;
+ in __camera_client_callback_destroy. */
+ if (CAMERA_IS_FD_VALID(temp_fd)) {
+ pc->cb_info->fd = CAMERA_FD_INIT;
muse_client_close(temp_fd);
}
- _camera_client_callback_destroy(pc->cb_info);
+ __camera_client_callback_destroy(pc->cb_info);
pc->cb_info = NULL;
}
g_free(pc);
pc = NULL;
}
- LOGE("camera create error : 0x%x", ret);
+ CAM_LOG_ERROR("camera create error : 0x%x", ret);
return ret;
+//LCOV_EXCL_STOP
+}
+
+
+int camera_create(camera_device_e device, camera_h *camera)
+{
+ return _camera_create_private(device, false, camera);
}
camera_cli_s *pc = (camera_cli_s *)camera;
camera_msg_param param;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
CAMERA_MSG_PARAM_SET(param, INT, device);
pc->cb_info->user_cb[i] = NULL;
pc->cb_info->user_data[i] = NULL;
}
- UNSET_PREVIEW_CB_TYPE(pc->cb_info, PREVIEW_CB_TYPE_USER);
}
return ret;
muse_camera_api_e api = MUSE_CAMERA_API_DESTROY;
camera_cli_s *pc = (camera_cli_s *)camera;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
if (pc->cb_info->is_server_connected)
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
else
- LOGW("server disconnected. release resource without send message.");
+ CAM_LOG_WARNING("server disconnected. release resource without send message.");
if (ret == CAMERA_ERROR_NONE) {
- _camera_deactivate_idle_event_all(pc->cb_info);
- _camera_client_callback_destroy(pc->cb_info);
+ __camera_deactivate_idle_event_all(pc->cb_info);
+ __camera_client_callback_destroy(pc->cb_info);
pc->cb_info = NULL;
g_free(pc);
pc = NULL;
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
int camera_start_preview(camera_h camera)
{
+ int i = 0;
int ret = CAMERA_ERROR_NONE;
+ int *fds = NULL;
muse_camera_api_e api = MUSE_CAMERA_API_START_PREVIEW;
camera_cli_s *pc = (camera_cli_s *)camera;
camera_state_e current_state = CAMERA_STATE_NONE;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter : preview format %d, display type %d",
- pc->cb_info->preview_format, pc->cb_info->dp_type);
+ CAM_LOG_INFO("Enter : preview format %d, display type %d",
+ pc->cb_info->preview_format, pc->cb_info->dp_info.type);
+
+ if (pc->cb_info->preview_format == CAMERA_PIXEL_FORMAT_INVZ &&
+ pc->cb_info->dp_info.type != CAMERA_DISPLAY_TYPE_NONE) {
+ CAM_LOG_ERROR("CAMERA_DISPLAY_TYPE_NONE[current %d] should be set with INVZ format",
+ pc->cb_info->dp_info.type);
+ return CAMERA_ERROR_INVALID_OPERATION;
+ }
ret = camera_get_state(camera, ¤t_state);
if (ret != CAMERA_ERROR_NONE) {
- LOGE("failed to get current state 0x%x", ret);
+ CAM_LOG_ERROR("failed to get current state 0x%x", ret);
return ret;
}
- if (pc->cb_info->preview_format == CAMERA_PIXEL_FORMAT_INVZ &&
- pc->cb_info->dp_type != CAMERA_DISPLAY_TYPE_NONE) {
- LOGE("CAMERA_DISPLAY_TYPE_NONE[current %d] should be set with INVZ format",
- pc->cb_info->dp_type);
- return CAMERA_ERROR_INVALID_OPERATION;
- }
+ if (current_state == CAMERA_STATE_CREATED) {
+ __camera_preview_cb_monitoring_info_reset(pc->cb_info->monitoring_info_preview);
+ __camera_preview_cb_monitoring_info_reset(pc->cb_info->monitoring_info_preview_mp);
+ for (i = 0 ; i < MM_CAMCORDER_EXTRA_PREVIEW_STREAM_MAX ; i++)
+ __camera_preview_cb_monitoring_info_reset(pc->cb_info->monitoring_info_preview_ex[i]);
- if (current_state == CAMERA_STATE_CREATED && pc->cb_info->user_buffer_supported) {
- if (!_camera_allocate_preview_buffer(camera))
+ if (!__create_msg_handler_thread(&pc->cb_info->preview_cb_info,
+ CAMERA_MESSAGE_HANDLER_TYPE_PREVIEW_CB, "cam:preview_cb", pc->cb_info)) {
+ CAM_LOG_ERROR("preview_cb_info failed");
return CAMERA_ERROR_INVALID_OPERATION;
+ }
- _camera_msg_send(api, pc->cb_info->fds, pc->cb_info, &ret, CAMERA_CB_NO_TIMEOUT);
- } else {
- _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_NO_TIMEOUT);
+ if (pc->cb_info->user_buffer_supported) {
+ if (!__camera_allocate_preview_buffer(camera)) {
+ ret = CAMERA_ERROR_INVALID_OPERATION;
+ goto _START_FAILED;
+ }
+
+ fds = pc->cb_info->fds;
+ }
}
- if (ret == CAMERA_ERROR_NONE && CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) {
+ pc->cb_info->invoke_preview_cb = TRUE;
+
+ _camera_msg_send(api, fds, pc->cb_info, &ret,
+#ifdef TIZEN_FEATURE_NO_TIMEOUT_FOR_PREVIEW
+ CAMERA_CB_NO_TIMEOUT);
+#else
+ CAMERA_CB_TIMEOUT_FOR_PREVIEW);
+#endif
+ if (ret != CAMERA_ERROR_NONE)
+ goto _START_FAILED;
+
+ if (pc->cb_info->is_evas_render) {
ret = _camera_start_evas_rendering(camera);
if (ret != CAMERA_ERROR_NONE) {
- LOGE("stop preview because of error");
+ CAM_LOG_ERROR("stop preview because of error");
_camera_msg_send(MUSE_CAMERA_API_STOP_PREVIEW, NULL, pc->cb_info, NULL, 0);
+ goto _START_FAILED;
}
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("done");
+
+ return CAMERA_ERROR_NONE;
+
+_START_FAILED:
+ if (current_state == CAMERA_STATE_CREATED) {
+ if (pc->cb_info->user_buffer_supported)
+ __camera_release_preview_buffer(camera);
+
+ __destroy_msg_handler_thread(&pc->cb_info->preview_cb_info);
+ }
+
+ CAM_LOG_ERROR("failed : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_STOP_PREVIEW;
camera_state_e current_state = CAMERA_STATE_NONE;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
- if (CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) {
+//LCOV_EXCL_START
+ if (pc->cb_info->is_evas_render) {
ret = camera_get_state(camera, ¤t_state);
if (ret != CAMERA_ERROR_NONE) {
- LOGE("failed to get current state 0x%x", ret);
+ CAM_LOG_ERROR("failed to get current state 0x%x", ret);
return ret;
}
return ret;
}
}
+//LCOV_EXCL_STOP
+
+ pc->cb_info->invoke_preview_cb = FALSE;
- /* send stop preview message */
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE) {
if (pc->cb_info->user_buffer_supported)
- _camera_release_preview_buffer(camera);
+ __camera_release_preview_buffer(camera);
+
+ /* release remained message for preview callback */
+ __destroy_msg_handler_thread(&pc->cb_info->preview_cb_info);
} else if (current_state == CAMERA_STATE_PREVIEW) {
- LOGW("restart evas rendering");
+ CAM_LOG_WARNING("restart evas rendering");
_camera_start_evas_rendering(camera);
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_START_CAPTURE;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_CAPTURE] = capturing_cb;
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_CAPTURE] = user_data;
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
bool camera_is_supported_continuous_capture(camera_h camera)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_SUPPORT_CONTINUOUS_CAPTURE;
-
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
- if (ret < 0) {
- LOGE("error is occurred 0x%x", ret);
- ret = false;
- }
-
- LOGD("ret : %d", ret);
-
- return (bool)ret;
+ return __is_supported(camera, MUSE_CAMERA_API_SUPPORT_CONTINUOUS_CAPTURE);
}
camera_msg_param param;
int value = 0;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_CAPTURE] = capturing_cb;
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_CAPTURE] = user_data;
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_STOP_CONTINUOUS_CAPTURE;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
bool camera_is_supported_face_detection(camera_h camera)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_SUPPORT_FACE_DETECTION;
-
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
- if (ret < 0) {
- LOGE("error is occurred 0x%x", ret);
- ret = false;
- }
-
- LOGD("ret : %d", ret);
-
- return (bool)ret;
+ return __is_supported(camera, MUSE_CAMERA_API_SUPPORT_FACE_DETECTION);
}
bool camera_is_supported_zero_shutter_lag(camera_h camera)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_SUPPORT_ZERO_SHUTTER_LAG;
-
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
- if (ret < 0) {
- LOGE("error is occurred 0x%x", ret);
- ret = false;
- }
-
- LOGD("ret : %d", ret);
-
- return (bool)ret;
+ return __is_supported(camera, MUSE_CAMERA_API_SUPPORT_ZERO_SHUTTER_LAG);
}
bool camera_is_supported_media_packet_preview_cb(camera_h camera)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_SUPPORT_MEDIA_PACKET_PREVIEW_CB;
-
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
- if (ret < 0) {
- LOGE("error is occurred 0x%x", ret);
- ret = false;
- }
+ return __is_supported(camera, MUSE_CAMERA_API_SUPPORT_MEDIA_PACKET_PREVIEW_CB);
+}
- LOGD("ret : %d", ret);
- return (bool)ret;
+bool camera_is_supported_extra_preview(camera_h camera)
+{
+ return __is_supported(camera, MUSE_CAMERA_API_SUPPORT_EXTRA_PREVIEW);
}
+
int camera_get_device_count(camera_h camera, int *device_count)
{
int ret = CAMERA_ERROR_NONE;
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_GET_DEVICE_COUNT;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*device_count = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_DEVICE_COUNT];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_START_FACE_DETECTION;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_FACE_DETECTION]);
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_STOP_FACE_DETECTION;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_FACE_DETECTION]);
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_GET_STATE;
if (!pc || !pc->cb_info || !state) {
- LOGE("NULL pointer %p %p", pc, state);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, state);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*state = (camera_state_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_STATE];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_msg_param param;
int is_continuous = (int)continuous;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
CAMERA_MSG_PARAM_SET(param, INT, is_continuous);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_CANCEL_FOCUSING;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter, remote_handle : %td", pc->remote_handle);
+ CAM_LOG_INFO("Enter, remote_handle : %td", pc->remote_handle);
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
-int camera_set_display(camera_h camera, camera_display_type_e type, camera_display_h display)
+
+int _camera_set_display(camera_h camera, mm_display_type_e type, void *display)
{
+ int mm_ret = MM_ERROR_NONE;
int ret = CAMERA_ERROR_NONE;
- int parent_id = 0;
camera_cli_s *pc = (camera_cli_s *)camera;
camera_cb_info_s *cb_info = NULL;
camera_state_e current_state = CAMERA_STATE_NONE;
- camera_msg_param param0;
- camera_msg_param param1;
+ camera_msg_param param;
muse_camera_api_e api = MUSE_CAMERA_API_SET_DISPLAY;
+ muse_camera_display_info_s *dp_info = NULL;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- if (type < CAMERA_DISPLAY_TYPE_OVERLAY || type > CAMERA_DISPLAY_TYPE_NONE) {
- LOGE("invalid type %d", type);
+ if (type > MM_DISPLAY_TYPE_OVERLAY_EXT) {
+ CAM_LOG_ERROR("invalid type %d", type);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- if (type != CAMERA_DISPLAY_TYPE_NONE && display == NULL) {
- LOGE("display type[%d] is not NONE, but display handle is NULL", type);
+ if (type != MM_DISPLAY_TYPE_NONE && display == NULL) {
+ CAM_LOG_ERROR("display type[%d] is not NONE, but display handle is NULL", type);
return CAMERA_ERROR_INVALID_PARAMETER;
}
cb_info = (camera_cb_info_s *)pc->cb_info;
+ dp_info = &cb_info->dp_info;
ret = camera_get_state(camera, ¤t_state);
if (ret != CAMERA_ERROR_NONE) {
- LOGE("failed to get current state 0x%x", ret);
+ CAM_LOG_ERROR("failed to get current state 0x%x", ret);
return ret;
}
if (current_state != CAMERA_STATE_CREATED) {
- LOGE("INVALID_STATE : current %d", current_state);
+ CAM_LOG_ERROR("INVALID_STATE : current %d", current_state);
return CAMERA_ERROR_INVALID_STATE;
}
- LOGD("Enter - type : %d, display : %p", type, display);
+ CAM_LOG_INFO("Enter - type : %d, display : %p", type, display);
- if (type != CAMERA_DISPLAY_TYPE_NONE) {
+ if (type != MM_DISPLAY_TYPE_NONE) {
/* check display interface handle */
if (!cb_info->dp_interface) {
- LOGE("display interface not supported");
+ CAM_LOG_ERROR("display interface not supported");
return CAMERA_ERROR_NOT_SUPPORTED;
}
- ret = mm_display_interface_set_display(cb_info->dp_interface, type, display, &parent_id);
- if (ret != MM_ERROR_NONE) {
- LOGE("[INVALID_OPERATION] set display failed[0x%x]", ret);
+ mm_ret = mm_display_interface_set_display(cb_info->dp_interface, type, display, &dp_info->parent_id);
+ if (mm_ret == (int)MM_ERROR_NOT_SUPPORT_API) {
+ CAM_LOG_ERROR("[NOT_SUPPORTED] type %d", type);
+ return CAMERA_ERROR_NOT_SUPPORTED;
+ } else if (mm_ret != MM_ERROR_NONE) {
+ CAM_LOG_ERROR("[INVALID_OPERATION] set display failed[0x%x]", mm_ret);
return CAMERA_ERROR_INVALID_OPERATION;
}
- if (type == CAMERA_DISPLAY_TYPE_EVAS) {
+ if (type == MM_DISPLAY_TYPE_OVERLAY || type == MM_DISPLAY_TYPE_OVERLAY_EXT) {
+ mm_ret = mm_display_interface_get_window_rect(cb_info->dp_interface, &dp_info->window_rect);
+
+ CAM_LOG_INFO("ret 0x%x, parent_id %d, window rect %d,%d,%dx%d",
+ ret, dp_info->parent_id, dp_info->window_rect.x, dp_info->window_rect.y,
+ dp_info->window_rect.width, dp_info->window_rect.height);
+ } else if (type == MM_DISPLAY_TYPE_EVAS) {
+//LCOV_EXCL_START
camera_flip_e flip = CAMERA_FLIP_NONE;
camera_display_mode_e mode = CAMERA_DISPLAY_MODE_LETTER_BOX;
camera_rotation_e rotation = CAMERA_ROTATION_NONE;
camera_get_display_mode(camera, &mode);
camera_get_display_rotation(camera, &rotation);
camera_is_display_visible(camera, &visible);
- camera_attr_get_display_roi_area(camera, &x, &y, &width, &height);
- LOGD("current setting : flip %d, mode %d, rotation %d, visible %d, roi %d,%d,%dx%d",
- flip, mode, rotation, visible, x, y, width, height);
+ CAM_LOG_INFO("current setting : flip %d, mode %d, rotation %d, visible %d",
+ flip, mode, rotation, visible);
- ret = mm_display_interface_evas_set_flip(cb_info->dp_interface, flip);
- ret |= mm_display_interface_evas_set_mode(cb_info->dp_interface, mode);
- ret |= mm_display_interface_evas_set_rotation(cb_info->dp_interface, rotation);
- ret |= mm_display_interface_evas_set_visible(cb_info->dp_interface, visible);
+ mm_ret = mm_display_interface_evas_set_flip(cb_info->dp_interface, flip);
+ mm_ret |= mm_display_interface_evas_set_mode(cb_info->dp_interface, mode);
+ mm_ret |= mm_display_interface_evas_set_rotation(cb_info->dp_interface, rotation);
+ mm_ret |= mm_display_interface_evas_set_visible(cb_info->dp_interface, visible);
- if (mode == CAMERA_DISPLAY_MODE_CUSTOM_ROI)
- ret |= mm_display_interface_evas_set_roi_area(cb_info->dp_interface, x, y, width, height);
+ if (mode == CAMERA_DISPLAY_MODE_CUSTOM_ROI) {
+ camera_attr_get_display_roi_area(camera, &x, &y, &width, &height);
+ CAM_LOG_INFO("current setting : roi %d,%d,%dx%d", x, y, width, height);
+ mm_ret |= mm_display_interface_evas_set_roi_area(cb_info->dp_interface, x, y, width, height);
+ }
+//LCOV_EXCL_STOP
}
}
- CAMERA_MSG_PARAM_SET(param0, INT, type);
- CAMERA_MSG_PARAM_SET(param1, INT, parent_id);
+ if (mm_ret != MM_ERROR_NONE) {
+ CAM_LOG_ERROR("mm_ret 0x%x failed", mm_ret);
+ return CAMERA_ERROR_INVALID_OPERATION;
+ }
- _camera_msg_send_param2_int(api, cb_info, &ret,
- ¶m0, ¶m1, CAMERA_CB_TIMEOUT);
+ dp_info->type = type;
- if (ret == CAMERA_ERROR_NONE) {
- pc->cb_info->dp_type = type;
+ CAMERA_MSG_PARAM_SET_ARRAY(param, ARRAY, dp_info, sizeof(muse_camera_display_info_s));
- if (type == CAMERA_DISPLAY_TYPE_EVAS)
- SET_PREVIEW_CB_TYPE(cb_info, PREVIEW_CB_TYPE_EVAS);
- }
+ _camera_msg_send_param1(api, cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
+
+ if (ret == CAMERA_ERROR_NONE)
+ cb_info->is_evas_render = (type == MM_DISPLAY_TYPE_EVAS) ? TRUE : FALSE;
return ret;
}
+int camera_set_display(camera_h camera, camera_display_type_e type, camera_display_h display)
+{
+ CAM_LOG_INFO("type %d, display %p", type, display);
+ return _camera_set_display(camera, (mm_display_type_e)type, display);
+}
+
+
int camera_set_preview_resolution(camera_h camera, int width, int height)
{
int ret = CAMERA_ERROR_NONE;
camera_msg_param param;
int value = 0;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- if (CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) {
+ if (pc->cb_info->is_evas_render) {
ret = camera_get_state(camera, ¤t_state);
if (ret != CAMERA_ERROR_NONE) {
- LOGE("failed to get current state 0x%x", ret);
+ CAM_LOG_ERROR("failed to get current state 0x%x", ret);
return ret;
}
value = (width << 16) | height;
CAMERA_MSG_PARAM_SET(param, INT, value);
- LOGD("%dx%d -> 0x%x", width, height, value);
+ CAM_LOG_INFO("%dx%d -> 0x%x", width, height, value);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
if (current_state == CAMERA_STATE_PREVIEW) {
- LOGW("restart evas rendering");
+ CAM_LOG_WARNING("restart evas rendering");
_camera_start_evas_rendering(camera);
}
camera_msg_param param;
int value = 0;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
value = (width << 16) | height;
CAMERA_MSG_PARAM_SET(param, INT, value);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_SET_CAPTURE_FORMAT;
camera_msg_param param;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter - format %d", set_format);
+ CAM_LOG_INFO("Enter - format %d", set_format);
CAMERA_MSG_PARAM_SET(param, INT, set_format);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_SET_PREVIEW_FORMAT;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter - format %d", set_format);
+ CAM_LOG_INFO("Enter - format %d", set_format);
CAMERA_MSG_PARAM_SET(param, INT, set_format);
if (ret == CAMERA_ERROR_NONE)
pc->cb_info->preview_format = set_format;
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_GET_PREVIEW_RESOLUTION;
if (!pc || !pc->cb_info || !width || !height) {
- LOGE("NULL pointer %p %p %p", pc, width, height);
+ CAM_LOG_ERROR("NULL pointer %p %p %p", pc, width, height);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
*height = 0x0000ffff & pc->cb_info->get_int[MUSE_CAMERA_GET_INT_PREVIEW_RESOLUTION];
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_cli_s *pc = (camera_cli_s *)camera;
camera_msg_param param;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- if (CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) {
+ if (pc->cb_info->is_evas_render) {
ret = mm_display_interface_evas_set_rotation(pc->cb_info->dp_interface, rotation);
if (ret != MM_ERROR_NONE) {
- LOGE("failed to set rotation for evas surface 0x%x", ret);
+ CAM_LOG_ERROR("failed to set rotation for evas surface 0x%x", ret);
return CAMERA_ERROR_INVALID_OPERATION;
}
}
camera_cli_s *pc = (camera_cli_s *)camera;
if (!pc || !pc->cb_info || !rotation) {
- LOGE("NULL pointer %p %p", pc, rotation);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, rotation);
return CAMERA_ERROR_INVALID_PARAMETER;
}
camera_cli_s *pc = (camera_cli_s *)camera;
camera_msg_param param;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- if (CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) {
+ if (pc->cb_info->is_evas_render) {
ret = mm_display_interface_evas_set_flip(pc->cb_info->dp_interface, flip);
if (ret != MM_ERROR_NONE) {
- LOGE("failed to set flip for evas surface 0x%x", ret);
+ CAM_LOG_ERROR("failed to set flip for evas surface 0x%x", ret);
return CAMERA_ERROR_INVALID_OPERATION;
}
}
camera_cli_s *pc = (camera_cli_s *)camera;
if (!pc || !pc->cb_info || !flip) {
- LOGE("NULL pointer %p %p", pc, flip);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, flip);
return CAMERA_ERROR_INVALID_PARAMETER;
}
camera_cli_s *pc = (camera_cli_s *)camera;
camera_msg_param param;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- if (CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) {
+ if (pc->cb_info->is_evas_render) {
ret = mm_display_interface_evas_set_visible(pc->cb_info->dp_interface, visible);
if (ret != MM_ERROR_NONE) {
- LOGE("failed to set visible for evas surface 0x%x", ret);
+ CAM_LOG_ERROR("failed to set visible for evas surface 0x%x", ret);
return CAMERA_ERROR_INVALID_OPERATION;
}
}
camera_cli_s *pc = (camera_cli_s *)camera;
if (!pc || !pc->cb_info || !visible) {
- LOGE("NULL pointer %p %p", pc, visible);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, visible);
return CAMERA_ERROR_INVALID_PARAMETER;
}
camera_cli_s *pc = (camera_cli_s *)camera;
camera_msg_param param;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- if (CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) {
+ if (pc->cb_info->is_evas_render) {
ret = mm_display_interface_evas_set_mode(pc->cb_info->dp_interface, mode);
if (ret != MM_ERROR_NONE) {
- LOGE("failed to set geometry for evas surface 0x%x", ret);
+ CAM_LOG_ERROR("failed to set geometry for evas surface 0x%x", ret);
return CAMERA_ERROR_INVALID_OPERATION;
}
}
camera_cli_s *pc = (camera_cli_s *)camera;
if (!pc || !pc->cb_info || !mode) {
- LOGE("NULL pointer %p %p", pc, mode);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, mode);
return CAMERA_ERROR_INVALID_PARAMETER;
}
camera_cli_s *pc = (camera_cli_s *)camera;
camera_msg_param param;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter - hint %d", set_hint);
+ CAM_LOG_INFO("Enter - hint %d", set_hint);
CAMERA_MSG_PARAM_SET(param, INT, set_hint);
muse_camera_api_e api = MUSE_CAMERA_API_GET_DISPLAY_REUSE_HINT;
if (!pc || !pc->cb_info || !hint) {
- LOGE("NULL pointer %p %p", pc, hint);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, hint);
return CAMERA_ERROR_INVALID_PARAMETER;
}
if (ret == CAMERA_ERROR_NONE) {
*hint = (bool)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_DISPLAY_REUSE_HINT];
- LOGD("display reuse hint %d", *hint);
+ CAM_LOG_INFO("display reuse hint %d", *hint);
}
return ret;
muse_camera_api_e api = MUSE_CAMERA_API_GET_CAPTURE_RESOLUTION;
if (!pc || !pc->cb_info || !width || !height) {
- LOGE("NULL pointer %p %p %p", pc, width, height);
+ CAM_LOG_ERROR("NULL pointer %p %p %p", pc, width, height);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
*height = 0x0000ffff & pc->cb_info->get_int[MUSE_CAMERA_GET_INT_CAPTURE_RESOLUTION];
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_GET_CAPTURE_FORMAT;
if (!pc || !pc->cb_info || !format) {
- LOGE("NULL pointer %p %p", pc, format);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, format);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*format = (camera_pixel_format_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_CAPTURE_FORMAT];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_GET_PREVIEW_FORMAT;
if (!pc || !pc->cb_info || !format) {
- LOGE("NULL pointer %p %p", pc, format);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, format);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*format = (camera_pixel_format_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_PREVIEW_FORMAT];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_GET_FACING_DIRECTION;
if (!pc || !pc->cb_info || !facing_direction) {
- LOGE("NULL pointer %p %p", pc, facing_direction);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, facing_direction);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*facing_direction = (camera_facing_direction_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_FACING_DIRECTION];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_SET_PREVIEW_CB;
if (!pc || !pc->cb_info || !callback) {
- LOGE("NULL pointer %p %p", pc, callback);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, callback);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_PREVIEW] = user_data;
g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_PREVIEW]);
-
- SET_PREVIEW_CB_TYPE(pc->cb_info, PREVIEW_CB_TYPE_USER);
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_UNSET_PREVIEW_CB;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_PREVIEW] = NULL;
g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_PREVIEW]);
-
- UNSET_PREVIEW_CB_TYPE(pc->cb_info, PREVIEW_CB_TYPE_USER);
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_SET_MEDIA_PACKET_PREVIEW_CB;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
if (camera_is_supported_media_packet_preview_cb(camera) == false) {
- LOGE("NOT SUPPORTED");
+ CAM_LOG_ERROR("NOT SUPPORTED");
return CAMERA_ERROR_NOT_SUPPORTED;
}
if (callback == NULL) {
- LOGE("NULL callback");
+ CAM_LOG_ERROR("NULL callback");
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_MEDIA_PACKET_PREVIEW]);
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_UNSET_MEDIA_PACKET_PREVIEW_CB;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
+
+ if (camera_is_supported_media_packet_preview_cb(camera) == false) {
+ CAM_LOG_ERROR("NOT SUPPORTED");
+ return CAMERA_ERROR_NOT_SUPPORTED;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_MEDIA_PACKET_PREVIEW]);
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_SET_STATE_CHANGED_CB;
if (!pc || !pc->cb_info || !callback) {
- LOGE("NULL pointer %p %p", pc, callback);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, callback);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_STATE_CHANGE]);
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_UNSET_STATE_CHANGED_CB;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_STATE_CHANGE]);
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_SET_INTERRUPTED_CB;
if (!pc || !pc->cb_info || !callback) {
- LOGE("NULL pointer %p %p", pc, callback);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, callback);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_INTERRUPTED]);
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_UNSET_INTERRUPTED_CB;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_INTERRUPTED]);
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_SET_INTERRUPT_STARTED_CB;
if (!pc || !pc->cb_info || !callback) {
- LOGE("NULL pointer %p %p", pc, callback);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, callback);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_INTERRUPT_STARTED]);
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_UNSET_INTERRUPT_STARTED_CB;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_INTERRUPT_STARTED]);
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_SET_FOCUS_CHANGED_CB;
if (!pc || !pc->cb_info || !callback) {
- LOGE("NULL pointer %p %p", pc, callback);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, callback);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_FOCUS_CHANGE]);
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_UNSET_FOCUS_CHANGED_CB;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_FOCUS_CHANGE]);
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_SET_ERROR_CB;
if (!pc || !pc->cb_info || !callback) {
- LOGE("NULL pointer %p %p", pc, callback);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, callback);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_ERROR]);
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_UNSET_ERROR_CB;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_ERROR]);
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_SET_FOREACH_SUPPORTED_PREVIEW_RESOLUTION;
if (!pc || !pc->cb_info || !foreach_cb) {
- LOGE("NULL pointer %p %p", pc, foreach_cb);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, foreach_cb);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_PREVIEW_RESOLUTION] = foreach_cb;
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_PREVIEW_RESOLUTION] = user_data;
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_SET_FOREACH_SUPPORTED_CAPTURE_RESOLUTION;
if (!pc || !pc->cb_info || !foreach_cb) {
- LOGE("NULL pointer %p %p", pc, foreach_cb);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, foreach_cb);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_CAPTURE_RESOLUTION] = foreach_cb;
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_CAPTURE_RESOLUTION] = user_data;
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_SET_FOREACH_SUPPORTED_CAPTURE_FORMAT;
if (!pc || !pc->cb_info || !foreach_cb) {
- LOGE("NULL pointer %p %p", pc, foreach_cb);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, foreach_cb);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_CAPTURE_FORMAT] = foreach_cb;
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_CAPTURE_FORMAT] = user_data;
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_SET_FOREACH_SUPPORTED_PREVIEW_FORMAT;
if (!pc || !pc->cb_info || !foreach_cb) {
- LOGE("NULL pointer %p %p", pc, foreach_cb);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, foreach_cb);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_PREVIEW_FORMAT] = foreach_cb;
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_PREVIEW_FORMAT] = user_data;
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_GET_RECOMMENDED_PREVIEW_RESOLUTION;
if (!pc || !pc->cb_info || !width || !height) {
- LOGE("NULL pointer %p %p %p", pc, width, height);
+ CAM_LOG_ERROR("NULL pointer %p %p %p", pc, width, height);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE) {
*height = 0x0000ffff & pc->cb_info->get_int[MUSE_CAMERA_GET_INT_RECOMMENDED_PREVIEW_RESOLUTION];
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_LENS_ORIENTATION;
if (!pc || !pc->cb_info || !angle) {
- LOGE("NULL pointer %p %p", pc, angle);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, angle);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*angle = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_LENS_ORIENTATION];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
int camera_attr_set_theater_mode(camera_h camera, camera_attr_theater_mode_e mode)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_THEATER_MODE;
- camera_msg_param param;
- int set_mode = (int)mode;
-
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- CAMERA_MSG_PARAM_SET(param, INT, set_mode);
-
- _camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
-
- LOGD("ret : 0x%x", ret);
-
- return ret;
+ return __set_mode(camera, MUSE_CAMERA_API_ATTR_SET_THEATER_MODE, (int)mode);
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_THEATER_MODE;
if (!pc || !pc->cb_info || !mode) {
- LOGE("NULL pointer %p %p", pc, mode);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, mode);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*mode = (camera_attr_theater_mode_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_THEATER_MODE];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_THEATER_MODE;
if (!pc || !pc->cb_info || !foreach_cb) {
- LOGE("NULL pointer %p %p", pc, foreach_cb);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, foreach_cb);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_THEATER_MODE] = foreach_cb;
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_THEATER_MODE] = user_data;
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("Finish, return :%x", ret);
+ CAM_LOG_INFO("Finish, return :%x", ret);
return ret;
}
camera_msg_param param;
int set_fps = (int)fps;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
CAMERA_MSG_PARAM_SET(param, INT, set_fps);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_IMAGE_QUALITY;
camera_msg_param param;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
CAMERA_MSG_PARAM_SET(param, INT, quality);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_PREVIEW_FPS;
if (!pc || !pc->cb_info || !fps) {
- LOGE("NULL pointer %p %p", pc, fps);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, fps);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*fps = (camera_attr_fps_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_PREVIEW_FPS];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_IMAGE_QUALITY;
if (!pc || !pc->cb_info || !quality) {
- LOGE("NULL pointer %p %p", pc, quality);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, quality);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*quality = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_IMAGE_QUALITY];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_ENCODED_PREVIEW_BITRATE;
if (!pc || !pc->cb_info || !bitrate) {
- LOGE("NULL pointer %p %p", pc, bitrate);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, bitrate);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*bitrate = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_ENCODED_PREVIEW_BITRATE];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_msg_param param;
int set_bitrate = bitrate;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
CAMERA_MSG_PARAM_SET(param, INT, set_bitrate);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_ENCODED_PREVIEW_GOP_INTERVAL;
if (!pc || !pc->cb_info || !interval) {
- LOGE("NULL pointer %p %p", pc, interval);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, interval);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*interval = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_ENCODED_PREVIEW_GOP_INTERVAL];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_msg_param param;
int set_gop_interval = interval;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
CAMERA_MSG_PARAM_SET(param, INT, set_gop_interval);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_ZOOM;
camera_msg_param param;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter, remote_handle : %td", pc->remote_handle);
+ CAM_LOG_INFO("Enter, remote_handle : %td", pc->remote_handle);
CAMERA_MSG_PARAM_SET(param, INT, zoom);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
int camera_attr_set_af_mode(camera_h camera, camera_attr_af_mode_e mode)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_AF_MODE;
- camera_msg_param param;
- int set_mode = (int)mode;
-
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter, remote_handle : %td", pc->remote_handle);
-
- CAMERA_MSG_PARAM_SET(param, INT, set_mode);
-
- _camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
-
- return ret;
+ return __set_mode(camera, MUSE_CAMERA_API_ATTR_SET_AF_MODE, (int)mode);
}
camera_msg_param param;
int value = 0;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter - %d,%d", x, y);
+ CAM_LOG_INFO("Enter - %d,%d", x, y);
value = (x << 16) | y;
CAMERA_MSG_PARAM_SET(param, INT, value);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_CLEAR_AF_AREA;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
int camera_attr_set_exposure_mode(camera_h camera, camera_attr_exposure_mode_e mode)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_EXPOSURE_MODE;
- camera_msg_param param;
- int set_mode = (int)mode;
-
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- CAMERA_MSG_PARAM_SET(param, INT, set_mode);
-
- _camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
-
- LOGD("ret : 0x%x", ret);
-
- return ret;
+ return __set_mode(camera, MUSE_CAMERA_API_ATTR_SET_EXPOSURE_MODE, (int)mode);
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_EXPOSURE;
camera_msg_param param;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
CAMERA_MSG_PARAM_SET(param, INT, value);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_msg_param param;
int set_iso = (int)iso;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
CAMERA_MSG_PARAM_SET(param, INT, set_iso);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
-int camera_attr_set_brightness(camera_h camera, int level)
+int camera_attr_set_gain(camera_h camera, int level)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_BRIGHTNESS;
- camera_msg_param param;
-
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- CAMERA_MSG_PARAM_SET(param, INT, level);
-
- _camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
+ return _camera_attr_set_level(camera, MUSE_CAMERA_API_ATTR_SET_GAIN, level);
+}
- LOGD("ret : 0x%x", ret);
- return ret;
+int camera_attr_set_brightness(camera_h camera, int level)
+{
+ return _camera_attr_set_level(camera, MUSE_CAMERA_API_ATTR_SET_BRIGHTNESS, level);
}
int camera_attr_set_contrast(camera_h camera, int level)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_CONTRAST;
- camera_msg_param param;
+ return _camera_attr_set_level(camera, MUSE_CAMERA_API_ATTR_SET_CONTRAST, level);
+}
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
- LOGD("Enter");
+int camera_attr_set_hue(camera_h camera, int level)
+{
+ return _camera_attr_set_level(camera, MUSE_CAMERA_API_ATTR_SET_HUE, level);
+}
- CAMERA_MSG_PARAM_SET(param, INT, level);
- _camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
+int camera_attr_set_saturation(camera_h camera, int level)
+{
+ return _camera_attr_set_level(camera, MUSE_CAMERA_API_ATTR_SET_SATURATION, level);
+}
- LOGD("ret : 0x%x", ret);
- return ret;
+int camera_attr_set_sharpness(camera_h camera, int level)
+{
+ return _camera_attr_set_level(camera, MUSE_CAMERA_API_ATTR_SET_SHARPNESS, level);
}
-int camera_attr_set_hue(camera_h camera, int level)
+int camera_attr_set_whitebalance(camera_h camera, camera_attr_whitebalance_e wb)
{
int ret = CAMERA_ERROR_NONE;
camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_HUE;
+ muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_WHITEBALANCE;
camera_msg_param param;
+ int set_whitebalance = (int)wb;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
- CAMERA_MSG_PARAM_SET(param, INT, level);
+ CAMERA_MSG_PARAM_SET(param, INT, set_whitebalance);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
-int camera_attr_set_whitebalance(camera_h camera, camera_attr_whitebalance_e wb)
+int camera_attr_set_whitebalance_temperature(camera_h camera, int temperature)
{
int ret = CAMERA_ERROR_NONE;
camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_WHITEBALANCE;
+ muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_WHITEBALANCE_TEMPERATURE;
camera_msg_param param;
- int set_whitebalance = (int)wb;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
- CAMERA_MSG_PARAM_SET(param, INT, set_whitebalance);
+ CAMERA_MSG_PARAM_SET(param, INT, temperature);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_msg_param param;
int set_effect = (int)effect;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
CAMERA_MSG_PARAM_SET(param, INT, set_effect);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
int camera_attr_set_scene_mode(camera_h camera, camera_attr_scene_mode_e mode)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_SCENE_MODE;
- camera_msg_param param;
- int set_mode = (int)mode;
-
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- CAMERA_MSG_PARAM_SET(param, INT, set_mode);
-
- _camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
-
- LOGD("ret : 0x%x", ret);
-
- return ret;
+ return __set_mode(camera, MUSE_CAMERA_API_ATTR_SET_SCENE_MODE, (int)mode);
}
int camera_attr_enable_tag(camera_h camera, bool enable)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_ENABLE_TAG;
- camera_msg_param param;
- int set_enable = (int)enable;
-
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- CAMERA_MSG_PARAM_SET(param, INT, set_enable);
-
- _camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
-
- LOGD("ret : 0x%x", ret);
-
- return ret;
+ return __set_enable(camera, MUSE_CAMERA_API_ATTR_ENABLE_TAG, (int)enable);
}
camera_msg_param param;
if (!pc || !pc->cb_info || !description) {
- LOGE("NULL pointer %p %p", pc, description);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, description);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
CAMERA_MSG_PARAM_SET(param, STRING, description);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_msg_param param;
int set_orientation = (int)orientation;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
CAMERA_MSG_PARAM_SET(param, INT, set_orientation);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_msg_param param;
if (!pc || !pc->cb_info || !software) {
- LOGE("NULL pointer %p %p", pc, software);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, software);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter, remote_handle : %td", pc->remote_handle);
+ CAM_LOG_INFO("Enter, remote_handle : %td", pc->remote_handle);
CAMERA_MSG_PARAM_SET(param, STRING, software);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
double set_geotag[3] = {latitude, longitude, altitude};
char *msg = NULL;
int length = 0;
- int send_ret = 0;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
length = sizeof(set_geotag) / sizeof(int) + \
(sizeof(set_geotag) % sizeof(int) ? 1 : 0);
msg = muse_core_msg_new(api,
MUSE_TYPE_ARRAY, "set_geotag", length, (int *)set_geotag,
NULL);
- if (!msg) {
- LOGE("msg creation failed: api %d", api);
- return CAMERA_ERROR_OUT_OF_MEMORY;
- }
-
- if (pc->cb_info->is_server_connected) {
- __camera_update_api_waiting(pc->cb_info, api, 1);
-
- g_mutex_lock(&pc->cb_info->fd_lock);
- send_ret = muse_core_msg_send(pc->cb_info->fd, msg);
- g_mutex_unlock(&pc->cb_info->fd_lock);
- }
- if (send_ret < 0) {
- LOGE("message send failed");
- ret = CAMERA_ERROR_INVALID_OPERATION;
- } else {
- ret = _camera_client_wait_for_cb_return(api, pc->cb_info, CAMERA_CB_TIMEOUT);
- }
-
- __camera_update_api_waiting(pc->cb_info, api, -1);
-
- muse_core_msg_free(msg);
-
- LOGD("ret : 0x%x", ret);
+ _camera_send_message_get_return(pc->cb_info, api, msg, CAMERA_CB_TIMEOUT, &ret);
return ret;
}
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_REMOVE_GEOTAG;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
int camera_attr_set_flash_mode(camera_h camera, camera_attr_flash_mode_e mode)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_FLASH_MODE;
- camera_msg_param param;
- int set_mode = (int)mode;
-
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- CAMERA_MSG_PARAM_SET(param, INT, set_mode);
-
- _camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
-
- LOGD("ret : 0x%x", ret);
-
- return ret;
+ return __set_mode(camera, MUSE_CAMERA_API_ATTR_SET_FLASH_MODE, (int)mode);
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_ZOOM;
if (!pc || !pc->cb_info || !zoom) {
- LOGE("NULL pointer %p %p", pc, zoom);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, zoom);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*zoom = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_ZOOM];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
int camera_attr_get_zoom_range(camera_h camera, int *min, int *max)
-{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_ZOOM_RANGE;
-
- if (!pc || !pc->cb_info || !min || !max) {
- LOGE("NULL pointer %p %p %p", pc, min, max);
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
- if (ret == CAMERA_ERROR_NONE) {
- *min = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_ZOOM_RANGE][0];
- *max = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_ZOOM_RANGE][1];
- }
-
- LOGD("ret : 0x%x", ret);
-
- return ret;
-}
-
-
-int camera_attr_get_af_mode(camera_h camera, camera_attr_af_mode_e *mode)
+{
+ return _camera_attr_get_range(camera,
+ MUSE_CAMERA_API_ATTR_GET_ZOOM_RANGE,
+ MUSE_CAMERA_GET_INT_PAIR_ZOOM_RANGE,
+ min, max);
+}
+
+
+int camera_attr_get_af_mode(camera_h camera, camera_attr_af_mode_e *mode)
{
int ret = CAMERA_ERROR_NONE;
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_AF_MODE;
if (!pc || !pc->cb_info || !mode) {
- LOGE("NULL pointer %p %p", pc, mode);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, mode);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*mode = (camera_attr_af_mode_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_AF_MODE];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_EXPOSURE_MODE;
if (!pc || !pc->cb_info || !mode) {
- LOGE("NULL pointer %p %p", pc, mode);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, mode);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*mode = (camera_attr_exposure_mode_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_EXPOSURE_MODE];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_EXPOSURE;
if (!pc || !pc->cb_info || !value) {
- LOGE("NULL pointer %p %p", pc, value);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, value);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*value = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_EXPOSURE];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
int camera_attr_get_exposure_range(camera_h camera, int *min, int *max)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_EXPOSURE_RANGE;
-
- if (!pc || !pc->cb_info || !min || !max) {
- LOGE("NULL pointer %p %p %p", pc, min, max);
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
- if (ret == CAMERA_ERROR_NONE) {
- *min = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_EXPOSURE_RANGE][0];
- *max = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_EXPOSURE_RANGE][1];
- }
-
- LOGD("ret : 0x%x", ret);
-
- return ret;
+ return _camera_attr_get_range(camera,
+ MUSE_CAMERA_API_ATTR_GET_EXPOSURE_RANGE,
+ MUSE_CAMERA_GET_INT_PAIR_EXPOSURE_RANGE,
+ min, max);
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_ISO;
if (!pc || !pc->cb_info || !iso) {
- LOGE("NULL pointer %p %p", pc, iso);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, iso);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*iso = (camera_attr_iso_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_ISO];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
-int camera_attr_get_brightness(camera_h camera, int *level)
+int camera_attr_get_gain(camera_h camera, int *level)
+{
+ return _camera_attr_get_level(camera,
+ MUSE_CAMERA_API_ATTR_GET_GAIN,
+ MUSE_CAMERA_GET_INT_GAIN,
+ level);
+}
+
+
+int camera_attr_get_gain_range(camera_h camera, int *min, int *max)
+{
+ return _camera_attr_get_range(camera,
+ MUSE_CAMERA_API_ATTR_GET_GAIN_RANGE,
+ MUSE_CAMERA_GET_INT_PAIR_GAIN_RANGE,
+ min, max);
+}
+
+
+int camera_attr_get_gain_step(camera_h camera, int *step)
{
int ret = CAMERA_ERROR_NONE;
camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_BRIGHTNESS;
+ muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_GAIN_STEP;
- if (!pc || !pc->cb_info || !level) {
- LOGE("NULL pointer %p %p", pc, level);
+ if (!pc || !pc->cb_info || !step) {
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, step);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
- *level = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_BRIGHTNESS];
+ *step = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_GAIN_STEP];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
-int camera_attr_get_brightness_range(camera_h camera, int *min, int *max)
+int camera_attr_get_brightness(camera_h camera, int *level)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_BRIGHTNESS_RANGE;
-
- if (!pc || !pc->cb_info || !min || !max) {
- LOGE("NULL pointer %p %p %p", pc, min, max);
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
- if (ret == CAMERA_ERROR_NONE) {
- *min = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_BRIGHTNESS_RANGE][0];
- *max = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_BRIGHTNESS_RANGE][1];
- }
+ return _camera_attr_get_level(camera,
+ MUSE_CAMERA_API_ATTR_GET_BRIGHTNESS,
+ MUSE_CAMERA_GET_INT_BRIGHTNESS,
+ level);
+}
- LOGD("ret : 0x%x", ret);
- return ret;
+int camera_attr_get_brightness_range(camera_h camera, int *min, int *max)
+{
+ return _camera_attr_get_range(camera,
+ MUSE_CAMERA_API_ATTR_GET_BRIGHTNESS_RANGE,
+ MUSE_CAMERA_GET_INT_PAIR_BRIGHTNESS_RANGE,
+ min, max);
}
int camera_attr_get_contrast(camera_h camera, int *level)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_CONTRAST;
+ return _camera_attr_get_level(camera,
+ MUSE_CAMERA_API_ATTR_GET_CONTRAST,
+ MUSE_CAMERA_GET_INT_CONTRAST,
+ level);
+}
- if (!pc || !pc->cb_info || !level) {
- LOGE("NULL pointer %p %p", pc, level);
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
- LOGD("Enter");
+int camera_attr_get_contrast_range(camera_h camera, int *min, int *max)
+{
+ return _camera_attr_get_range(camera,
+ MUSE_CAMERA_API_ATTR_GET_CONTRAST_RANGE,
+ MUSE_CAMERA_GET_INT_PAIR_CONTRAST_RANGE,
+ min, max);
+}
- _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- if (ret == CAMERA_ERROR_NONE)
- *level = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_CONTRAST];
+int camera_attr_get_hue(camera_h camera, int *level)
+{
+ return _camera_attr_get_level(camera,
+ MUSE_CAMERA_API_ATTR_GET_HUE,
+ MUSE_CAMERA_GET_INT_HUE,
+ level);
+}
- LOGD("ret : 0x%x", ret);
- return ret;
+int camera_attr_get_hue_range(camera_h camera, int *min, int *max)
+{
+ return _camera_attr_get_range(camera,
+ MUSE_CAMERA_API_ATTR_GET_HUE_RANGE,
+ MUSE_CAMERA_GET_INT_PAIR_HUE_RANGE,
+ min, max);
}
-int camera_attr_get_contrast_range(camera_h camera, int *min, int *max)
+int camera_attr_get_saturation(camera_h camera, int *level)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_CONTRAST_RANGE;
+ return _camera_attr_get_level(camera,
+ MUSE_CAMERA_API_ATTR_GET_SATURATION,
+ MUSE_CAMERA_GET_INT_SATURATION,
+ level);
+}
- if (!pc || !pc->cb_info || !min || !max) {
- LOGE("NULL pointer %p %p %p", pc, min, max);
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
- LOGD("Enter");
+int camera_attr_get_saturation_range(camera_h camera, int *min, int *max)
+{
+ return _camera_attr_get_range(camera,
+ MUSE_CAMERA_API_ATTR_GET_SATURATION_RANGE,
+ MUSE_CAMERA_GET_INT_PAIR_SATURATION_RANGE,
+ min, max);
+}
- _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- if (ret == CAMERA_ERROR_NONE) {
- *min = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_CONTRAST_RANGE][0];
- *max = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_CONTRAST_RANGE][1];
- LOGD("min %d, max %d", *min, *max);
- }
+int camera_attr_get_sharpness(camera_h camera, int *level)
+{
+ return _camera_attr_get_level(camera,
+ MUSE_CAMERA_API_ATTR_GET_SHARPNESS,
+ MUSE_CAMERA_GET_INT_SHARPNESS,
+ level);
+}
- LOGD("ret : 0x%x", ret);
- return ret;
+int camera_attr_get_sharpness_range(camera_h camera, int *min, int *max)
+{
+ return _camera_attr_get_range(camera,
+ MUSE_CAMERA_API_ATTR_GET_SHARPNESS_RANGE,
+ MUSE_CAMERA_GET_INT_PAIR_SHARPNESS_RANGE,
+ min, max);
}
-int camera_attr_get_hue(camera_h camera, int *level)
+int camera_attr_get_whitebalance(camera_h camera, camera_attr_whitebalance_e *wb)
{
int ret = CAMERA_ERROR_NONE;
camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_HUE;
+ muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_WHITEBALANCE;
- if (!pc || !pc->cb_info || !level) {
- LOGE("NULL pointer %p %p", pc, level);
+ if (!pc || !pc->cb_info || !wb) {
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, wb);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
- *level = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_HUE];
+ *wb = (camera_attr_whitebalance_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_WHITE_BALANCE];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
-int camera_attr_get_hue_range(camera_h camera, int *min, int *max)
+int camera_attr_get_whitebalance_temperature(camera_h camera, int *temperature)
{
int ret = CAMERA_ERROR_NONE;
camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_HUE_RANGE;
+ muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_WHITEBALANCE_TEMPERATURE;
- if (!pc || !pc->cb_info || !min || !max) {
- LOGE("NULL pointer %p %p %p", pc, min, max);
+ if (!pc || !pc->cb_info || !temperature) {
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, temperature);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- if (ret == CAMERA_ERROR_NONE) {
- *min = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_HUE_RANGE][0];
- *max = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_HUE_RANGE][1];
- LOGD("min %d, max %d", *min, *max);
- }
+ if (ret == CAMERA_ERROR_NONE)
+ *temperature = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_WHITE_BALANCE_TEMPERATURE];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
-int camera_attr_get_whitebalance(camera_h camera, camera_attr_whitebalance_e *wb)
+int camera_attr_get_whitebalance_temperature_range(camera_h camera, int *min, int *max)
+{
+ return _camera_attr_get_range(camera,
+ MUSE_CAMERA_API_ATTR_GET_WHITEBALANCE_TEMPERATURE_RANGE,
+ MUSE_CAMERA_GET_INT_PAIR_WHITE_BALANCE_TEMPERATURE_RANGE,
+ min, max);
+}
+
+
+int camera_attr_get_whitebalance_temperature_step(camera_h camera, int *step)
{
int ret = CAMERA_ERROR_NONE;
camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_WHITEBALANCE;
+ muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_WHITEBALANCE_TEMPERATURE_STEP;
- if (!pc || !pc->cb_info || !wb) {
- LOGE("NULL pointer %p %p", pc, wb);
+ if (!pc || !pc->cb_info || !step) {
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, step);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
- *wb = (camera_attr_whitebalance_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_WHITE_BALANCE];
+ *step = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_WHITE_BALANCE_TEMPERATURE_STEP];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_EFFECT;
if (!pc || !pc->cb_info || !effect) {
- LOGE("NULL pointer %p %p", pc, effect);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, effect);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*effect = (camera_attr_effect_mode_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_EFFECT];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_SCENE_MODE;
if (!pc || !pc->cb_info || !mode) {
- LOGE("NULL pointer %p %p", pc, mode);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, mode);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*mode = (camera_attr_scene_mode_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_SCENE_MODE];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_IS_ENABLED_TAG;
if (!pc || !pc->cb_info || !enable) {
- LOGE("NULL pointer %p %p", pc, enable);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, enable);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*enable = (bool)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_ENABLED_TAG];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_TAG_IMAGE_DESCRIPTION;
if (!pc || !pc->cb_info || !description) {
- LOGE("NULL pointer %p %p", pc, description);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, description);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*description = strdup(pc->cb_info->get_string[MUSE_CAMERA_GET_STRING_TAG_IMAGE_DESCRIPTION]);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_TAG_ORIENTATION;
if (!pc || !pc->cb_info || !orientation) {
- LOGE("NULL pointer %p %p", pc, orientation);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, orientation);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*orientation = (camera_attr_tag_orientation_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_TAG_ORIENTATION];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_TAG_SOFTWARE;
if (!pc || !pc->cb_info || !software) {
- LOGE("NULL pointer %p %p", pc, software);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, software);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*software = strdup(pc->cb_info->get_string[MUSE_CAMERA_GET_STRING_TAG_SOFTWARE]);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_GEOTAG;
if (!pc || !pc->cb_info || !latitude || !longitude || !altitude) {
- LOGE("NULL pointer %p %p %p %p", pc, latitude, longitude, altitude);
+ CAM_LOG_ERROR("NULL pointer %p %p %p %p", pc, latitude, longitude, altitude);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
*altitude = pc->cb_info->get_geotag[2];
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_FLASH_MODE;
if (!pc || !pc->cb_info || !mode) {
- LOGE("NULL pointer %p %p", pc, mode);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, mode);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*mode = (camera_attr_flash_mode_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_FLASH_MODE];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
int get_flash_state = 0;
if (!state) {
- LOGE("NULL pointer");
+ CAM_LOG_ERROR("NULL pointer");
return CAMERA_ERROR_INVALID_PARAMETER;
}
if (ret == CAMERA_ERROR_NONE) {
*state = (camera_flash_state_e)get_flash_state;
- LOGD("flash state %d", *state);
+ CAM_LOG_INFO("flash state %d", *state);
} else {
- LOGE("failed 0x%x", ret);
+ CAM_LOG_ERROR("failed 0x%x", ret);
}
return ret;
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_AF_MODE;
if (!pc || !pc->cb_info || !foreach_cb) {
- LOGE("NULL pointer %p %p", pc, foreach_cb);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, foreach_cb);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_AF_MODE] = foreach_cb;
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_AF_MODE] = user_data;
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_EXPOSURE_MODE;
if (!pc || !pc->cb_info || !foreach_cb) {
- LOGE("NULL pointer %p %p", pc, foreach_cb);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, foreach_cb);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_EXPOSURE_MODE] = foreach_cb;
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_EXPOSURE_MODE] = user_data;
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_ISO;
if (!pc || !pc->cb_info || !foreach_cb) {
- LOGE("NULL pointer %p %p", pc, foreach_cb);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, foreach_cb);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_ISO] = foreach_cb;
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_ISO] = user_data;
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_WHITEBALANCE;
if (!pc || !pc->cb_info || !foreach_cb) {
- LOGE("NULL pointer %p %p", pc, foreach_cb);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, foreach_cb);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_WHITEBALANCE] = foreach_cb;
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_WHITEBALANCE] = user_data;
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_EFFECT;
if (!pc || !pc->cb_info || !foreach_cb) {
- LOGE("NULL pointer %p %p", pc, foreach_cb);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, foreach_cb);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_EFFECT] = foreach_cb;
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_EFFECT] = user_data;
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_SCENE_MODE;
if (!pc || !pc->cb_info || !foreach_cb) {
- LOGE("NULL pointer %p %p", pc, foreach_cb);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, foreach_cb);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_SCENE_MODE] = foreach_cb;
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_SCENE_MODE] = user_data;
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_FLASH_MODE;
if (!pc || !pc->cb_info || !foreach_cb) {
- LOGE("NULL pointer %p %p", pc, foreach_cb);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, foreach_cb);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_FLASH_MODE] = foreach_cb;
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_FLASH_MODE] = user_data;
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_FPS;
if (!pc || !pc->cb_info || !foreach_cb) {
- LOGE("NULL pointer %p %p", pc, foreach_cb);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, foreach_cb);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_FPS] = foreach_cb;
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_FPS] = user_data;
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("Enter, handle :%td", pc->remote_handle);
+ CAM_LOG_INFO("Enter, handle :%td", pc->remote_handle);
return ret;
}
int value = 0;
if (!pc || !pc->cb_info || !foreach_cb) {
- LOGE("NULL pointer %p %p", pc, foreach_cb);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, foreach_cb);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_FPS_BY_RESOLUTION] = foreach_cb;
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_FPS_BY_RESOLUTION] = user_data;
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_STREAM_FLIP;
if (!pc || !pc->cb_info || !foreach_cb) {
- LOGE("NULL pointer %p %p", pc, foreach_cb);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, foreach_cb);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_STREAM_FLIP] = foreach_cb;
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_STREAM_FLIP] = user_data;
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_STREAM_ROTATION;
if (!pc || !pc->cb_info || !foreach_cb) {
- LOGE("NULL pointer %p %p", pc, foreach_cb);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, foreach_cb);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_STREAM_ROTATION] = foreach_cb;
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_STREAM_ROTATION] = user_data;
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_msg_param param;
int set_rotation = (int)rotation;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
CAMERA_MSG_PARAM_SET(param, INT, set_rotation);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_STREAM_ROTATION;
if (!pc || !pc->cb_info || !rotation) {
- LOGE("NULL pointer %p %p", pc, rotation);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, rotation);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*rotation = (camera_rotation_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_STREAM_ROTATION];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_msg_param param;
int set_flip = (int)flip;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
CAMERA_MSG_PARAM_SET(param, INT, set_flip);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_STREAM_FLIP;
if (!pc || !pc->cb_info || !flip) {
- LOGE("NULL pointer %p %p", pc, flip);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, flip);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*flip = (camera_flip_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_STREAM_FLIP];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
int camera_attr_set_hdr_mode(camera_h camera, camera_attr_hdr_mode_e mode)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_HDR_MODE;
- camera_msg_param param;
- int set_mode = (int)mode;
-
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- CAMERA_MSG_PARAM_SET(param, INT, set_mode);
-
- _camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
-
- LOGD("ret : 0x%x", ret);
-
- return ret;
+ return __set_mode(camera, MUSE_CAMERA_API_ATTR_SET_HDR_MODE, (int)mode);
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_HDR_MODE;
if (!pc || !pc->cb_info || !mode) {
- LOGE("NULL pointer %p %p", pc, mode);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, mode);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*mode = (camera_attr_hdr_mode_e)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_HDR_MODE];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
bool camera_attr_is_supported_hdr_capture(camera_h camera)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_IS_SUPPORTED_HDR_CAPTURE;
-
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
- if (ret < 0) {
- LOGE("error is occurred 0x%x", ret);
- ret = false;
- }
-
- LOGD("ret : %d", ret);
-
- return (bool)ret;
+ return __is_supported(camera, MUSE_CAMERA_API_ATTR_IS_SUPPORTED_HDR_CAPTURE);
}
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_HDR_CAPTURE_PROGRESS_CB;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
if (!camera_attr_is_supported_hdr_capture(camera)) {
- LOGE("HDR not supported");
+ CAM_LOG_ERROR("HDR not supported");
return CAMERA_ERROR_NOT_SUPPORTED;
}
if (!callback) {
- LOGE("NULL callback");
+ CAM_LOG_ERROR("NULL callback");
return CAMERA_ERROR_INVALID_PARAMETER;
}
g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_HDR_PROGRESS]);
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_UNSET_HDR_CAPTURE_PROGRESS_CB;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_HDR_PROGRESS]);
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
int camera_attr_enable_anti_shake(camera_h camera, bool enable)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_ENABLE_ANTI_SHAKE;
- camera_msg_param param;
- int set_enable = (int)enable;
-
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- CAMERA_MSG_PARAM_SET(param, INT, set_enable);
-
- _camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
-
- LOGD("ret : 0x%x", ret);
-
- return ret;
+ return __set_enable(camera, MUSE_CAMERA_API_ATTR_ENABLE_ANTI_SHAKE, (int)enable);
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_IS_ENABLED_ANTI_SHAKE;
if (!pc || !pc->cb_info || !enabled) {
- LOGE("NULL pointer %p %p", pc, enabled);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, enabled);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*enabled = (bool)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_ENABLED_ANTI_SHAKE];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
bool camera_attr_is_supported_anti_shake(camera_h camera)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_IS_SUPPORTED_ANTI_SHAKE;
-
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
- if (ret < 0) {
- LOGE("error is occurred 0x%x", ret);
- ret = false;
- }
-
- LOGD("ret : %d", ret);
-
- return (bool)ret;
+ return __is_supported(camera, MUSE_CAMERA_API_ATTR_IS_SUPPORTED_ANTI_SHAKE);
}
int camera_attr_enable_video_stabilization(camera_h camera, bool enable)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_ENABLE_VIDEO_STABILIZATION;
- camera_msg_param param;
- int set_enable = (int)enable;
-
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- CAMERA_MSG_PARAM_SET(param, INT, set_enable);
-
- _camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
-
- LOGD("ret : 0x%x", ret);
-
- return ret;
+ return __set_enable(camera, MUSE_CAMERA_API_ATTR_ENABLE_VIDEO_STABILIZATION, (int)enable);
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_IS_ENABLED_VIDEO_STABILIZATION;
if (!pc || !pc->cb_info || !enabled) {
- LOGE("NULL pointer %p %p", pc, enabled);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, enabled);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*enabled = (bool)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_ENABLED_VIDEO_STABILIZATION];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
bool camera_attr_is_supported_video_stabilization(camera_h camera)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_IS_SUPPORTED_VIDEO_STABILIZATION;
-
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
- if (ret < 0) {
- LOGE("error is occurred 0x%x", ret);
- ret = false;
- }
-
- LOGD("ret : %d", ret);
-
- return (bool)ret;
+ return __is_supported(camera, MUSE_CAMERA_API_ATTR_IS_SUPPORTED_VIDEO_STABILIZATION);
}
int camera_attr_enable_auto_contrast(camera_h camera, bool enable)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_ENABLE_AUTO_CONTRAST;
- camera_msg_param param;
- int set_enable = (int)enable;
-
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- CAMERA_MSG_PARAM_SET(param, INT, set_enable);
-
- _camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
-
- LOGD("ret : 0x%x", ret);
-
- return ret;
+ return __set_enable(camera, MUSE_CAMERA_API_ATTR_ENABLE_AUTO_CONTRAST, (int)enable);
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_IS_ENABLED_AUTO_CONTRAST;
if (!pc || !pc->cb_info || !enabled) {
- LOGE("NULL pointer %p %p", pc, enabled);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, enabled);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*enabled = (bool)pc->cb_info->get_int[MUSE_CAMERA_GET_INT_ENABLED_AUTO_CONTRAST];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
bool camera_attr_is_supported_auto_contrast(camera_h camera)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_IS_SUPPORTED_AUTO_CONTRAST;
-
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
- if (ret < 0) {
- LOGE("error is occurred 0x%x", ret);
- ret = false;
- }
-
- LOGD("ret : %d", ret);
-
- return (bool)ret;
+ return __is_supported(camera, MUSE_CAMERA_API_ATTR_IS_SUPPORTED_AUTO_CONTRAST);
}
camera_msg_param param;
int set_disable = (int)disable;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
CAMERA_MSG_PARAM_SET(param, INT, set_disable);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
int ret = CAMERA_ERROR_NONE;
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_PAN;
- camera_msg_param param;
- int set_move_type = (int)move_type;
- int value = 0;
+ camera_msg_param param0;
+ camera_msg_param param1;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
- value = (set_move_type << 16) | pan_step;
- CAMERA_MSG_PARAM_SET(param, INT, value);
+ CAMERA_MSG_PARAM_SET(param0, INT, move_type);
+ CAMERA_MSG_PARAM_SET(param1, INT, pan_step);
- _camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
+ _camera_msg_send_param2_int(api, pc->cb_info, &ret,
+ ¶m0, ¶m1, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_PAN;
if (!pc || !pc->cb_info || !pan_step) {
- LOGE("NULL pointer %p %p", pc, pan_step);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, pan_step);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*pan_step = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_PAN];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
int camera_attr_get_pan_range(camera_h camera, int *min, int *max)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_PAN_RANGE;
-
- if (!pc || !pc->cb_info || !min || !max) {
- LOGE("NULL pointer %p %p %p", pc, min, max);
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
- if (ret == CAMERA_ERROR_NONE) {
- *min = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_PAN_RANGE][0];
- *max = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_PAN_RANGE][1];
- }
-
- LOGD("ret : 0x%x", ret);
-
- return ret;
+ return _camera_attr_get_range(camera,
+ MUSE_CAMERA_API_ATTR_GET_PAN_RANGE,
+ MUSE_CAMERA_GET_INT_PAIR_PAN_RANGE,
+ min, max);
}
int ret = CAMERA_ERROR_NONE;
camera_cli_s *pc = (camera_cli_s *)camera;
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_TILT;
- camera_msg_param param;
- int set_move_type = (int)move_type;
- int value = 0;
+ camera_msg_param param0;
+ camera_msg_param param1;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
- value = (set_move_type << 16) | tilt_step;
- CAMERA_MSG_PARAM_SET(param, INT, value);
+ CAMERA_MSG_PARAM_SET(param0, INT, move_type);
+ CAMERA_MSG_PARAM_SET(param1, INT, tilt_step);
- _camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
+ _camera_msg_send_param2_int(api, pc->cb_info, &ret,
+ ¶m0, ¶m1, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_TILT;
if (!pc || !pc->cb_info || !tilt_step) {
- LOGE("NULL pointer %p %p", pc, tilt_step);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, tilt_step);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
if (ret == CAMERA_ERROR_NONE)
*tilt_step = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_TILT];
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
int camera_attr_get_tilt_range(camera_h camera, int *min, int *max)
{
- int ret = CAMERA_ERROR_NONE;
- camera_cli_s *pc = (camera_cli_s *)camera;
- muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_TILT_RANGE;
-
- if (!pc || !pc->cb_info || !min || !max) {
- LOGE("NULL pointer %p %p %p", pc, min, max);
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
-
- LOGD("Enter");
-
- _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
-
- if (ret == CAMERA_ERROR_NONE) {
- *min = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_TILT_RANGE][0];
- *max = pc->cb_info->get_int_pair[MUSE_CAMERA_GET_INT_PAIR_TILT_RANGE][1];
- }
-
- LOGD("ret : 0x%x", ret);
-
- return ret;
+ return _camera_attr_get_range(camera,
+ MUSE_CAMERA_API_ATTR_GET_TILT_RANGE,
+ MUSE_CAMERA_GET_INT_PAIR_TILT_RANGE,
+ min, max);
}
camera_msg_param param;
int set_ptz_type = (int)ptz_type;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
CAMERA_MSG_PARAM_SET(param, INT, set_ptz_type);
_camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_ATTR_FOREACH_SUPPORTED_PTZ_TYPE;
if (!pc || !pc->cb_info || !foreach_cb) {
- LOGE("NULL pointer %p %p", pc, foreach_cb);
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, foreach_cb);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_PTZ_TYPE] = foreach_cb;
pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_FOREACH_SUPPORTED_PTZ_TYPE] = user_data;
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
int set_display_roi_area[4] = {x, y, width, height};
char *msg = NULL;
int length = 0;
- int send_ret = 0;
- if (!pc || !pc->cb_info) {
- LOGE("NULL handle");
- return CAMERA_ERROR_INVALID_PARAMETER;
- }
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
- if (CHECK_PREVIEW_CB(pc->cb_info, PREVIEW_CB_TYPE_EVAS)) {
+ if (pc->cb_info->is_evas_render) {
ret = mm_display_interface_evas_set_roi_area(pc->cb_info->dp_interface, x, y, width, height);
if (ret != MM_ERROR_NONE) {
- LOGE("mm_evas_renderer_set_roi_area error 0x%x", ret);
+ CAM_LOG_ERROR("mm_evas_renderer_set_roi_area error 0x%x", ret);
return CAMERA_ERROR_INVALID_OPERATION;
}
}
msg = muse_core_msg_new(api,
MUSE_TYPE_ARRAY, "set_display_roi_area", length, (int *)set_display_roi_area,
NULL);
- if (!msg) {
- LOGE("msg creation failed: api %d", api);
- return CAMERA_ERROR_OUT_OF_MEMORY;
- }
-
- if (pc->cb_info->is_server_connected) {
- __camera_update_api_waiting(pc->cb_info, api, 1);
-
- g_mutex_lock(&pc->cb_info->fd_lock);
- send_ret = muse_core_msg_send(pc->cb_info->fd, msg);
- g_mutex_unlock(&pc->cb_info->fd_lock);
- }
-
- if (send_ret < 0) {
- LOGE("message send failed");
- ret = CAMERA_ERROR_INVALID_OPERATION;
- } else {
- ret = _camera_client_wait_for_cb_return(api, pc->cb_info, CAMERA_CB_TIMEOUT);
- }
-
- __camera_update_api_waiting(pc->cb_info, api, -1);
- muse_core_msg_free(msg);
-
- LOGD("ret : 0x%x", ret);
+ _camera_send_message_get_return(pc->cb_info, api, msg, CAMERA_CB_TIMEOUT, &ret);
return ret;
}
muse_camera_api_e api = MUSE_CAMERA_API_GET_DISPLAY_ROI_AREA;
if (!pc || !pc->cb_info || !x || !y || !width || !height) {
- LOGE("NULL pointer %p %p %p %p %p", pc, x, y, width, height);
+ CAM_LOG_ERROR("NULL pointer %p %p %p %p %p", pc, x, y, width, height);
return CAMERA_ERROR_INVALID_PARAMETER;
}
- LOGD("Enter");
+ CAM_LOG_INFO("Enter");
_camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
*height = pc->cb_info->get_display_roi_area[3];
}
- LOGD("ret : 0x%x", ret);
+ CAM_LOG_INFO("ret : 0x%x", ret);
return ret;
}
int get_device_state = 0;
if (!state) {
- LOGE("NULL pointer");
+ CAM_LOG_ERROR("NULL pointer");
return CAMERA_ERROR_INVALID_PARAMETER;
}
if (ret == CAMERA_ERROR_NONE) {
*state = (camera_device_state_e)get_device_state;
- LOGD("device state %d", *state);
+ CAM_LOG_INFO("device state %d", *state);
} else {
- LOGE("failed 0x%x", ret);
+ CAM_LOG_ERROR("failed 0x%x", ret);
}
return ret;
camera_cb_info *info = NULL;
if (!callback || !cb_id) {
- LOGE("invalid pointer %p %p", callback, cb_id);
+ CAM_LOG_ERROR("invalid pointer %p %p", callback, cb_id);
return CAMERA_ERROR_INVALID_PARAMETER;
}
/* check camera support */
ret = camera_get_device_state(CAMERA_DEVICE_CAMERA0, &state);
if (ret != CAMERA_ERROR_NONE) {
- LOGE("get device state failed");
+ CAM_LOG_ERROR("get device state failed");
return ret;
}
info = g_new0(camera_cb_info, 1);
if (!info) {
- LOGE("info failed");
+ CAM_LOG_ERROR("info failed");
ret = CAMERA_ERROR_OUT_OF_MEMORY;
goto _DONE;
}
if (!g_cam_dev_state_changed_cb_conn) {
g_cam_dev_state_changed_cb_conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, NULL);
if (!g_cam_dev_state_changed_cb_conn) {
- LOGE("failed to get gdbus connection");
+ CAM_LOG_ERROR("failed to get gdbus connection");
ret = CAMERA_ERROR_INVALID_OPERATION;
goto _DONE;
}
- LOGD("subscribe signal %s - %s - %s",
+ CAM_LOG_INFO("subscribe signal %s - %s - %s",
MM_CAMCORDER_DBUS_OBJECT,
MM_CAMCORDER_DBUS_INTERFACE_CAMERA,
MM_CAMCORDER_DBUS_SIGNAL_STATE_CHANGED);
NULL, MM_CAMCORDER_DBUS_INTERFACE_CAMERA, MM_CAMCORDER_DBUS_SIGNAL_STATE_CHANGED, MM_CAMCORDER_DBUS_OBJECT, NULL,
G_DBUS_SIGNAL_FLAGS_NONE, (GDBusSignalCallback)__camera_device_state_changed_cb, NULL, NULL);
if (!g_cam_dev_state_changed_cb_subscribe_id) {
- LOGE("failed to get gdbus connection");
+ CAM_LOG_ERROR("failed to get gdbus connection");
ret = CAMERA_ERROR_INVALID_OPERATION;
goto _DONE;
}
- LOGD("signal subscribe id %u", g_cam_dev_state_changed_cb_subscribe_id);
+ CAM_LOG_INFO("signal subscribe id %u", g_cam_dev_state_changed_cb_subscribe_id);
}
g_cam_dev_state_changed_cb_list = g_list_prepend(g_cam_dev_state_changed_cb_list, (gpointer)info);
- LOGD("callback id %d", info->id);
+ CAM_LOG_INFO("callback id %d", info->id);
_DONE:
if (ret != CAMERA_ERROR_NONE) {
/* check camera support */
ret = camera_get_device_state(CAMERA_DEVICE_CAMERA0, &state);
if (ret != CAMERA_ERROR_NONE) {
- LOGE("get device state failed");
+ CAM_LOG_ERROR("get device state failed");
return ret;
}
g_mutex_lock(&g_cam_dev_state_changed_cb_lock);
if (!g_cam_dev_state_changed_cb_list) {
- LOGE("there is no callback info");
+ CAM_LOG_ERROR("there is no callback info");
ret = CAMERA_ERROR_INVALID_OPERATION;
goto _DONE;
}
tmp_list = tmp_list->next;
if (!info) {
- LOGW("NULL info");
+ CAM_LOG_WARNING("NULL info");
continue;
}
}
}
- LOGD("id %d callback removed", cb_id);
+ CAM_LOG_INFO("id %d callback removed", cb_id);
ret = CAMERA_ERROR_NONE;
goto _DONE;
}
} while (tmp_list);
- LOGE("id %d callback not found", cb_id);
+ CAM_LOG_ERROR("id %d callback not found", cb_id);
ret = CAMERA_ERROR_INVALID_PARAMETER;
_DONE:
return ret;
}
+
+
+//LCOV_EXCL_START
+int camera_media_bridge_set_bridge(camera_h camera, media_bridge_h bridge)
+{
+ int ret = CAMERA_ERROR_NONE;
+ camera_cli_s *pc = (camera_cli_s *)camera;
+ muse_camera_api_e api = MUSE_CAMERA_API_SET_MEDIA_BRIDGE;
+
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
+
+ g_mutex_lock(&pc->cb_info->bridge_lock);
+
+ if (pc->cb_info->bridge) {
+ CAM_LOG_ERROR("media bridge[%p] is already set", pc->cb_info->bridge);
+ ret = CAMERA_ERROR_INVALID_OPERATION;
+ goto _SET_MEDIA_BRIDGE_DONE;
+ }
+
+ _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+ if (ret != CAMERA_ERROR_NONE) {
+ CAM_LOG_ERROR("set media bridge failed[0x%x]", ret);
+ goto _SET_MEDIA_BRIDGE_DONE;
+ }
+
+ pc->cb_info->bridge = bridge;
+
+ CAM_LOG_INFO("[%p] set media bridge[%p]", camera, bridge);
+
+_SET_MEDIA_BRIDGE_DONE:
+ g_mutex_unlock(&pc->cb_info->bridge_lock);
+
+ return ret;
+}
+
+
+int camera_media_bridge_unset_bridge(camera_h camera)
+{
+ int ret = CAMERA_ERROR_NONE;
+ camera_cli_s *pc = (camera_cli_s *)camera;
+ muse_camera_api_e api = MUSE_CAMERA_API_UNSET_MEDIA_BRIDGE;
+
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
+
+ g_mutex_lock(&pc->cb_info->bridge_lock);
+
+ if (!pc->cb_info->bridge) {
+ CAM_LOG_ERROR("no media bridge");
+ ret = CAMERA_ERROR_INVALID_OPERATION;
+ goto _UNSET_MEDIA_BRIDGE_DONE;
+ }
+
+ _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+ if (ret != CAMERA_ERROR_NONE) {
+ CAM_LOG_ERROR("unset media bridge failed[0x%x]", ret);
+ goto _UNSET_MEDIA_BRIDGE_DONE;
+ }
+
+ CAM_LOG_INFO("[%p] unset media bridge[%p]", camera, pc->cb_info->bridge);
+
+ pc->cb_info->bridge = NULL;
+
+_UNSET_MEDIA_BRIDGE_DONE:
+ g_mutex_unlock(&pc->cb_info->bridge_lock);
+
+ return ret;
+}
+//LCOV_EXCL_STOP
+
+
+int camera_create_network(camera_device_e device, camera_h *camera)
+{
+ return _camera_create_private(device, true, camera);
+}
+
+
+int camera_set_extra_preview_cb(camera_h camera, camera_extra_preview_cb callback, void *user_data)
+{
+ int ret = CAMERA_ERROR_NONE;
+ camera_cli_s *pc = (camera_cli_s *)camera;
+ muse_camera_api_e api = MUSE_CAMERA_API_SET_EXTRA_PREVIEW_CB;
+
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
+
+ if (!camera_is_supported_extra_preview(camera)) {
+ CAM_LOG_ERROR("extra preview is not supported");
+ return CAMERA_ERROR_NOT_SUPPORTED;
+ }
+
+ if (!callback) {
+ CAM_LOG_ERROR("NULL callback");
+ return CAMERA_ERROR_INVALID_PARAMETER;
+ }
+
+ CAM_LOG_INFO("Enter");
+
+ _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+
+ if (ret == CAMERA_ERROR_NONE) {
+ g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_EXTRA_PREVIEW]);
+
+ pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_EXTRA_PREVIEW] = callback;
+ pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_EXTRA_PREVIEW] = user_data;
+
+ g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_EXTRA_PREVIEW]);
+ }
+
+ CAM_LOG_INFO("ret : 0x%x", ret);
+
+ return ret;
+}
+
+
+int camera_unset_extra_preview_cb(camera_h camera)
+{
+ int ret = CAMERA_ERROR_NONE;
+ camera_cli_s *pc = (camera_cli_s *)camera;
+ muse_camera_api_e api = MUSE_CAMERA_API_UNSET_EXTRA_PREVIEW_CB;
+
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
+
+ if (!camera_is_supported_extra_preview(camera)) {
+ CAM_LOG_ERROR("extra preview is not supported");
+ return CAMERA_ERROR_NOT_SUPPORTED;
+ }
+
+ CAM_LOG_INFO("Enter");
+
+ _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+
+ if (ret == CAMERA_ERROR_NONE) {
+ g_mutex_lock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_EXTRA_PREVIEW]);
+
+ pc->cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_EXTRA_PREVIEW] = NULL;
+ pc->cb_info->user_data[MUSE_CAMERA_EVENT_TYPE_EXTRA_PREVIEW] = NULL;
+
+ g_mutex_unlock(&pc->cb_info->user_cb_mutex[MUSE_CAMERA_EVENT_TYPE_EXTRA_PREVIEW]);
+ }
+
+ CAM_LOG_INFO("ret : 0x%x", ret);
+
+ return ret;
+}
+
+
+int camera_set_extra_preview_stream_format(camera_h camera, int stream_id, camera_pixel_format_e pixel_format, int width, int height, int fps)
+{
+ int ret = CAMERA_ERROR_NONE;
+ int stream_format[4] = {pixel_format, width, height, fps};
+ char *msg = NULL;
+ camera_cli_s *pc = (camera_cli_s *)camera;
+ muse_camera_api_e api = MUSE_CAMERA_API_SET_EXTRA_PREVIEW_STREAM_FORMAT;
+
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
+
+ CAM_LOG_INFO("Enter - stream[%d],[%d,%dx%d,%d]",
+ stream_id, pixel_format, width, height, fps);
+
+ msg = muse_core_msg_new(api,
+ MUSE_TYPE_INT, "stream_id", stream_id,
+ MUSE_TYPE_ARRAY, "stream_format", 4, stream_format,
+ NULL);
+
+ _camera_send_message_get_return(pc->cb_info, api, msg, CAMERA_CB_TIMEOUT, &ret);
+
+ return ret;
+}
+
+
+int camera_get_extra_preview_stream_format(camera_h camera, int stream_id, camera_pixel_format_e *pixel_format, int *width, int *height, int *fps)
+{
+ int ret = CAMERA_ERROR_NONE;
+ camera_cli_s *pc = (camera_cli_s *)camera;
+ camera_msg_param param;
+ muse_camera_api_e api = MUSE_CAMERA_API_GET_EXTRA_PREVIEW_STREAM_FORMAT;
+
+ if (!pc || !pc->cb_info || !pixel_format || !width || !height || !fps) {
+ CAM_LOG_ERROR("NULL pointer %p %p %p %p %p", pc, pixel_format, width, height, fps);
+ return CAMERA_ERROR_INVALID_PARAMETER;
+ }
+
+ CAM_LOG_INFO("Enter - stream[%d]", stream_id);
+
+ CAMERA_MSG_PARAM_SET(param, INT, stream_id);
+
+ _camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
+
+ if (ret == CAMERA_ERROR_NONE) {
+ *pixel_format = (camera_pixel_format_e)pc->cb_info->get_extra_preview_stream_format[0];
+ *width = pc->cb_info->get_extra_preview_stream_format[1];
+ *height = pc->cb_info->get_extra_preview_stream_format[2];
+ *fps = pc->cb_info->get_extra_preview_stream_format[3];
+ }
+
+ CAM_LOG_INFO("ret : 0x%x", ret);
+
+ return ret;
+}
+
+
+int camera_attr_set_extra_preview_bitrate(camera_h camera, int stream_id, int bitrate)
+{
+ int ret = CAMERA_ERROR_NONE;
+ camera_cli_s *pc = (camera_cli_s *)camera;
+ muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_EXTRA_PREVIEW_BITRATE;
+ camera_msg_param param0;
+ camera_msg_param param1;
+
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
+
+ CAM_LOG_INFO("Enter - stream[%d], bitrate[%d]", stream_id, bitrate);
+
+ CAMERA_MSG_PARAM_SET(param0, INT, stream_id);
+ CAMERA_MSG_PARAM_SET(param1, INT, bitrate);
+
+ _camera_msg_send_param2_int(api, pc->cb_info, &ret,
+ ¶m0, ¶m1, CAMERA_CB_TIMEOUT);
+
+ CAM_LOG_INFO("ret : 0x%x", ret);
+
+ return ret;
+}
+
+
+int camera_attr_get_extra_preview_bitrate(camera_h camera, int stream_id, int *bitrate)
+{
+ int ret = CAMERA_ERROR_NONE;
+ camera_cli_s *pc = (camera_cli_s *)camera;
+ muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_EXTRA_PREVIEW_BITRATE;
+ camera_msg_param param;
+
+ if (!pc || !pc->cb_info || !bitrate) {
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, bitrate);
+ return CAMERA_ERROR_INVALID_PARAMETER;
+ }
+
+ CAM_LOG_INFO("Enter - stream[%d]", stream_id);
+
+ CAMERA_MSG_PARAM_SET(param, INT, stream_id);
+
+ _camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
+
+ if (ret == CAMERA_ERROR_NONE) {
+ *bitrate = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_EXTRA_PREVIEW_BITRATE];
+ CAM_LOG_INFO("get bitrate[%d] for stream[%d]", *bitrate, stream_id);
+ } else {
+ CAM_LOG_ERROR("get bitrate failed for stream[%d] : 0x%x", stream_id, ret);
+ }
+
+ return ret;
+}
+
+
+int camera_attr_set_extra_preview_gop_interval(camera_h camera, int stream_id, int interval)
+{
+ int ret = CAMERA_ERROR_NONE;
+ camera_cli_s *pc = (camera_cli_s *)camera;
+ muse_camera_api_e api = MUSE_CAMERA_API_ATTR_SET_EXTRA_PREVIEW_GOP_INTERVAL;
+ camera_msg_param param0;
+ camera_msg_param param1;
+
+ CAMERA_CHECK_HANDLE_RETURN_VAL(pc, CAMERA_ERROR_INVALID_PARAMETER);
+
+ CAM_LOG_INFO("Enter - stream[%d], GOP interval[%d]", stream_id, interval);
+
+ CAMERA_MSG_PARAM_SET(param0, INT, stream_id);
+ CAMERA_MSG_PARAM_SET(param1, INT, interval);
+
+ _camera_msg_send_param2_int(api, pc->cb_info, &ret,
+ ¶m0, ¶m1, CAMERA_CB_TIMEOUT);
+
+ CAM_LOG_INFO("ret : 0x%x", ret);
+
+ return ret;
+}
+
+
+int camera_attr_get_extra_preview_gop_interval(camera_h camera, int stream_id, int *interval)
+{
+ int ret = CAMERA_ERROR_NONE;
+ camera_cli_s *pc = (camera_cli_s *)camera;
+ muse_camera_api_e api = MUSE_CAMERA_API_ATTR_GET_EXTRA_PREVIEW_GOP_INTERVAL;
+ camera_msg_param param;
+
+ if (!pc || !pc->cb_info || !interval) {
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, interval);
+ return CAMERA_ERROR_INVALID_PARAMETER;
+ }
+
+ CAM_LOG_INFO("Enter - stream[%d]", stream_id);
+
+ CAMERA_MSG_PARAM_SET(param, INT, stream_id);
+
+ _camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
+
+ if (ret == CAMERA_ERROR_NONE) {
+ *interval = pc->cb_info->get_int[MUSE_CAMERA_GET_INT_EXTRA_PREVIEW_GOP_INTERVAL];
+ CAM_LOG_INFO("get GOP interval[%d] for stream[%d]", *interval, stream_id);
+ } else {
+ CAM_LOG_ERROR("get GOP interval failed for stream[%d] : 0x%x", stream_id, ret);
+ }
+
+ return ret;
+}
+
+
+int camera_attr_get_preview_frame_rotation(camera_h camera, camera_rotation_e *rotation)
+{
+ camera_cli_s *pc = (camera_cli_s *)camera;
+
+ if (!pc || !pc->cb_info || !rotation) {
+ CAM_LOG_ERROR("NULL pointer %p %p", pc, rotation);
+ return CAMERA_ERROR_INVALID_PARAMETER;
+ }
+
+ if (!pc->cb_info->stream_data) {
+ CAM_LOG_ERROR("no stream data, maybe it's not in preview callback");
+ return CAMERA_ERROR_INVALID_OPERATION;
+ }
+
+ *rotation = pc->cb_info->stream_data->rotation;
+
+ CAM_LOG_DEBUG("frame rotation[%d]", *rotation);
+
+ return CAMERA_ERROR_NONE;
+}
+
+
+int _camera_get_log_level(void)
+{
+ return g_camera_log_level;
+}
+
+
+int _camera_attr_set_level(camera_h camera, muse_camera_api_e api, int level)
+{
+ int ret = CAMERA_ERROR_NONE;
+ camera_cli_s *pc = (camera_cli_s *)camera;
+ camera_msg_param param;
+
+ if (!pc || !pc->cb_info) {
+ CAM_LOG_ERROR("api[%d] NULL handle", api);
+ return CAMERA_ERROR_INVALID_PARAMETER;
+ }
+
+ CAM_LOG_INFO("api[%d] Enter - level[%d]", api, level);
+
+ CAMERA_MSG_PARAM_SET(param, INT, level);
+
+ _camera_msg_send_param1(api, pc->cb_info, &ret, ¶m, CAMERA_CB_TIMEOUT);
+
+ CAM_LOG_INFO("api[%d] ret[0x%x]", api, ret);
+
+ return ret;
+}
+
+
+int _camera_attr_get_level(camera_h camera, muse_camera_api_e api, muse_camera_get_int_e get_index, int *level)
+{
+ int ret = CAMERA_ERROR_NONE;
+ camera_cli_s *pc = (camera_cli_s *)camera;
+
+ if (!pc || !pc->cb_info || !level) {
+ CAM_LOG_ERROR("api[%d] NULL param[%p,%p]", api, pc, level);
+ return CAMERA_ERROR_INVALID_PARAMETER;
+ }
+
+ if (get_index >= MUSE_CAMERA_GET_INT_NUM) {
+ CAM_LOG_ERROR("api[%d] INVALID index[%d]", api, get_index);
+ return CAMERA_ERROR_INVALID_OPERATION;
+ }
+
+ CAM_LOG_INFO("api[%d] Enter", api);
+
+ _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+
+ if (ret == CAMERA_ERROR_NONE) {
+ *level = pc->cb_info->get_int[get_index];
+ CAM_LOG_INFO("api[%d] level[%d]", api, *level);
+ }
+
+ CAM_LOG_INFO("api[%d] ret[0x%x]", api, ret);
+
+ return ret;
+}
+
+
+int _camera_attr_get_range(camera_h camera, muse_camera_api_e api, muse_camera_get_int_pair_e get_index, int *min, int *max)
+{
+ int ret = CAMERA_ERROR_NONE;
+ camera_cli_s *pc = (camera_cli_s *)camera;
+
+ if (!pc || !pc->cb_info || !min || !max) {
+ CAM_LOG_ERROR("api[%d] NULL param[%p,%p,%p]", api, pc, min, max);
+ return CAMERA_ERROR_INVALID_PARAMETER;
+ }
+
+ if (get_index >= MUSE_CAMERA_GET_INT_PAIR_NUM) {
+ CAM_LOG_ERROR("api[%d] INVALID index[%d]", api, get_index);
+ return CAMERA_ERROR_INVALID_OPERATION;
+ }
+
+ CAM_LOG_INFO("api[%d] Enter", api);
+
+ _camera_msg_send(api, NULL, pc->cb_info, &ret, CAMERA_CB_TIMEOUT);
+
+ if (ret == CAMERA_ERROR_NONE) {
+ *min = pc->cb_info->get_int_pair[get_index][0];
+ *max = pc->cb_info->get_int_pair[get_index][1];
+ CAM_LOG_INFO("api[%d] min[%d], max[%d]", api, *min, *max);
+ }
+
+ CAM_LOG_INFO("api[%d] ret[0x%x]", api, ret);
+
+ return ret;
+}
projects / platform / core / api / camera.git / blobdiff