X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmm_camcorder_internal.c;h=20b5933d2c2ac2dde6837745a2666b69b80806e4;hb=HEAD;hp=0ffdb412893bfcd0952999ba31adc89fb73dde7c;hpb=d87e2b311e862b5aaf3490e42efd3a6f67d839b4;p=platform%2Fcore%2Fmultimedia%2Flibmm-camcorder.git diff --git a/src/mm_camcorder_internal.c b/src/mm_camcorder_internal.c index 0ffdb41..8496cc1 100644 --- a/src/mm_camcorder_internal.c +++ b/src/mm_camcorder_internal.c @@ -36,25 +36,29 @@ #include #include -#include #include #include #ifdef _MMCAMCORDER_RM_SUPPORT -#include +#include "mm_camcorder_rm.h" #endif /* _MMCAMCORDER_RM_SUPPORT */ /*--------------------------------------------------------------------------------------- | LOCAL VARIABLE DEFINITIONS for internal | ---------------------------------------------------------------------------------------*/ #define __MMCAMCORDER_CMD_ITERATE_MAX 3 -#define __MMCAMCORDER_SET_GST_STATE_TIMEOUT 5 +#define __MMCAMCORDER_SET_GST_STATE_TIMEOUT 10 #define __MMCAMCORDER_FORCE_STOP_TRY_COUNT 30 #define __MMCAMCORDER_FORCE_STOP_WAIT_TIME 100000 /* us */ #define __MMCAMCORDER_SOUND_WAIT_TIMEOUT 3 #define __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN 64 -#define __MMCAMCORDER_CONF_FILENAME_LENGTH 32 +#define __MMCAMCORDER_CONF_FILENAME_LENGTH 64 + +#ifdef _MMCAMCORDER_CAMERA_CONF_MGR_SUPPORT +#define __MMCAMCORDER_DEVICE_TYPE_STRING_LEN 1 +#endif + #define DPM_ALLOWED 1 #define DPM_DISALLOWED 0 @@ -67,10 +71,14 @@ static gint __mmcamcorder_init_handle(mmf_camcorder_t **hcamcorder, int devi static void __mmcamcorder_deinit_handle(mmf_camcorder_t *hcamcorder); static gint __mmcamcorder_init_configure_video_capture(mmf_camcorder_t *hcamcorder); static gint __mmcamcorder_init_configure_audio(mmf_camcorder_t *hcamcorder); +static gint __mmcamcorder_init_configure_common(mmf_camcorder_t *hcamcorder); static void __mmcamcorder_deinit_configure(mmf_camcorder_t *hcamcorder); static gboolean __mmcamcorder_init_gstreamer(camera_conf *conf); static void __mmcamcorder_get_system_info(mmf_camcorder_t *hcamcorder); +static void __mmcamcorder_handle_gst_sync_error(mmf_camcorder_t *hcamcorder, GstMessage *message); +static void __mmcamcorder_gst_handle_sync_audio_error(mmf_camcorder_t *hcamcorder, gint err_code); +static void __mmcamcorder_gst_handle_sync_others_error(mmf_camcorder_t *hcamcorder, gint err_code); static gboolean __mmcamcorder_handle_gst_error(MMHandleType handle, GstMessage *message, GError *error); static gint __mmcamcorder_gst_handle_stream_error(MMHandleType handle, int code, GstMessage *message); static gint __mmcamcorder_gst_handle_resource_error(MMHandleType handle, int code, GstMessage *message); @@ -82,13 +90,6 @@ static gboolean __mmcamcorder_handle_gst_warning(MMHandleType handle, GstMessage static int __mmcamcorder_resource_release_cb(mm_resource_manager_h rm, mm_resource_manager_res_h res, void *user_data); #endif /* _MMCAMCORDER_MM_RM_SUPPORT */ -#ifdef _MMCAMCORDER_RM_SUPPORT -rm_cb_result _mmcamcorder_rm_callback(int handle, rm_callback_type event_src, - rm_device_request_s *info, void *cb_data); -#endif /* _MMCAMCORDER_RM_SUPPORT */ -#ifdef _MMCAMCORDER_USE_SET_ATTR_CB -static gboolean __mmcamcorder_set_attr_to_camsensor_cb(gpointer data); -#endif /* _MMCAMCORDER_USE_SET_ATTR_CB */ /*======================================================================================= | FUNCTION DEFINITIONS | @@ -96,17 +97,18 @@ static gboolean __mmcamcorder_set_attr_to_camsensor_cb(gpointer data); static gint __mmcamcorder_init_handle(mmf_camcorder_t **hcamcorder, int device_type) { int ret = MM_ERROR_NONE; + int log_level = MM_CAMCORDER_LOG_LEVEL_INFO; mmf_camcorder_t *new_handle = NULL; if (!hcamcorder) { - _mmcam_dbg_err("NULL handle"); + MMCAM_LOG_ERROR("NULL handle"); return MM_ERROR_CAMCORDER_INVALID_ARGUMENT; } /* Create mmf_camcorder_t handle and initialize every variable */ new_handle = (mmf_camcorder_t *)malloc(sizeof(mmf_camcorder_t)); if (!new_handle) { - _mmcam_dbg_err("new handle allocation failed"); + MMCAM_LOG_ERROR("new handle allocation failed"); return MM_ERROR_CAMCORDER_LOW_MEMORY; } @@ -115,7 +117,7 @@ static gint __mmcamcorder_init_handle(mmf_camcorder_t **hcamcorder, int device_t /* set device type */ new_handle->device_type = device_type; - _mmcam_dbg_warn("Device Type : %d", new_handle->device_type); + MMCAM_LOG_WARNING("Device Type : %d", new_handle->device_type); new_handle->type = MM_CAMCORDER_MODE_VIDEO_CAPTURE; new_handle->state = MM_CAMCORDER_STATE_NONE; @@ -134,8 +136,10 @@ static gint __mmcamcorder_init_handle(mmf_camcorder_t **hcamcorder, int device_t g_mutex_init(&(new_handle->mtsafe).message_cb_lock); g_mutex_init(&(new_handle->mtsafe).vcapture_cb_lock); g_mutex_init(&(new_handle->mtsafe).vstream_cb_lock); + g_mutex_init(&(new_handle->mtsafe).vstream_cb_flag_lock); g_mutex_init(&(new_handle->mtsafe).astream_cb_lock); g_mutex_init(&(new_handle->mtsafe).mstream_cb_lock); + g_mutex_init(&(new_handle->mtsafe).vedecision_cb_lock); #ifdef _MMCAMCORDER_MM_RM_SUPPORT g_mutex_init(&(new_handle->mtsafe).resource_lock); #endif /* _MMCAMCORDER_MM_RM_SUPPORT */ @@ -152,20 +156,15 @@ static gint __mmcamcorder_init_handle(mmf_camcorder_t **hcamcorder, int device_t new_handle->task_thread_state = _MMCAMCORDER_TASK_THREAD_STATE_NONE; if (device_type != MM_VIDEO_DEVICE_NONE) { - new_handle->gdbus_info_sound.mm_handle = new_handle; - g_mutex_init(&new_handle->gdbus_info_sound.sync_mutex); - g_cond_init(&new_handle->gdbus_info_sound.sync_cond); - - new_handle->gdbus_info_solo_sound.mm_handle = new_handle; - g_mutex_init(&new_handle->gdbus_info_solo_sound.sync_mutex); - g_cond_init(&new_handle->gdbus_info_solo_sound.sync_cond); + new_handle->gdbus_info_sound = _mmcamcorder_gdbus_info_new(); + new_handle->gdbus_info_solo_sound = _mmcamcorder_gdbus_info_new(); } /* create task thread */ - new_handle->task_thread = g_thread_try_new("MMCAM_TASK_THREAD", + new_handle->task_thread = g_thread_try_new("mmcam:util_task", (GThreadFunc)_mmcamcorder_util_task_thread_func, (gpointer)new_handle, NULL); if (new_handle->task_thread == NULL) { - _mmcam_dbg_err("_mmcamcorder_create::failed to create task thread"); + MMCAM_LOG_ERROR("_mmcamcorder_create::failed to create task thread"); ret = MM_ERROR_CAMCORDER_RESOURCE_CREATION; goto _INIT_HANDLE_FAILED; } @@ -173,10 +172,18 @@ static gint __mmcamcorder_init_handle(mmf_camcorder_t **hcamcorder, int device_t /* Get Camera Configure information from Camcorder INI file */ ret = _mmcamcorder_conf_get_info((MMHandleType)new_handle, CONFIGURE_TYPE_MAIN, CONFIGURE_MAIN_FILE, &new_handle->conf_main); if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("Failed to get configure(main) info."); + MMCAM_LOG_ERROR("Failed to get configure(main) info."); goto _INIT_HANDLE_FAILED; } + /* Get log level from conf */ + _mmcamcorder_conf_get_value_int((MMHandleType)new_handle, new_handle->conf_main, + CONFIGURE_CATEGORY_MAIN_GENERAL, + "LogLevel", + &log_level); + + _mmcamcorder_set_log_level(log_level); + /* allocate attribute */ new_handle->attributes = _mmcamcorder_alloc_attribute((MMHandleType)new_handle); if (!new_handle->attributes) { @@ -186,7 +193,7 @@ static gint __mmcamcorder_init_handle(mmf_camcorder_t **hcamcorder, int device_t *hcamcorder = new_handle; - _mmcam_dbg_log("new handle %p", new_handle); + MMCAM_LOG_INFO("new handle %p", new_handle); return MM_ERROR_NONE; @@ -199,7 +206,7 @@ _INIT_HANDLE_FAILED: static void __mmcamcorder_deinit_handle(mmf_camcorder_t *hcamcorder) { if (!hcamcorder) { - _mmcam_dbg_err("NULL handle"); + MMCAM_LOG_ERROR("NULL handle"); return; } @@ -221,7 +228,7 @@ static void __mmcamcorder_deinit_handle(mmf_camcorder_t *hcamcorder) /* remove task thread */ if (hcamcorder->task_thread) { g_mutex_lock(&hcamcorder->task_thread_lock); - _mmcam_dbg_log("send signal for task thread exit"); + MMCAM_LOG_INFO("send signal for task thread exit"); hcamcorder->task_thread_state = _MMCAMCORDER_TASK_THREAD_STATE_EXIT; g_cond_signal(&hcamcorder->task_thread_cond); g_mutex_unlock(&hcamcorder->task_thread_lock); @@ -241,8 +248,10 @@ static void __mmcamcorder_deinit_handle(mmf_camcorder_t *hcamcorder) g_mutex_clear(&(hcamcorder->mtsafe).message_cb_lock); g_mutex_clear(&(hcamcorder->mtsafe).vcapture_cb_lock); g_mutex_clear(&(hcamcorder->mtsafe).vstream_cb_lock); + g_mutex_clear(&(hcamcorder->mtsafe).vstream_cb_flag_lock); g_mutex_clear(&(hcamcorder->mtsafe).astream_cb_lock); g_mutex_clear(&(hcamcorder->mtsafe).mstream_cb_lock); + g_mutex_clear(&(hcamcorder->mtsafe).vedecision_cb_lock); #ifdef _MMCAMCORDER_MM_RM_SUPPORT g_mutex_clear(&(hcamcorder->mtsafe).resource_lock); #endif /* _MMCAMCORDER_MM_RM_SUPPORT */ @@ -252,10 +261,8 @@ static void __mmcamcorder_deinit_handle(mmf_camcorder_t *hcamcorder) g_mutex_clear(&hcamcorder->restart_preview_lock); if (hcamcorder->device_type != MM_VIDEO_DEVICE_NONE) { - g_mutex_clear(&hcamcorder->gdbus_info_sound.sync_mutex); - g_cond_clear(&hcamcorder->gdbus_info_sound.sync_cond); - g_mutex_clear(&hcamcorder->gdbus_info_solo_sound.sync_mutex); - g_cond_clear(&hcamcorder->gdbus_info_solo_sound.sync_cond); + _mmcamcorder_gdbus_info_check_free(hcamcorder->gdbus_info_sound); + _mmcamcorder_gdbus_info_check_free(hcamcorder->gdbus_info_solo_sound); } g_mutex_clear(&hcamcorder->task_thread_lock); @@ -281,24 +288,24 @@ static void __mmcamcorder_get_system_info(mmf_camcorder_t *hcamcorder) int ret = 0; if (!hcamcorder) { - _mmcam_dbg_err("NULL handle"); + MMCAM_LOG_ERROR("NULL handle"); return; } /* get shutter sound policy */ vconf_get_int(VCONFKEY_CAMERA_SHUTTER_SOUND_POLICY, &hcamcorder->shutter_sound_policy); - _mmcam_dbg_log("current shutter sound policy : %d", hcamcorder->shutter_sound_policy); + MMCAM_LOG_INFO("current shutter sound policy : %d", hcamcorder->shutter_sound_policy); /* get model name */ ret = system_info_get_platform_string("http://tizen.org/system/model_name", &hcamcorder->model_name); - _mmcam_dbg_warn("model name [%s], ret 0x%x", + MMCAM_LOG_WARNING("model name [%s], ret 0x%x", hcamcorder->model_name ? hcamcorder->model_name : "NULL", ret); /* get software version */ ret = system_info_get_platform_string("http://tizen.org/system/build.string", &hcamcorder->software_version); - _mmcam_dbg_warn("software version [%s], ret 0x%x", + MMCAM_LOG_WARNING("software version [%s], ret 0x%x", hcamcorder->software_version ? hcamcorder->software_version : "NULL", ret); return; @@ -314,28 +321,70 @@ static gint __mmcamcorder_init_configure_video_capture(mmf_camcorder_t *hcamcord int rcmd_fmt_recording = MM_PIXEL_FORMAT_NV12; int rcmd_dpy_rotation = MM_DISPLAY_ROTATION_270; int play_capture_sound = TRUE; - int camera_device_count = MM_VIDEO_DEVICE_NUM; int camera_default_flip = MM_FLIP_NONE; int camera_facing_direction = MM_CAMCORDER_CAMERA_FACING_DIRECTION_REAR; + int wb_temp_step = 1; + int gain_step = 1; char *err_attr_name = NULL; char conf_file_name[__MMCAMCORDER_CONF_FILENAME_LENGTH] = {'\0',}; + const char *platform_privilege_camera = NULL; MMCamAttrsInfo fps_info; + type_element *videofilt2_element = NULL; +#ifdef _MMCAMCORDER_CAMERA_CONF_MGR_SUPPORT + camera_conf_error_e ret_conf = CAMERA_CONF_MGR_ERROR_NONE; + char devicetype[__MMCAMCORDER_CONF_FILENAME_LENGTH] = {'\0',}; +#endif if (!hcamcorder) { - _mmcam_dbg_err("NULL handle"); + MMCAM_LOG_ERROR("NULL handle"); return MM_ERROR_CAMCORDER_NOT_INITIALIZED; } - snprintf(conf_file_name, sizeof(conf_file_name), "%s%d.ini", - CONFIGURE_CTRL_FILE_PREFIX, hcamcorder->device_type); + if (hcamcorder->is_network) { + snprintf(conf_file_name, sizeof(conf_file_name), "%s_network.ini", + CONFIGURE_CTRL_FILE_PREFIX); + } else { +#ifdef _MMCAMCORDER_CAMERA_CONF_MGR_SUPPORT + snprintf(devicetype, sizeof(devicetype), "%d", hcamcorder->device_type); + memset(&hcamcorder->conf_device_info, 0x00, sizeof(camera_conf_device_info_s)); + ret_conf = camera_conf_mgr_get_ids(devicetype, __MMCAMCORDER_DEVICE_TYPE_STRING_LEN, + &hcamcorder->conf_device_info); + if (ret_conf != CAMERA_CONF_MGR_ERROR_NONE) { + MMCAM_LOG_ERROR("Device [%s] is not found", devicetype); + return MM_ERROR_CAMCORDER_NOT_SUPPORTED; + } + + snprintf(conf_file_name, sizeof(conf_file_name), "%s_%s_%s.ini", + CONFIGURE_CTRL_FILE_PREFIX, hcamcorder->conf_device_info.vendor_id, + hcamcorder->conf_device_info.product_id); + + MMCAM_LOG_INFO("device info : node[%s]", + hcamcorder->conf_device_info.node); +#else + snprintf(conf_file_name, sizeof(conf_file_name), "%s%d.ini", + CONFIGURE_CTRL_FILE_PREFIX, hcamcorder->device_type); +#endif + } - _mmcam_dbg_log("Load control configure file [%d][%s]", hcamcorder->device_type, conf_file_name); + MMCAM_LOG_INFO("Load control configure file [%d][%s]", + hcamcorder->device_type, conf_file_name); ret = _mmcamcorder_conf_get_info((MMHandleType)hcamcorder, CONFIGURE_TYPE_CTRL, (const char *)conf_file_name, &hcamcorder->conf_ctrl); if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("Failed to get configure(control) info."); +#ifdef _MMCAMCORDER_CAMERA_CONF_MGR_SUPPORT + snprintf(conf_file_name, sizeof(conf_file_name), "%s.ini", + CONFIGURE_CTRL_FILE_PREFIX); + ret = _mmcamcorder_conf_get_info((MMHandleType)hcamcorder, + CONFIGURE_TYPE_CTRL, (const char *)conf_file_name, &hcamcorder->conf_ctrl); + if (ret != MM_ERROR_NONE) { + MMCAM_LOG_ERROR("Failed to get configure(control) info."); + return ret; + } +#else + MMCAM_LOG_ERROR("Failed to get configure(control) info."); return ret; +#endif } /* _mmcamcorder_conf_print_info(&hcamcorder->conf_main); @@ -343,17 +392,17 @@ static gint __mmcamcorder_init_configure_video_capture(mmf_camcorder_t *hcamcord */ ret = _mmcamcorder_init_convert_table((MMHandleType)hcamcorder); if (ret != MM_ERROR_NONE) { - _mmcam_dbg_warn("converting table initialize error!!"); + MMCAM_LOG_WARNING("converting table initialize error!!"); return MM_ERROR_CAMCORDER_INTERNAL; } ret = _mmcamcorder_init_attr_from_configure((MMHandleType)hcamcorder, MM_CAMCONVERT_CATEGORY_ALL); if (ret != MM_ERROR_NONE) { - _mmcam_dbg_warn("attribute initialize from configure error!!"); + MMCAM_LOG_WARNING("attribute initialize from configure error!!"); return MM_ERROR_CAMCORDER_INTERNAL; } - /* Get device info, recommend preview fmt and display rotation from INI */ + /* Get device information for supported features from INI */ _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl, CONFIGURE_CATEGORY_CTRL_CAMERA, "RecommendPreviewFormatCapture", @@ -369,15 +418,15 @@ static gint __mmcamcorder_init_configure_video_capture(mmf_camcorder_t *hcamcord "RecommendDisplayRotation", &rcmd_dpy_rotation); - _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, - CONFIGURE_CATEGORY_MAIN_CAPTURE, - "PlayCaptureSound", - &play_capture_sound); + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl, + CONFIGURE_CATEGORY_CTRL_CAMERA, + "SupportExtraPreview", + (int *)&hcamcorder->extra_preview.is_supported); - _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, - CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, - "DeviceCount", - &camera_device_count); + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl, + CONFIGURE_CATEGORY_CTRL_CAMERA, + "ExtraPreviewMode", + (int *)&hcamcorder->extra_preview.mode); _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl, CONFIGURE_CATEGORY_CTRL_CAMERA, @@ -394,55 +443,104 @@ static gint __mmcamcorder_init_configure_video_capture(mmf_camcorder_t *hcamcord "SupportZSL", &hcamcorder->support_zsl_capture); - _mmcam_dbg_log("Recommend fmt[cap:%d,rec:%d], dpy rot %d, cap snd %d, dev cnt %d, cam facing dir %d, step denom %d, support zsl %d", - rcmd_fmt_capture, rcmd_fmt_recording, rcmd_dpy_rotation, - play_capture_sound, camera_device_count, camera_facing_direction, - hcamcorder->brightness_step_denominator, hcamcorder->support_zsl_capture); + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl, + CONFIGURE_CATEGORY_CTRL_EFFECT, + "WhiteBalanceTemperatureStep", + &wb_temp_step); - /* Get UseZeroCopyFormat value from INI */ - _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, - CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, - "UseZeroCopyFormat", + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl, + CONFIGURE_CATEGORY_CTRL_PHOTOGRAPH, + "GainStep", + &gain_step); + + MMCAM_LOG_INFO("Recommend format[capture:%d, recording:%d]", rcmd_fmt_capture, rcmd_fmt_recording); + MMCAM_LOG_INFO("Recommend display rotation[%d]", rcmd_dpy_rotation); + MMCAM_LOG_INFO("Camera facing direction[%d]", camera_facing_direction); + MMCAM_LOG_INFO("Brightness step denominator[%d]", hcamcorder->brightness_step_denominator); + MMCAM_LOG_INFO("Support ZSL capture[%d]", hcamcorder->support_zsl_capture); + MMCAM_LOG_INFO("Step: wb_temp[%d], gain[%d]", wb_temp_step, gain_step); + + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl, + CONFIGURE_CATEGORY_CTRL_CAMERA, + "AltUseZeroCopyFormat", &hcamcorder->use_zero_copy_format); + if (hcamcorder->use_zero_copy_format == -1) { + MMCAM_LOG_WARNING("AltUseZeroCopyFormat is not set, so use \"UseZeroCopyFormat\"."); + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, + CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, + "UseZeroCopyFormat", + &hcamcorder->use_zero_copy_format); + } - /* Get SupportUserBuffer value from INI */ _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, "SupportUserBuffer", &hcamcorder->support_user_buffer); - /* Get SupportMediaPacketPreviewCb value from INI */ _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, "SupportMediaPacketPreviewCb", &hcamcorder->support_media_packet_preview_cb); - /* Get UseVideoconvert value from INI */ _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT, "UseVideoconvert", &hcamcorder->use_videoconvert); + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, + CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, + "MeasurePreviewFPS", + &hcamcorder->measure_preview_fps); + + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, + CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, + "DefaultEncodedPreviewBitrate", + &hcamcorder->default_encoded_preview_bitrate); + + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, + CONFIGURE_CATEGORY_MAIN_CAPTURE, + "CaptureMode", + &hcamcorder->capture_mode); + + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, + CONFIGURE_CATEGORY_MAIN_CAPTURE, + "PlayCaptureSound", + &play_capture_sound); + + _mmcamcorder_conf_get_element((MMHandleType)hcamcorder, hcamcorder->conf_ctrl, + CONFIGURE_CATEGORY_CTRL_CAMERA, + "VideoFilter2Element", + &videofilt2_element); + hcamcorder->support_media_packet_preview_internal_cb = videofilt2_element ? TRUE : FALSE; + + MMCAM_LOG_INFO("Support user buffer[%d]", hcamcorder->support_user_buffer); + MMCAM_LOG_INFO("Support media packet preview cb[%d]", hcamcorder->support_media_packet_preview_cb); + MMCAM_LOG_INFO("Support media packet preview internal cb[%d]", hcamcorder->support_media_packet_preview_internal_cb); + MMCAM_LOG_INFO("Support extra preview[%d]", hcamcorder->extra_preview.is_supported); + MMCAM_LOG_INFO("Extra preview mode[%d]", hcamcorder->extra_preview.mode); + MMCAM_LOG_INFO("Capture mode[%d]", hcamcorder->capture_mode); + MMCAM_LOG_INFO("Use zero copy format[%d]", hcamcorder->use_zero_copy_format); + MMCAM_LOG_INFO("Use video convert[%d]", hcamcorder->use_videoconvert); + MMCAM_LOG_INFO("Measure preview FPS[%d]", hcamcorder->measure_preview_fps); + MMCAM_LOG_INFO("Default encoded preview bitrate[%d]", hcamcorder->default_encoded_preview_bitrate); + MMCAM_LOG_INFO("Play capture sound[%d]", play_capture_sound); + ret = mm_camcorder_get_attributes((MMHandleType)hcamcorder, NULL, MMCAM_CAMERA_WIDTH, &resolution_width, MMCAM_CAMERA_HEIGHT, &resolution_height, NULL); if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("get attribute[resolution] error"); + MMCAM_LOG_ERROR("get attribute[resolution] error"); return MM_ERROR_CAMCORDER_INTERNAL; } ret = mm_camcorder_get_fps_list_by_resolution((MMHandleType)hcamcorder, resolution_width, resolution_height, &fps_info); if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("get fps list failed with [%dx%d]", resolution_width, resolution_height); + MMCAM_LOG_ERROR("get fps list failed with [%dx%d]", resolution_width, resolution_height); return MM_ERROR_CAMCORDER_INTERNAL; } - _mmcam_dbg_log("ZeroCopy %d, UserBuffer %d, Videoconvert %d, MPPreviewCb %d", - hcamcorder->use_zero_copy_format, hcamcorder->support_user_buffer, - hcamcorder->use_videoconvert, hcamcorder->support_media_packet_preview_cb); - - _mmcam_dbg_log("res : %d X %d, Default FPS by resolution : %d", + MMCAM_LOG_INFO("res : %d X %d, Default FPS by resolution : %d", resolution_width, resolution_height, fps_info.int_array.def); if (camera_facing_direction == 1) { @@ -451,11 +549,24 @@ static gint __mmcamcorder_init_configure_video_capture(mmf_camcorder_t *hcamcord else camera_default_flip = MM_FLIP_HORIZONTAL; - _mmcam_dbg_log("camera_default_flip : [%d]", camera_default_flip); + MMCAM_LOG_INFO("camera_default_flip : [%d]", camera_default_flip); + } + + _mmcamcorder_conf_get_value_string((MMHandleType)hcamcorder, hcamcorder->conf_main, + CONFIGURE_CATEGORY_MAIN_GENERAL, + "PlatformPrivilegeCamera", + &platform_privilege_camera); + + if (hcamcorder->is_network) { + _mmcamcorder_conf_get_value_string((MMHandleType)hcamcorder, hcamcorder->conf_main, + CONFIGURE_CATEGORY_MAIN_GENERAL, + "NetworkCameraHALName", + &hcamcorder->network_hal_name); + + MMCAM_LOG_INFO("network HAL name[%s]", hcamcorder->network_hal_name); } ret = mm_camcorder_set_attributes((MMHandleType)hcamcorder, &err_attr_name, - MMCAM_CAMERA_DEVICE_COUNT, camera_device_count, MMCAM_CAMERA_FACING_DIRECTION, camera_facing_direction, MMCAM_RECOMMEND_PREVIEW_FORMAT_FOR_CAPTURE, rcmd_fmt_capture, MMCAM_RECOMMEND_PREVIEW_FORMAT_FOR_RECORDING, rcmd_fmt_recording, @@ -463,13 +574,20 @@ static gint __mmcamcorder_init_configure_video_capture(mmf_camcorder_t *hcamcord MMCAM_SUPPORT_ZSL_CAPTURE, hcamcorder->support_zsl_capture, MMCAM_SUPPORT_ZERO_COPY_FORMAT, hcamcorder->use_zero_copy_format, MMCAM_SUPPORT_MEDIA_PACKET_PREVIEW_CB, hcamcorder->support_media_packet_preview_cb, + MMCAM_SUPPORT_MEDIA_PACKET_PREVIEW_INTERNAL_CB, hcamcorder->support_media_packet_preview_internal_cb, MMCAM_SUPPORT_USER_BUFFER, hcamcorder->support_user_buffer, + MMCAM_SUPPORT_EXTRA_PREVIEW, hcamcorder->extra_preview.is_supported, MMCAM_CAMERA_FPS, fps_info.int_array.def, MMCAM_DISPLAY_FLIP, camera_default_flip, MMCAM_CAPTURE_SOUND_ENABLE, play_capture_sound, + MMCAM_PLATFORM_PRIVILEGE_CAMERA, platform_privilege_camera, + platform_privilege_camera ? strlen(platform_privilege_camera) : 0, + MMCAM_ENCODED_PREVIEW_BITRATE, hcamcorder->default_encoded_preview_bitrate, + MMCAM_FILTER_WB_TEMPERATURE_STEP, wb_temp_step, + MMCAM_CAMERA_GAIN_STEP, gain_step, NULL); if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("[0x%x] Set %s FAILED.", ret, err_attr_name ? err_attr_name : "[UNKNOWN]"); + MMCAM_LOG_ERROR("[0x%x] Set %s FAILED.", ret, err_attr_name ? err_attr_name : "[UNKNOWN]"); SAFE_FREE(err_attr_name); return MM_ERROR_CAMCORDER_INTERNAL; } @@ -479,11 +597,11 @@ static gint __mmcamcorder_init_configure_video_capture(mmf_camcorder_t *hcamcord MMCAM_FILTER_BRIGHTNESS, &hcamcorder->brightness_default, NULL); if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("Get brightness FAILED."); + MMCAM_LOG_ERROR("Get brightness FAILED."); return MM_ERROR_CAMCORDER_INTERNAL; } - _mmcam_dbg_log("Default brightness : %d", hcamcorder->brightness_default); + MMCAM_LOG_INFO("Default brightness : %d", hcamcorder->brightness_default); return ret; } @@ -492,31 +610,57 @@ static gint __mmcamcorder_init_configure_video_capture(mmf_camcorder_t *hcamcord static gint __mmcamcorder_init_configure_audio(mmf_camcorder_t *hcamcorder) { int ret = MM_ERROR_NONE; - int camera_device_count = 0; if (!hcamcorder) { - _mmcam_dbg_err("NULL handle"); + MMCAM_LOG_ERROR("NULL handle"); + return MM_ERROR_CAMCORDER_NOT_INITIALIZED; + } + + ret = _mmcamcorder_init_attr_from_configure((MMHandleType)hcamcorder, MM_CAMCONVERT_CATEGORY_AUDIO); + if (ret != MM_ERROR_NONE) { + MMCAM_LOG_ERROR("there is no audio device"); + return MM_ERROR_CAMCORDER_NOT_SUPPORTED; + } + + return ret; +} + + +static gint __mmcamcorder_init_configure_common(mmf_camcorder_t *hcamcorder) +{ + int ret = MM_ERROR_NONE; + int device_count = 0; + const char *videosrc_name = NULL; + const char *audiosrc_name = NULL; + + if (!hcamcorder) { + MMCAM_LOG_ERROR("NULL handle"); return MM_ERROR_CAMCORDER_NOT_INITIALIZED; } _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, "DeviceCount", - &camera_device_count); + &device_count); + + _mmcamcorder_conf_get_element_and_name((MMHandleType)hcamcorder, + hcamcorder->conf_main, CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, "VideosrcElement", + NULL, &videosrc_name); + + _mmcamcorder_conf_get_element_and_name((MMHandleType)hcamcorder, + hcamcorder->conf_main, CONFIGURE_CATEGORY_MAIN_AUDIO_INPUT, "AudiosrcElement", + NULL, &audiosrc_name); + + MMCAM_LOG_INFO("Device count[%d], Videosrc[%s], Audiosrc[%s]", + device_count, videosrc_name, audiosrc_name); ret = mm_camcorder_set_attributes((MMHandleType)hcamcorder, NULL, - MMCAM_CAMERA_DEVICE_COUNT, camera_device_count, + MMCAM_CAMERA_DEVICE_COUNT, device_count, + MMCAM_VIDEOSRC_ELEMENT_NAME, videosrc_name, videosrc_name ? strlen(videosrc_name) : 0, + MMCAM_AUDIOSRC_ELEMENT_NAME, audiosrc_name, audiosrc_name ? strlen(audiosrc_name) : 0, NULL); - if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("Set device count FAILED"); - return MM_ERROR_CAMCORDER_INTERNAL; - } - - ret = _mmcamcorder_init_attr_from_configure((MMHandleType)hcamcorder, MM_CAMCONVERT_CATEGORY_AUDIO); - if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("there is no audio device"); - return MM_ERROR_CAMCORDER_NOT_SUPPORTED; - } + if (ret != MM_ERROR_NONE) + MMCAM_LOG_ERROR("Set FAILED[0x%x]", ret); return ret; } @@ -525,7 +669,7 @@ static gint __mmcamcorder_init_configure_audio(mmf_camcorder_t *hcamcorder) static void __mmcamcorder_deinit_configure(mmf_camcorder_t *hcamcorder) { if (!hcamcorder) { - _mmcam_dbg_err("NULL handle"); + MMCAM_LOG_ERROR("NULL handle"); return; } @@ -548,14 +692,14 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info) int ret = MM_ERROR_NONE; mmf_camcorder_t *hcamcorder = NULL; - _mmcam_dbg_log("Entered"); + MMCAM_LOG_INFO("Entered"); mmf_return_val_if_fail(handle && info, MM_ERROR_CAMCORDER_INVALID_ARGUMENT); /* check device type */ if (info->videodev_type < MM_VIDEO_DEVICE_NONE || info->videodev_type >= MM_VIDEO_DEVICE_NUM) { - _mmcam_dbg_err("video device type[%d] is out of range.", info->videodev_type); + MMCAM_LOG_ERROR("video device type[%d] is out of range.", info->videodev_type); return MM_ERROR_CAMCORDER_INVALID_ARGUMENT; } @@ -564,27 +708,33 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info) if (ret != MM_ERROR_NONE) return ret; + /* set network camera flag */ + hcamcorder->is_network = (gboolean)info->reserved[0]; + /* get DPM handle for camera/microphone restriction */ hcamcorder->dpm_handle = dpm_manager_create(); - _mmcam_dbg_warn("DPM handle %p", hcamcorder->dpm_handle); + MMCAM_LOG_WARNING("DPM handle %p", hcamcorder->dpm_handle); + + ret = __mmcamcorder_init_configure_common(hcamcorder); + if (ret != MM_ERROR_NONE) + goto _ERR_DEFAULT_VALUE_INIT; if (hcamcorder->device_type != MM_VIDEO_DEVICE_NONE) { ret = __mmcamcorder_init_configure_video_capture(hcamcorder); - if (ret != MM_ERROR_NONE) { + if (ret != MM_ERROR_NONE) goto _ERR_DEFAULT_VALUE_INIT; - } /* add DPM camera policy changed callback */ if (hcamcorder->dpm_handle) { ret = dpm_add_policy_changed_cb(hcamcorder->dpm_handle, "camera", _mmcamcorder_dpm_camera_policy_changed_cb, (void *)hcamcorder, &hcamcorder->dpm_camera_cb_id); if (ret != DPM_ERROR_NONE) { - _mmcam_dbg_err("add DPM changed cb failed, keep going..."); + MMCAM_LOG_ERROR("add DPM changed cb failed, keep going..."); hcamcorder->dpm_camera_cb_id = 0; } - _mmcam_dbg_log("DPM camera changed cb id %d", hcamcorder->dpm_camera_cb_id); + MMCAM_LOG_INFO("DPM camera changed cb id %d", hcamcorder->dpm_camera_cb_id); } #ifdef _MMCAMCORDER_MM_RM_SUPPORT @@ -593,16 +743,15 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info) __mmcamcorder_resource_release_cb, hcamcorder, &hcamcorder->resource_manager); if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) { - _mmcam_dbg_err("failed to initialize resource manager"); + MMCAM_LOG_ERROR("failed to initialize resource manager"); ret = MM_ERROR_CAMCORDER_INTERNAL; goto _ERR_DEFAULT_VALUE_INIT; } #endif /* _MMCAMCORDER_MM_RM_SUPPORT */ } else { ret = __mmcamcorder_init_configure_audio(hcamcorder); - if (ret != MM_ERROR_NONE) { + if (ret != MM_ERROR_NONE) goto _ERR_DEFAULT_VALUE_INIT; - } } traceBegin(TTRACE_TAG_CAMERA, "MMCAMCORDER:CREATE:INIT_GSTREAMER"); @@ -612,7 +761,7 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info) traceEnd(TTRACE_TAG_CAMERA); if (!ret) { - _mmcam_dbg_err("Failed to initialize gstreamer!!"); + MMCAM_LOG_ERROR("Failed to initialize gstreamer!!"); ret = MM_ERROR_CAMCORDER_NOT_INITIALIZED; goto _ERR_DEFAULT_VALUE_INIT; } @@ -620,16 +769,13 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info) /* Make some attributes as read-only type */ _mmcamcorder_lock_readonly_attributes((MMHandleType)hcamcorder); - /* Disable attributes in each model */ - _mmcamcorder_set_disabled_attributes((MMHandleType)hcamcorder); - /* get system information */ __mmcamcorder_get_system_info(hcamcorder); /* Set initial state */ _mmcamcorder_set_state((MMHandleType)hcamcorder, MM_CAMCORDER_STATE_NULL); - _mmcam_dbg_log("created handle %p", hcamcorder); + MMCAM_LOG_INFO("created handle %p", hcamcorder); *handle = (MMHandleType)hcamcorder; @@ -644,7 +790,7 @@ _ERR_DEFAULT_VALUE_INIT: /* release DPM related handle */ if (hcamcorder->dpm_handle) { - _mmcam_dbg_log("release DPM handle %p, camera changed cb id %d", + MMCAM_LOG_INFO("release DPM handle %p, camera changed cb id %d", hcamcorder->dpm_handle, hcamcorder->dpm_camera_cb_id); /* remove camera policy changed callback */ @@ -652,7 +798,7 @@ _ERR_DEFAULT_VALUE_INIT: dpm_remove_policy_changed_cb(hcamcorder->dpm_handle, hcamcorder->dpm_camera_cb_id); hcamcorder->dpm_camera_cb_id = 0; } else { - _mmcam_dbg_warn("invalid dpm camera cb id %d", hcamcorder->dpm_camera_cb_id); + MMCAM_LOG_WARNING("invalid dpm camera cb id %d", hcamcorder->dpm_camera_cb_id); } dpm_manager_destroy(hcamcorder->dpm_handle); @@ -673,31 +819,28 @@ int _mmcamcorder_destroy(MMHandleType handle) { int ret = MM_ERROR_NONE; int state = MM_CAMCORDER_STATE_NONE; -#ifdef _MMCAMCORDER_RM_SUPPORT - int iret = RM_OK; -#endif /* _MMCAMCORDER_RM_SUPPORT */ GstElement *sink_element = NULL; int sink_element_size = 0; mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); if (!hcamcorder) { - _mmcam_dbg_err("Not initialized"); + MMCAM_LOG_ERROR("Not initialized"); ret = MM_ERROR_CAMCORDER_NOT_INITIALIZED; goto _ERR_CAMCORDER_CMD_PRECON; } if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) { - _mmcam_dbg_err("Another command is running."); + MMCAM_LOG_ERROR("Another command is running."); ret = MM_ERROR_CAMCORDER_CMD_IS_RUNNING; goto _ERR_CAMCORDER_CMD_PRECON; } state = _mmcamcorder_get_state(handle); if (state != MM_CAMCORDER_STATE_NULL) { - _mmcam_dbg_err("Wrong state(%d)", state); + MMCAM_LOG_ERROR("Wrong state(%d)", state); ret = MM_ERROR_CAMCORDER_INVALID_STATE; goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } @@ -709,7 +852,7 @@ int _mmcamcorder_destroy(MMHandleType handle) if (sink_element) { GstStateChangeReturn result = gst_element_set_state(sink_element, GST_STATE_NULL); - _mmcam_dbg_warn("remove sink element %p, set state NULL result %d", sink_element, result); + MMCAM_LOG_WARNING("remove sink element %p, set state NULL result %d", sink_element, result); gst_object_unref(sink_element); sink_element = NULL; @@ -734,34 +877,22 @@ int _mmcamcorder_destroy(MMHandleType handle) if (hcamcorder->resource_manager != NULL) { ret = mm_resource_manager_destroy(hcamcorder->resource_manager); if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) - _mmcam_dbg_err("failed to de-initialize resource manager 0x%x", ret); + MMCAM_LOG_ERROR("failed to de-initialize resource manager 0x%x", ret); } _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); #endif /* _MMCAMCORDER_MM_RM_SUPPORT */ - /* Remove idle function which is not called yet */ - if (hcamcorder->setting_event_id) { - _mmcam_dbg_log("Remove remaining idle function"); - g_source_remove(hcamcorder->setting_event_id); - hcamcorder->setting_event_id = 0; - } - /* Remove messages which are not called yet */ _mmcamcorder_remove_message_all(handle); #ifdef _MMCAMCORDER_RM_SUPPORT - if (hcamcorder->rm_handle != 0) { - iret = rm_unregister(hcamcorder->rm_handle); - if (iret != RM_OK) - _mmcam_dbg_err("rm_unregister() failed"); - hcamcorder->rm_handle = 0; - } + _mmcamcorder_rm_release(handle); #endif /* _MMCAMCORDER_RM_SUPPORT */ /* release DPM handle */ if (hcamcorder->dpm_handle) { - _mmcam_dbg_log("release DPM handle %p, camera changed cb id %d", + MMCAM_LOG_INFO("release DPM handle %p, camera changed cb id %d", hcamcorder->dpm_handle, hcamcorder->dpm_camera_cb_id); /* remove camera policy changed callback */ @@ -769,7 +900,7 @@ int _mmcamcorder_destroy(MMHandleType handle) dpm_remove_policy_changed_cb(hcamcorder->dpm_handle, hcamcorder->dpm_camera_cb_id); hcamcorder->dpm_camera_cb_id = 0; } else { - _mmcam_dbg_warn("invalid dpm camera cb id %d", hcamcorder->dpm_camera_cb_id); + MMCAM_LOG_WARNING("invalid dpm camera cb id %d", hcamcorder->dpm_camera_cb_id); } dpm_manager_destroy(hcamcorder->dpm_handle); @@ -787,9 +918,9 @@ _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK: _ERR_CAMCORDER_CMD_PRECON: if (hcamcorder) - _mmcam_dbg_err("Destroy fail (type %d, state %d)", hcamcorder->type, state); + MMCAM_LOG_ERROR("Destroy fail (type %d, state %d)", hcamcorder->type, state); - _mmcam_dbg_err("Destroy fail (ret %x)", ret); + MMCAM_LOG_ERROR("Destroy fail (ret %x)", ret); return ret; } @@ -803,38 +934,27 @@ int _mmcamcorder_realize(MMHandleType handle) double motion_rate = _MMCAMCORDER_DEFAULT_RECORDING_MOTION_RATE; char *videosink_element_type = NULL; const char *videosink_name = NULL; - char *socket_path = NULL; - int socket_path_len = 0; int conn_size = 0; -#ifdef _MMCAMCORDER_RM_SUPPORT - int iret = RM_OK; - int preview_format = MM_PIXEL_FORMAT_NV12; - int qret = RM_OK; - int qret_avail = 0; /* 0: not available, 1: available */ - rm_consumer_info rci; - int app_pid = 0; - int resource_count = 0; -#endif /* _MMCAMCORDER_RM_SUPPORT */ mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - /*_mmcam_dbg_log("");*/ + /*MMCAM_LOG_INFO("");*/ if (!hcamcorder) { - _mmcam_dbg_err("Not initialized"); + MMCAM_LOG_ERROR("Not initialized"); ret = MM_ERROR_CAMCORDER_NOT_INITIALIZED; return ret; } if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) { - _mmcam_dbg_err("Another command is running."); + MMCAM_LOG_ERROR("Another command is running."); ret = MM_ERROR_CAMCORDER_CMD_IS_RUNNING; goto _ERR_CAMCORDER_CMD_PRECON; } state = _mmcamcorder_get_state(handle); if (state != MM_CAMCORDER_STATE_NULL) { - _mmcam_dbg_err("Wrong state(%d)", state); + MMCAM_LOG_ERROR("Wrong state(%d)", state); ret = MM_ERROR_CAMCORDER_INVALID_STATE; goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } @@ -846,12 +966,12 @@ int _mmcamcorder_realize(MMHandleType handle) NULL); if (!hcamcorder->gdbus_conn) { - _mmcam_dbg_err("gdbus connection NULL"); + MMCAM_LOG_ERROR("gdbus connection NULL"); ret = MM_ERROR_CAMCORDER_RESOURCE_CREATION; goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } - _mmcam_dbg_log("Profile mode [%d], gdbus connection [%p]", + MMCAM_LOG_INFO("Profile mode [%d], gdbus connection [%p]", hcamcorder->type, hcamcorder->gdbus_conn); mm_camcorder_get_attributes(handle, NULL, @@ -870,20 +990,19 @@ int _mmcamcorder_realize(MMHandleType handle) if (motion_rate != _MMCAMCORDER_DEFAULT_RECORDING_MOTION_RATE) hcamcorder->sub_context->is_modified_rate = TRUE; - _mmcamcorder_conf_get_value_int(handle, hcamcorder->conf_main, - CONFIGURE_CATEGORY_MAIN_CAPTURE, - "UseEncodebin", - &(hcamcorder->sub_context->bencbin_capture)); - _mmcam_dbg_warn("UseEncodebin [%d]", hcamcorder->sub_context->bencbin_capture); - if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) { - /* get dual stream support info */ + /* get video recording info */ _mmcamcorder_conf_get_value_int(handle, hcamcorder->conf_main, CONFIGURE_CATEGORY_MAIN_RECORD, "SupportDualStream", &(hcamcorder->sub_context->info_video->support_dual_stream)); + MMCAM_LOG_WARNING("SupportDualStream [%d]", hcamcorder->sub_context->info_video->support_dual_stream); - _mmcam_dbg_warn("SupportDualStream [%d]", hcamcorder->sub_context->info_video->support_dual_stream); + _mmcamcorder_conf_get_value_int(handle, hcamcorder->conf_main, + CONFIGURE_CATEGORY_MAIN_RECORD, + "UseVideoscale", + &(hcamcorder->sub_context->info_video->use_videoscale)); + MMCAM_LOG_WARNING("UseVideoscale [%d]", hcamcorder->sub_context->info_video->use_videoscale); } switch (display_surface_type) { @@ -899,17 +1018,6 @@ int _mmcamcorder_realize(MMHandleType handle) case MM_DISPLAY_SURFACE_NULL: videosink_element_type = strdup("VideosinkElementNull"); break; - case MM_DISPLAY_SURFACE_REMOTE: - mm_camcorder_get_attributes(handle, NULL, - MMCAM_DISPLAY_SOCKET_PATH, &socket_path, &socket_path_len, - NULL); - if (socket_path == NULL) { - _mmcam_dbg_warn("REMOTE surface, but socket path is NULL -> to NullSink"); - videosink_element_type = strdup("VideosinkElementNull"); - } else { - videosink_element_type = strdup("VideosinkElementRemote"); - } - break; default: videosink_element_type = strdup("VideosinkElementOverlay"); break; @@ -924,7 +1032,7 @@ int _mmcamcorder_realize(MMHandleType handle) free(videosink_element_type); videosink_element_type = NULL; } else { - _mmcam_dbg_warn("strdup failed(display_surface_type %d). Use default X type", + MMCAM_LOG_WARNING("strdup failed(display_surface_type %d). Use default Overlay type", display_surface_type); _mmcamcorder_conf_get_element(handle, hcamcorder->conf_main, @@ -934,7 +1042,7 @@ int _mmcamcorder_realize(MMHandleType handle) } _mmcamcorder_conf_get_value_element_name(hcamcorder->sub_context->VideosinkElement, &videosink_name); - _mmcam_dbg_log("Videosink name : %s", videosink_name); + MMCAM_LOG_INFO("Videosink name : %s", videosink_name); /* get videoconvert element */ _mmcamcorder_conf_get_element(handle, hcamcorder->conf_main, @@ -946,7 +1054,7 @@ int _mmcamcorder_realize(MMHandleType handle) CONFIGURE_CATEGORY_CTRL_CAPTURE, "SensorEncodedCapture", &(hcamcorder->sub_context->SensorEncodedCapture)); - _mmcam_dbg_log("Support sensor encoded capture : %d", hcamcorder->sub_context->SensorEncodedCapture); + MMCAM_LOG_INFO("Support sensor encoded capture : %d", hcamcorder->sub_context->SensorEncodedCapture); if (hcamcorder->type == MM_CAMCORDER_MODE_VIDEO_CAPTURE) { int dpm_camera_state = DPM_ALLOWED; @@ -954,9 +1062,9 @@ int _mmcamcorder_realize(MMHandleType handle) /* check camera policy from DPM */ if (hcamcorder->dpm_handle) { if (dpm_restriction_get_camera_state(hcamcorder->dpm_handle, &dpm_camera_state) == DPM_ERROR_NONE) { - _mmcam_dbg_log("DPM camera state %d", dpm_camera_state); + MMCAM_LOG_INFO("DPM camera state %d", dpm_camera_state); if (dpm_camera_state == DPM_DISALLOWED) { - _mmcam_dbg_err("CAMERA DISALLOWED by DPM"); + MMCAM_LOG_ERROR("CAMERA DISALLOWED by DPM"); ret = MM_ERROR_POLICY_RESTRICTED; _mmcamcorder_request_dpm_popup(hcamcorder->gdbus_conn, "camera"); @@ -964,10 +1072,10 @@ int _mmcamcorder_realize(MMHandleType handle) goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } } else { - _mmcam_dbg_err("get DPM camera state failed, keep going..."); + MMCAM_LOG_ERROR("get DPM camera state failed, keep going..."); } } else { - _mmcam_dbg_warn("NULL dpm_handle"); + MMCAM_LOG_WARNING("NULL dpm_handle"); } #ifdef _MMCAMCORDER_MM_RM_SUPPORT @@ -979,13 +1087,13 @@ int _mmcamcorder_realize(MMHandleType handle) 1, &hcamcorder->camera_resource); if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) { - _mmcam_dbg_err("could not prepare for camera resource"); + MMCAM_LOG_ERROR("could not prepare for camera resource"); ret = MM_ERROR_RESOURCE_INTERNAL; _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } } else { - _mmcam_dbg_log("camera already acquired"); + MMCAM_LOG_INFO("camera already acquired"); } /* prepare resource manager for "video_overlay only if display surface is X" */ @@ -996,20 +1104,20 @@ int _mmcamcorder_realize(MMHandleType handle) MM_RESOURCE_MANAGER_RES_VOLUME_FULL, &hcamcorder->video_overlay_resource); if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) { - _mmcam_dbg_err("could not prepare for overlay resource"); + MMCAM_LOG_ERROR("could not prepare for overlay resource"); ret = MM_ERROR_RESOURCE_INTERNAL; _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } } else { - _mmcam_dbg_log("overlay already acquired"); + MMCAM_LOG_INFO("overlay already acquired"); } } /* acquire resources */ ret = mm_resource_manager_commit(hcamcorder->resource_manager); if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) { - _mmcam_dbg_err("could not acquire resources"); + MMCAM_LOG_ERROR("could not acquire resources"); ret = MM_ERROR_RESOURCE_INTERNAL; _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; @@ -1018,84 +1126,16 @@ int _mmcamcorder_realize(MMHandleType handle) #endif /* _MMCAMCORDER_MM_RM_SUPPORT */ #ifdef _MMCAMCORDER_RM_SUPPORT - if (display_surface_type != MM_DISPLAY_SURFACE_NULL) { - mm_camcorder_get_attributes(handle, NULL, - MMCAM_CLIENT_PID, &app_pid, - NULL); - rci.app_pid = app_pid; - aul_app_get_appid_bypid(rci.app_pid, rci.app_id, sizeof(rci.app_id)); - - /* RM register */ - if (hcamcorder->rm_handle == 0) { - iret = rm_register((rm_resource_cb)_mmcamcorder_rm_callback, (void*)hcamcorder, &(hcamcorder->rm_handle), &rci); - if (iret != RM_OK) { - _mmcam_dbg_err("rm_register fail"); - ret = MM_ERROR_RESOURCE_INTERNAL; - goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; - } - } - - mm_camcorder_get_attributes(handle, NULL, - MMCAM_CAMERA_FORMAT, &preview_format, - NULL); - - resource_count = 0; - memset(&hcamcorder->request_resources, 0x0, sizeof(rm_category_request_s)); - memset(&hcamcorder->returned_devices, 0x0, sizeof(rm_device_return_s)); - - if (preview_format == MM_PIXEL_FORMAT_ENCODED_H264) { - hcamcorder->request_resources.state[resource_count] = RM_STATE_EXCLUSIVE; - hcamcorder->request_resources.category_id[resource_count] = RM_CATEGORY_VIDEO_DECODER; - - _mmcam_dbg_log("request dec rsc - category 0x%x", RM_CATEGORY_VIDEO_DECODER); - - resource_count++; - } - - if (display_surface_type == MM_DISPLAY_SURFACE_OVERLAY) { - hcamcorder->request_resources.state[resource_count] = RM_STATE_EXCLUSIVE; - hcamcorder->request_resources.category_id[resource_count] = RM_CATEGORY_SCALER; - - _mmcam_dbg_log("request scaler rsc - category 0x%x", RM_CATEGORY_SCALER); - - resource_count++; - } - - hcamcorder->request_resources.request_num = resource_count; - - if (resource_count > 0) { - qret = rm_query(hcamcorder->rm_handle, RM_QUERY_ALLOCATION, &(hcamcorder->request_resources), &qret_avail); - if (qret != RM_OK || qret_avail != 1) { - _mmcam_dbg_log("rm query failed. retry with sub devices"); - - resource_count = 0; - - if (preview_format == MM_PIXEL_FORMAT_ENCODED_H264) { - hcamcorder->request_resources.category_id[resource_count] = RM_CATEGORY_VIDEO_DECODER_SUB; - _mmcam_dbg_log("request dec rsc - category 0x%x", RM_CATEGORY_VIDEO_DECODER_SUB); - resource_count++; - } - - if (display_surface_type == MM_DISPLAY_SURFACE_OVERLAY) { - hcamcorder->request_resources.category_id[resource_count] = RM_CATEGORY_SCALER_SUB; - _mmcam_dbg_log("request scaler rsc - category 0x%x", RM_CATEGORY_SCALER_SUB); - resource_count++; - } - } - } - - hcamcorder->request_resources.state[resource_count] = RM_STATE_EXCLUSIVE; - hcamcorder->request_resources.category_id[resource_count] = RM_CATEGORY_CAMERA; - - hcamcorder->request_resources.request_num = resource_count + 1; - _mmcam_dbg_log("request camera rsc - category 0x%x", RM_CATEGORY_CAMERA); - - iret = rm_allocate_resources(hcamcorder->rm_handle, &(hcamcorder->request_resources), &hcamcorder->returned_devices); - if (iret != RM_OK) { - _mmcam_dbg_err("Resource allocation request failed"); - ret = MM_ERROR_RESOURCE_INTERNAL; - goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; - } + ret = _mmcamcorder_rm_create(handle); + if (ret != MM_ERROR_NONE) { + MMCAM_LOG_ERROR("Resource create failed"); + goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; + } + ret = _mmcamcorder_rm_allocate(handle); + if (ret != MM_ERROR_NONE) { + MMCAM_LOG_ERROR("Resource allocation request failed"); + _mmcamcorder_rm_release(handle); + goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } #endif /* _MMCAMCORDER_RM_SUPPORT */ } @@ -1111,7 +1151,7 @@ int _mmcamcorder_realize(MMHandleType handle) /* check internal error of gstreamer */ if (hcamcorder->error_code != MM_ERROR_NONE) { ret = hcamcorder->error_code; - _mmcam_dbg_log("gstreamer error is occurred. return it %x", ret); + MMCAM_LOG_INFO("gstreamer error is occurred. return it %x", ret); } /* release sub context */ @@ -1155,33 +1195,15 @@ _ERR_CAMCORDER_CMD: _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); #endif /* _MMCAMCORDER_MM_RM_SUPPORT */ #ifdef _MMCAMCORDER_RM_SUPPORT - if (hcamcorder->rm_handle) { - if (hcamcorder->returned_devices.allocated_num > 0) { - int idx = 0; - rm_device_request_s requested; - memset(&requested, 0x0, sizeof(rm_device_request_s)); - requested.request_num = hcamcorder->returned_devices.allocated_num; - for (idx = 0; idx < requested.request_num; idx++) - requested.device_id[idx] = hcamcorder->returned_devices.device_id[idx]; - - iret = rm_deallocate_resources(hcamcorder->rm_handle, &requested); - if (iret != RM_OK) - _mmcam_dbg_err("Resource deallocation request failed "); - } - - /* unregister RM */ - int ires = rm_unregister(hcamcorder->rm_handle); - if (ires != RM_OK) - _mmcam_dbg_err("rm_unregister() failed"); - hcamcorder->rm_handle = 0; - } + _mmcamcorder_rm_deallocate(handle); + _mmcamcorder_rm_release(handle); #endif /* _MMCAMCORDER_RM_SUPPORT*/ _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK: _MMCAMCORDER_UNLOCK_CMD(hcamcorder); _ERR_CAMCORDER_CMD_PRECON: - _mmcam_dbg_err("Realize fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret); + MMCAM_LOG_ERROR("Realize fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret); return ret; } @@ -1194,23 +1216,23 @@ int _mmcamcorder_unrealize(MMHandleType handle) mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); if (!hcamcorder) { - _mmcam_dbg_err("Not initialized"); + MMCAM_LOG_ERROR("Not initialized"); ret = MM_ERROR_CAMCORDER_NOT_INITIALIZED; return ret; } if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) { - _mmcam_dbg_err("Another command is running."); + MMCAM_LOG_ERROR("Another command is running."); ret = MM_ERROR_CAMCORDER_CMD_IS_RUNNING; goto _ERR_CAMCORDER_CMD_PRECON; } state = _mmcamcorder_get_state(handle); if (state != MM_CAMCORDER_STATE_READY) { - _mmcam_dbg_err("Wrong state(%d)", state); + MMCAM_LOG_ERROR("Wrong state(%d)", state); ret = MM_ERROR_CAMCORDER_INVALID_STATE; goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } @@ -1226,7 +1248,7 @@ int _mmcamcorder_unrealize(MMHandleType handle) #ifdef _MMCAMCORDER_MM_RM_SUPPORT _MMCAMCORDER_LOCK_RESOURCE(hcamcorder); - _mmcam_dbg_warn("lock resource - cb calling %d", hcamcorder->is_release_cb_calling); + MMCAM_LOG_WARNING("lock resource - cb calling %d", hcamcorder->is_release_cb_calling); if (hcamcorder->type == MM_CAMCORDER_MODE_VIDEO_CAPTURE && hcamcorder->state_change_by_system != _MMCAMCORDER_STATE_CHANGE_BY_RM && @@ -1237,10 +1259,10 @@ int _mmcamcorder_unrealize(MMHandleType handle) ret = mm_resource_manager_mark_for_release(hcamcorder->resource_manager, hcamcorder->camera_resource); if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) { - _mmcam_dbg_err("could not mark camera resource for release"); + MMCAM_LOG_ERROR("could not mark camera resource for release"); ret = MM_ERROR_CAMCORDER_INTERNAL; _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); - _mmcam_dbg_log("unlock resource"); + MMCAM_LOG_INFO("unlock resource"); goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } } @@ -1249,10 +1271,10 @@ int _mmcamcorder_unrealize(MMHandleType handle) ret = mm_resource_manager_mark_for_release(hcamcorder->resource_manager, hcamcorder->video_overlay_resource); if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) { - _mmcam_dbg_err("could not mark overlay resource for release"); + MMCAM_LOG_ERROR("could not mark overlay resource for release"); ret = MM_ERROR_CAMCORDER_INTERNAL; _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); - _mmcam_dbg_log("unlock resource"); + MMCAM_LOG_INFO("unlock resource"); goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } } @@ -1260,11 +1282,11 @@ int _mmcamcorder_unrealize(MMHandleType handle) ret = mm_resource_manager_commit(hcamcorder->resource_manager); if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) { - _mmcam_dbg_err("failed to release resource, ret(0x%x)", ret); + MMCAM_LOG_ERROR("failed to release resource, ret(0x%x)", ret); ret = MM_ERROR_CAMCORDER_INTERNAL; _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); - _mmcam_dbg_log("unlock resource"); + MMCAM_LOG_INFO("unlock resource"); goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } else { @@ -1277,23 +1299,11 @@ int _mmcamcorder_unrealize(MMHandleType handle) _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); - _mmcam_dbg_warn("unlock resource"); + MMCAM_LOG_WARNING("unlock resource"); #endif /* _MMCAMCORDER_MM_RM_SUPPORT */ #ifdef _MMCAMCORDER_RM_SUPPORT - if (hcamcorder->rm_handle && (hcamcorder->returned_devices.allocated_num > 0)) { - int iret = RM_OK; - int idx = 0; - rm_device_request_s requested; - memset(&requested, 0x0, sizeof(rm_device_request_s)); - requested.request_num = hcamcorder->returned_devices.allocated_num; - for (idx = 0; idx < requested.request_num; idx++) - requested.device_id[idx] = hcamcorder->returned_devices.device_id[idx]; - - iret = rm_deallocate_resources(hcamcorder->rm_handle, &requested); - if (iret != RM_OK) - _mmcam_dbg_err("Resource deallocation request failed "); - } + _mmcamcorder_rm_deallocate(handle); #endif /* _MMCAMCORDER_RM_SUPPORT*/ /* Deinitialize main context member */ @@ -1310,7 +1320,7 @@ _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK: _ERR_CAMCORDER_CMD_PRECON: /* send message */ - _mmcam_dbg_err("Unrealize fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret); + MMCAM_LOG_ERROR("Unrealize fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret); return ret; } @@ -1323,10 +1333,10 @@ int _mmcamcorder_start(MMHandleType handle) _MMCamcorderSubContext *sc = NULL; mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); if (!hcamcorder) { - _mmcam_dbg_err("Not initialized"); + MMCAM_LOG_ERROR("Not initialized"); ret = MM_ERROR_CAMCORDER_NOT_INITIALIZED; return ret; } @@ -1335,14 +1345,14 @@ int _mmcamcorder_start(MMHandleType handle) mmf_return_val_if_fail(sc, MM_ERROR_CAMCORDER_NOT_INITIALIZED); if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) { - _mmcam_dbg_err("Another command is running."); + MMCAM_LOG_ERROR("Another command is running."); ret = MM_ERROR_CAMCORDER_CMD_IS_RUNNING; goto _ERR_CAMCORDER_CMD_PRECON; } state = _mmcamcorder_get_state(handle); if (state != MM_CAMCORDER_STATE_READY) { - _mmcam_dbg_err("Wrong state(%d)", state); + MMCAM_LOG_ERROR("Wrong state(%d)", state); ret = MM_ERROR_CAMCORDER_INVALID_STATE; goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } @@ -1359,7 +1369,7 @@ int _mmcamcorder_start(MMHandleType handle) /* check internal error of gstreamer */ if (hcamcorder->error_code != MM_ERROR_NONE) { ret = hcamcorder->error_code; - _mmcam_dbg_log("gstreamer error is occurred. return it %x", ret); + MMCAM_LOG_INFO("gstreamer error is occurred. return it %x", ret); } goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } @@ -1383,10 +1393,10 @@ _ERR_CAMCORDER_CMD_PRECON: ret = hcamcorder->error_code; hcamcorder->error_code = MM_ERROR_NONE; - _mmcam_dbg_log("gstreamer error is occurred. return it %x", ret); + MMCAM_LOG_INFO("gstreamer error is occurred. return it %x", ret); } - _mmcam_dbg_err("Start fail (type %d, state %d, ret %x)", + MMCAM_LOG_ERROR("Start fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret); return ret; @@ -1399,23 +1409,23 @@ int _mmcamcorder_stop(MMHandleType handle) mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); if (!hcamcorder) { - _mmcam_dbg_err("Not initialized"); + MMCAM_LOG_ERROR("Not initialized"); ret = MM_ERROR_CAMCORDER_NOT_INITIALIZED; return ret; } if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) { - _mmcam_dbg_err("Another command is running."); + MMCAM_LOG_ERROR("Another command is running."); ret = MM_ERROR_CAMCORDER_CMD_IS_RUNNING; goto _ERR_CAMCORDER_CMD_PRECON; } state = _mmcamcorder_get_state(handle); if (state != MM_CAMCORDER_STATE_PREPARE) { - _mmcam_dbg_err("Wrong state(%d)", state); + MMCAM_LOG_ERROR("Wrong state(%d)", state); ret = MM_ERROR_CAMCORDER_INVALID_STATE; goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } @@ -1426,23 +1436,6 @@ int _mmcamcorder_stop(MMHandleType handle) _mmcamcorder_set_state(handle, MM_CAMCORDER_STATE_READY); - if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) { - /* unsubscribe remained unsubscribed signal */ - g_mutex_lock(&hcamcorder->gdbus_info_sound.sync_mutex); - if (hcamcorder->gdbus_info_sound.subscribe_id > 0) { - _mmcam_dbg_warn("subscribe_id[%u] is remained. remove it.", hcamcorder->gdbus_info_sound.subscribe_id); - g_dbus_connection_signal_unsubscribe(hcamcorder->gdbus_conn, hcamcorder->gdbus_info_sound.subscribe_id); - } - g_mutex_unlock(&hcamcorder->gdbus_info_sound.sync_mutex); - - g_mutex_lock(&hcamcorder->gdbus_info_solo_sound.sync_mutex); - if (hcamcorder->gdbus_info_solo_sound.subscribe_id > 0) { - _mmcam_dbg_warn("subscribe_id[%u] is remained. remove it.", hcamcorder->gdbus_info_solo_sound.subscribe_id); - g_dbus_connection_signal_unsubscribe(hcamcorder->gdbus_conn, hcamcorder->gdbus_info_solo_sound.subscribe_id); - } - g_mutex_unlock(&hcamcorder->gdbus_info_solo_sound.sync_mutex); - } - _MMCAMCORDER_UNLOCK_CMD(hcamcorder); return MM_ERROR_NONE; @@ -1452,7 +1445,7 @@ _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK: _ERR_CAMCORDER_CMD_PRECON: /* send message */ - _mmcam_dbg_err("Stop fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret); + MMCAM_LOG_ERROR("Stop fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret); return ret; } @@ -1468,23 +1461,23 @@ int _mmcamcorder_capture_start(MMHandleType handle) mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); if (!hcamcorder) { - _mmcam_dbg_err("Not initialized"); + MMCAM_LOG_ERROR("Not initialized"); ret = MM_ERROR_CAMCORDER_NOT_INITIALIZED; return ret; } if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) { - _mmcam_dbg_err("Another command is running."); + MMCAM_LOG_ERROR("Another command is running."); ret = MM_ERROR_CAMCORDER_CMD_IS_RUNNING; goto _ERR_CAMCORDER_CMD_PRECON; } state = _mmcamcorder_get_state(handle); if (state != state_FROM_0 && state != state_FROM_1 && state != state_FROM_2) { - _mmcam_dbg_err("Wrong state(%d)", state); + MMCAM_LOG_ERROR("Wrong state(%d)", state); ret = MM_ERROR_CAMCORDER_INVALID_STATE; goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } @@ -1492,7 +1485,7 @@ int _mmcamcorder_capture_start(MMHandleType handle) /* Handle capture in recording case */ if (state == state_FROM_1 || state == state_FROM_2) { if (hcamcorder->capture_in_recording == TRUE) { - _mmcam_dbg_err("Capturing in recording (%d)", state); + MMCAM_LOG_ERROR("Capturing in recording (%d)", state); ret = MM_ERROR_CAMCORDER_DEVICE_BUSY; goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } else { @@ -1500,11 +1493,11 @@ int _mmcamcorder_capture_start(MMHandleType handle) if (hcamcorder->task_thread_state == _MMCAMCORDER_TASK_THREAD_STATE_NONE) { hcamcorder->capture_in_recording = TRUE; hcamcorder->task_thread_state = _MMCAMCORDER_TASK_THREAD_STATE_CHECK_CAPTURE_IN_RECORDING; - _mmcam_dbg_log("send signal for capture in recording"); + MMCAM_LOG_INFO("send signal for capture in recording"); g_cond_signal(&hcamcorder->task_thread_cond); g_mutex_unlock(&hcamcorder->task_thread_lock); } else { - _mmcam_dbg_err("task thread busy : %d", hcamcorder->task_thread_state); + MMCAM_LOG_ERROR("task thread busy : %d", hcamcorder->task_thread_state); g_mutex_unlock(&hcamcorder->task_thread_lock); ret = MM_ERROR_CAMCORDER_INVALID_STATE; goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; @@ -1524,7 +1517,7 @@ int _mmcamcorder_capture_start(MMHandleType handle) /* Init break continuous shot attr */ if (mm_camcorder_set_attributes(handle, NULL, MMCAM_CAPTURE_BREAK_CONTINUOUS_SHOT, 0, NULL) != MM_ERROR_NONE) - _mmcam_dbg_warn("capture-break-cont-shot set 0 failed"); + MMCAM_LOG_WARNING("capture-break-cont-shot set 0 failed"); return MM_ERROR_NONE; @@ -1537,7 +1530,7 @@ _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK: _ERR_CAMCORDER_CMD_PRECON: /* send message */ - _mmcam_dbg_err("Capture start fail (type %d, state %d, ret %x)", + MMCAM_LOG_ERROR("Capture start fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret); return ret; @@ -1549,23 +1542,23 @@ int _mmcamcorder_capture_stop(MMHandleType handle) int state = MM_CAMCORDER_STATE_NONE; mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); if (!hcamcorder) { - _mmcam_dbg_err("Not initialized"); + MMCAM_LOG_ERROR("Not initialized"); ret = MM_ERROR_CAMCORDER_NOT_INITIALIZED; return ret; } if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) { - _mmcam_dbg_err("Another command is running."); + MMCAM_LOG_ERROR("Another command is running."); ret = MM_ERROR_CAMCORDER_CMD_IS_RUNNING; goto _ERR_CAMCORDER_CMD_PRECON; } state = _mmcamcorder_get_state(handle); if (state != MM_CAMCORDER_STATE_CAPTURING) { - _mmcam_dbg_err("Wrong state(%d)", state); + MMCAM_LOG_ERROR("Wrong state(%d)", state); ret = MM_ERROR_CAMCORDER_INVALID_STATE; goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } @@ -1585,7 +1578,7 @@ _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK: _ERR_CAMCORDER_CMD_PRECON: /* send message */ - _mmcam_dbg_err("Capture stop fail (type %d, state %d, ret %x)", + MMCAM_LOG_ERROR("Capture stop fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret); return ret; @@ -1600,10 +1593,10 @@ int _mmcamcorder_record(MMHandleType handle) mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); _MMCamcorderSubContext *sc = NULL; - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); if (!hcamcorder || !MMF_CAMCORDER_SUBCONTEXT(hcamcorder)) { - _mmcam_dbg_err("Not initialized"); + MMCAM_LOG_ERROR("Not initialized"); ret = MM_ERROR_CAMCORDER_NOT_INITIALIZED; return ret; } @@ -1611,14 +1604,14 @@ int _mmcamcorder_record(MMHandleType handle) sc = MMF_CAMCORDER_SUBCONTEXT(handle); if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) { - _mmcam_dbg_err("Another command is running."); + MMCAM_LOG_ERROR("Another command is running."); ret = MM_ERROR_CAMCORDER_CMD_IS_RUNNING; goto _ERR_CAMCORDER_CMD_PRECON; } state = _mmcamcorder_get_state(handle); if (state != MM_CAMCORDER_STATE_PREPARE && state != MM_CAMCORDER_STATE_PAUSED) { - _mmcam_dbg_err("Wrong state(%d)", state); + MMCAM_LOG_ERROR("Wrong state(%d)", state); ret = MM_ERROR_CAMCORDER_INVALID_STATE; goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } @@ -1636,9 +1629,9 @@ int _mmcamcorder_record(MMHandleType handle) /* check mic policy from DPM */ if (hcamcorder->dpm_handle && sc->audio_disable == FALSE) { if (dpm_restriction_get_microphone_state(hcamcorder->dpm_handle, &dpm_mic_state) == DPM_ERROR_NONE) { - _mmcam_dbg_log("DPM mic state %d", dpm_mic_state); + MMCAM_LOG_INFO("DPM mic state %d", dpm_mic_state); if (dpm_mic_state == DPM_DISALLOWED) { - _mmcam_dbg_err("MIC DISALLOWED by DPM"); + MMCAM_LOG_ERROR("MIC DISALLOWED by DPM"); ret = MM_ERROR_COMMON_INVALID_PERMISSION; _mmcamcorder_request_dpm_popup(hcamcorder->gdbus_conn, "microphone"); @@ -1646,10 +1639,10 @@ int _mmcamcorder_record(MMHandleType handle) goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } } else { - _mmcam_dbg_err("get DPM mic state failed, keep going..."); + MMCAM_LOG_ERROR("get DPM mic state failed, keep going..."); } } else { - _mmcam_dbg_warn("skip dpm check - handle %p, audio disable %d", + MMCAM_LOG_WARNING("skip dpm check - handle %p, audio disable %d", hcamcorder->dpm_handle, sc->audio_disable); } @@ -1658,7 +1651,7 @@ int _mmcamcorder_record(MMHandleType handle) /* check internal error of gstreamer */ if (hcamcorder->error_code != MM_ERROR_NONE) { ret = hcamcorder->error_code; - _mmcam_dbg_log("gstreamer error is occurred. return it %x", ret); + MMCAM_LOG_INFO("gstreamer error is occurred. return it %x", ret); } goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } @@ -1678,10 +1671,10 @@ _ERR_CAMCORDER_CMD_PRECON: ret = hcamcorder->error_code; hcamcorder->error_code = MM_ERROR_NONE; - _mmcam_dbg_log("gstreamer error is occurred. return it %x", ret); + MMCAM_LOG_INFO("gstreamer error is occurred. return it %x", ret); } - _mmcam_dbg_err("Record fail (type %d, state %d, ret %x)", + MMCAM_LOG_ERROR("Record fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret); return ret; @@ -1695,23 +1688,23 @@ int _mmcamcorder_pause(MMHandleType handle) mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); if (!hcamcorder) { - _mmcam_dbg_err("Not initialized"); + MMCAM_LOG_ERROR("Not initialized"); ret = MM_ERROR_CAMCORDER_NOT_INITIALIZED; return ret; } if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) { - _mmcam_dbg_err("Another command is running."); + MMCAM_LOG_ERROR("Another command is running."); ret = MM_ERROR_CAMCORDER_CMD_IS_RUNNING; goto _ERR_CAMCORDER_CMD_PRECON; } state = _mmcamcorder_get_state(handle); if (state != MM_CAMCORDER_STATE_RECORDING) { - _mmcam_dbg_err("Wrong state(%d)", state); + MMCAM_LOG_ERROR("Wrong state(%d)", state); ret = MM_ERROR_CAMCORDER_INVALID_STATE; goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } @@ -1731,7 +1724,7 @@ _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK: _ERR_CAMCORDER_CMD_PRECON: /* send message */ - _mmcam_dbg_err("Pause fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret); + MMCAM_LOG_ERROR("Pause fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret); return ret; } @@ -1744,23 +1737,23 @@ int _mmcamcorder_commit(MMHandleType handle) mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); if (!hcamcorder) { - _mmcam_dbg_err("Not initialized"); + MMCAM_LOG_ERROR("Not initialized"); ret = MM_ERROR_CAMCORDER_NOT_INITIALIZED; return ret; } if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) { - _mmcam_dbg_err("Another command is running."); + MMCAM_LOG_ERROR("Another command is running."); ret = MM_ERROR_CAMCORDER_CMD_IS_RUNNING; goto _ERR_CAMCORDER_CMD_PRECON; } state = _mmcamcorder_get_state(handle); if (state != MM_CAMCORDER_STATE_RECORDING && state != MM_CAMCORDER_STATE_PAUSED) { - _mmcam_dbg_err("Wrong state(%d)", state); + MMCAM_LOG_ERROR("Wrong state(%d)", state); ret = MM_ERROR_CAMCORDER_INVALID_STATE; goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } @@ -1783,7 +1776,7 @@ _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK: _ERR_CAMCORDER_CMD_PRECON: /* send message */ - _mmcam_dbg_err("Commit fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret); + MMCAM_LOG_ERROR("Commit fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret); return ret; } @@ -1796,23 +1789,23 @@ int _mmcamcorder_cancel(MMHandleType handle) mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); if (!hcamcorder) { - _mmcam_dbg_err("Not initialized"); + MMCAM_LOG_ERROR("Not initialized"); ret = MM_ERROR_CAMCORDER_NOT_INITIALIZED; return ret; } if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) { - _mmcam_dbg_err("Another command is running."); + MMCAM_LOG_ERROR("Another command is running."); ret = MM_ERROR_CAMCORDER_CMD_IS_RUNNING; goto _ERR_CAMCORDER_CMD_PRECON; } state = _mmcamcorder_get_state(handle); if (state != MM_CAMCORDER_STATE_RECORDING && state != MM_CAMCORDER_STATE_PAUSED) { - _mmcam_dbg_err("Wrong state(%d)", state); + MMCAM_LOG_ERROR("Wrong state(%d)", state); ret = MM_ERROR_CAMCORDER_INVALID_STATE; goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } @@ -1832,7 +1825,7 @@ _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK: _ERR_CAMCORDER_CMD_PRECON: /* send message */ - _mmcam_dbg_err("Cancel fail (type %d, state %d, ret %x)", + MMCAM_LOG_ERROR("Cancel fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret); return ret; @@ -1842,9 +1835,9 @@ _ERR_CAMCORDER_CMD_PRECON: int _mmcamcorder_commit_async_end(MMHandleType handle) { - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); - _mmcam_dbg_warn("_mmcamcorder_commit_async_end : MM_CAMCORDER_STATE_PREPARE"); + MMCAM_LOG_WARNING("_mmcamcorder_commit_async_end : MM_CAMCORDER_STATE_PREPARE"); _mmcamcorder_set_state(handle, MM_CAMCORDER_STATE_PREPARE); return MM_ERROR_NONE; @@ -1855,15 +1848,15 @@ int _mmcamcorder_set_message_callback(MMHandleType handle, MMMessageCallback cal { mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - _mmcam_dbg_log("%p", hcamcorder); + MMCAM_LOG_INFO("%p", hcamcorder); mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); if (callback == NULL) - _mmcam_dbg_warn("Message Callback is disabled, because application sets it to NULL"); + MMCAM_LOG_WARNING("Message Callback is disabled, because application sets it to NULL"); if (!_MMCAMCORDER_TRYLOCK_MESSAGE_CALLBACK(hcamcorder)) { - _mmcam_dbg_warn("Application's message callback is running now"); + MMCAM_LOG_WARNING("Application's message callback is running now"); return MM_ERROR_CAMCORDER_INVALID_CONDITION; } @@ -1881,13 +1874,10 @@ int _mmcamcorder_set_video_stream_callback(MMHandleType handle, mm_camcorder_vid { mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - /*_mmcam_dbg_log("");*/ + /*MMCAM_LOG_INFO("");*/ mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); - if (callback == NULL) - _mmcam_dbg_warn("Video Stream Callback is disabled, because application sets it to NULL"); - _MMCAMCORDER_LOCK_VSTREAM_CALLBACK(hcamcorder); hcamcorder->vstream_cb = callback; @@ -1903,15 +1893,15 @@ int _mmcamcorder_set_audio_stream_callback(MMHandleType handle, mm_camcorder_aud { mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); if (callback == NULL) - _mmcam_dbg_warn("Audio Stream Callback is disabled, because application sets it to NULL"); + MMCAM_LOG_WARNING("Audio Stream Callback is disabled, because application sets it to NULL"); if (!_MMCAMCORDER_TRYLOCK_ASTREAM_CALLBACK(hcamcorder)) { - _mmcam_dbg_warn("Application's audio stream callback is running now"); + MMCAM_LOG_WARNING("Application's audio stream callback is running now"); return MM_ERROR_CAMCORDER_INVALID_CONDITION; } @@ -1928,15 +1918,15 @@ int _mmcamcorder_set_muxed_stream_callback(MMHandleType handle, mm_camcorder_mux { mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); if (callback == NULL) - _mmcam_dbg_warn("Muxed Stream Callback is disabled, because application sets it to NULL"); + MMCAM_LOG_WARNING("Muxed Stream Callback is disabled, because application sets it to NULL"); if (!_MMCAMCORDER_TRYLOCK_MSTREAM_CALLBACK(hcamcorder)) { - _mmcam_dbg_warn("Application's muxed stream callback is running now"); + MMCAM_LOG_WARNING("Application's muxed stream callback is running now"); return MM_ERROR_CAMCORDER_INVALID_CONDITION; } @@ -1953,15 +1943,15 @@ int _mmcamcorder_set_video_capture_callback(MMHandleType handle, mm_camcorder_vi { mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); if (callback == NULL) - _mmcam_dbg_warn("Video Capture Callback is disabled, because application sets it to NULLL"); + MMCAM_LOG_WARNING("Video Capture Callback is disabled, because application sets it to NULLL"); if (!_MMCAMCORDER_TRYLOCK_VCAPTURE_CALLBACK(hcamcorder)) { - _mmcam_dbg_warn("Application's video capture callback is running now"); + MMCAM_LOG_WARNING("Application's video capture callback is running now"); return MM_ERROR_CAMCORDER_INVALID_CONDITION; } @@ -1973,11 +1963,37 @@ int _mmcamcorder_set_video_capture_callback(MMHandleType handle, mm_camcorder_vi return MM_ERROR_NONE; } + +int _mmcamcorder_set_video_encode_decision_callback(MMHandleType handle, mm_camcorder_video_encode_decision_callback callback, void *user_data) +{ + mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); + + MMCAM_LOG_INFO(""); + + mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); + + if (callback == NULL) + MMCAM_LOG_WARNING("Video Encode Decision Callback is disabled, because application sets it to NULL"); + + if (!_MMCAMCORDER_TRYLOCK_VEDECISION_CALLBACK(hcamcorder)) { + MMCAM_LOG_WARNING("Application's video encode decision callback is running now"); + return MM_ERROR_CAMCORDER_INVALID_CONDITION; + } + + hcamcorder->vedecision_cb = callback; + hcamcorder->vedecision_cb_param = user_data; + + _MMCAMCORDER_UNLOCK_VEDECISION_CALLBACK(hcamcorder); + + return MM_ERROR_NONE; +} + + int _mmcamcorder_get_current_state(MMHandleType handle) { mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); @@ -1998,7 +2014,7 @@ int _mmcamcorder_init_focusing(MMHandleType handle) _MMCamcorderSubContext *sc = NULL; GstCameraControl *control = NULL; - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); hcamcorder = MMF_CAMCORDER(handle); mmf_return_val_if_fail(handle, MM_ERROR_CAMCORDER_NOT_INITIALIZED); @@ -2007,7 +2023,7 @@ int _mmcamcorder_init_focusing(MMHandleType handle) mmf_return_val_if_fail(sc, MM_ERROR_CAMCORDER_NOT_INITIALIZED); if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) { - _mmcam_dbg_err("Another command is running."); + MMCAM_LOG_ERROR("Another command is running."); return MM_ERROR_CAMCORDER_CMD_IS_RUNNING; } @@ -2015,27 +2031,27 @@ int _mmcamcorder_init_focusing(MMHandleType handle) if (state == MM_CAMCORDER_STATE_CAPTURING || state < MM_CAMCORDER_STATE_PREPARE) { - _mmcam_dbg_err("Not proper state. state[%d]", state); + MMCAM_LOG_ERROR("Not proper state. state[%d]", state); _MMCAMCORDER_UNLOCK_CMD(hcamcorder); return MM_ERROR_CAMCORDER_INVALID_STATE; } if (!GST_IS_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst)) { - _mmcam_dbg_log("Can't cast Video source into camera control."); + MMCAM_LOG_INFO("Can't cast Video source into camera control."); _MMCAMCORDER_UNLOCK_CMD(hcamcorder); return MM_ERROR_NONE; } control = GST_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst); if (control == NULL) { - _mmcam_dbg_err("cast CAMERA_CONTROL failed"); + MMCAM_LOG_ERROR("cast CAMERA_CONTROL failed"); _MMCAMCORDER_UNLOCK_CMD(hcamcorder); return MM_ERROR_CAMCORDER_INTERNAL; } ret = gst_camera_control_stop_auto_focus(control); if (!ret) { - _mmcam_dbg_err("Auto focusing stop fail."); + MMCAM_LOG_ERROR("Auto focusing stop fail."); _MMCAMCORDER_UNLOCK_CMD(hcamcorder); return MM_ERROR_CAMCORDER_DEVICE_IO; } @@ -2053,17 +2069,17 @@ int _mmcamcorder_init_focusing(MMHandleType handle) if (current_focus_mode != sensor_focus_mode || current_af_range != sensor_af_range) { ret = gst_camera_control_set_focus(control, sensor_focus_mode, sensor_af_range); } else { - _mmcam_dbg_log("No need to init FOCUS [mode:%d, range:%d]", focus_mode, af_range); + MMCAM_LOG_INFO("No need to init FOCUS [mode:%d, range:%d]", focus_mode, af_range); ret = TRUE; } _MMCAMCORDER_UNLOCK_CMD(hcamcorder); if (ret) { - _mmcam_dbg_log("Lens init success."); + MMCAM_LOG_INFO("Lens init success."); return MM_ERROR_NONE; } else { - _mmcam_dbg_err("Lens init fail."); + MMCAM_LOG_ERROR("Lens init fail."); return MM_ERROR_CAMCORDER_DEVICE_IO; } } @@ -2078,16 +2094,16 @@ int _mmcamcorder_adjust_focus(MMHandleType handle, int direction) mmf_return_val_if_fail(handle, MM_ERROR_CAMCORDER_NOT_INITIALIZED); mmf_return_val_if_fail(direction, MM_ERROR_CAMCORDER_INVALID_ARGUMENT); - /*_mmcam_dbg_log("");*/ + /*MMCAM_LOG_INFO("");*/ if (!_MMCAMCORDER_TRYLOCK_CMD(handle)) { - _mmcam_dbg_err("Another command is running."); + MMCAM_LOG_ERROR("Another command is running."); return MM_ERROR_CAMCORDER_CMD_IS_RUNNING; } state = _mmcamcorder_get_state(handle); if (state == MM_CAMCORDER_STATE_CAPTURING || state < MM_CAMCORDER_STATE_PREPARE) { - _mmcam_dbg_err("Not proper state. state[%d]", state); + MMCAM_LOG_ERROR("Not proper state. state[%d]", state); _MMCAMCORDER_UNLOCK_CMD(handle); return MM_ERROR_CAMCORDER_INVALID_STATE; } @@ -2097,7 +2113,7 @@ int _mmcamcorder_adjust_focus(MMHandleType handle, int direction) MMCAM_CAMERA_FOCUS_MODE, &focus_mode, NULL); if (ret != MM_ERROR_NONE) { - _mmcam_dbg_warn("Get focus-mode fail. (%s:%x)", err_attr_name, ret); + MMCAM_LOG_WARNING("Get focus-mode fail. (%s:%x)", err_attr_name, ret); SAFE_FREE(err_attr_name); _MMCAMCORDER_UNLOCK_CMD(handle); return ret; @@ -2113,7 +2129,7 @@ int _mmcamcorder_adjust_focus(MMHandleType handle, int direction) ret = _mmcamcorder_adjust_auto_focus(handle); break; default: - _mmcam_dbg_err("It doesn't adjust focus. Focusing mode(%d)", focus_mode); + MMCAM_LOG_ERROR("It doesn't adjust focus. Focusing mode(%d)", focus_mode); ret = MM_ERROR_CAMCORDER_NOT_SUPPORTED; } @@ -2133,7 +2149,7 @@ int _mmcamcorder_adjust_manual_focus(MMHandleType handle, int direction) _MMCamcorderSubContext *sc = NULL; mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); mmf_return_val_if_fail(_MMFCAMCORDER_FOCUS_TOTAL_LEVEL != 1, MM_ERROR_CAMCORDER_NOT_SUPPORTED); @@ -2145,24 +2161,24 @@ int _mmcamcorder_adjust_manual_focus(MMHandleType handle, int direction) mmf_return_val_if_fail(sc, MM_ERROR_CAMCORDER_NOT_INITIALIZED); if (!GST_IS_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst)) { - _mmcam_dbg_log("Can't cast Video source into camera control."); + MMCAM_LOG_INFO("Can't cast Video source into camera control."); return MM_ERROR_NONE; } control = GST_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst); if (control == NULL) { - _mmcam_dbg_err("cast CAMERA_CONTROL failed"); + MMCAM_LOG_ERROR("cast CAMERA_CONTROL failed"); return MM_ERROR_CAMCORDER_INTERNAL; } /* TODO : get max, min level */ if (max_level - min_level + 1 < _MMFCAMCORDER_FOCUS_TOTAL_LEVEL) - _mmcam_dbg_warn("Total level of manual focus of MMF is greater than that of the camera driver."); + MMCAM_LOG_WARNING("Total level of manual focus of MMF is greater than that of the camera driver."); unit_level = ((float)max_level - (float)min_level)/(float)(_MMFCAMCORDER_FOCUS_TOTAL_LEVEL - 1); if (!gst_camera_control_get_focus_level(control, &cur_level)) { - _mmcam_dbg_err("Can't get current level of manual focus."); + MMCAM_LOG_ERROR("Can't get current level of manual focus."); return MM_ERROR_CAMCORDER_DEVICE_IO; } @@ -2178,7 +2194,7 @@ int _mmcamcorder_adjust_manual_focus(MMHandleType handle, int direction) focus_level = min_level; if (!gst_camera_control_set_focus_level(control, focus_level)) { - _mmcam_dbg_err("Manual focusing fail."); + MMCAM_LOG_ERROR("Manual focusing fail."); return MM_ERROR_CAMCORDER_DEVICE_IO; } @@ -2195,12 +2211,12 @@ int _mmcamcorder_adjust_auto_focus(MMHandleType handle) mmf_return_val_if_fail(handle, MM_ERROR_CAMCORDER_NOT_INITIALIZED); - /*_mmcam_dbg_log("");*/ + /*MMCAM_LOG_INFO("");*/ sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder); if (!GST_IS_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst)) { - _mmcam_dbg_log("Can't cast Video source into camera control."); + MMCAM_LOG_INFO("Can't cast Video source into camera control."); return MM_ERROR_NONE; } @@ -2209,15 +2225,15 @@ int _mmcamcorder_adjust_auto_focus(MMHandleType handle) /* Start AF */ ret = gst_camera_control_start_auto_focus(control); } else { - _mmcam_dbg_err("cast CAMERA_CONTROL failed"); + MMCAM_LOG_ERROR("cast CAMERA_CONTROL failed"); ret = FALSE; } if (ret) { - _mmcam_dbg_log("Auto focusing start success."); + MMCAM_LOG_INFO("Auto focusing start success."); return MM_ERROR_NONE; } else { - _mmcam_dbg_err("Auto focusing start fail."); + MMCAM_LOG_ERROR("Auto focusing start fail."); return MM_ERROR_CAMCORDER_DEVICE_IO; } } @@ -2232,24 +2248,24 @@ int _mmcamcorder_stop_focusing(MMHandleType handle) mmf_return_val_if_fail(handle, MM_ERROR_CAMCORDER_NOT_INITIALIZED); - /*_mmcam_dbg_log("");*/ + /*MMCAM_LOG_INFO("");*/ sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder); if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) { - _mmcam_dbg_err("Another command is running."); + MMCAM_LOG_ERROR("Another command is running."); return MM_ERROR_CAMCORDER_CMD_IS_RUNNING; } state = _mmcamcorder_get_state(handle); if (state == MM_CAMCORDER_STATE_CAPTURING || state < MM_CAMCORDER_STATE_PREPARE) { - _mmcam_dbg_err("Not proper state. state[%d]", state); + MMCAM_LOG_ERROR("Not proper state. state[%d]", state); _MMCAMCORDER_UNLOCK_CMD(hcamcorder); return MM_ERROR_CAMCORDER_INVALID_STATE; } if (!GST_IS_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst)) { - _mmcam_dbg_log("Can't cast Video source into camera control."); + MMCAM_LOG_INFO("Can't cast Video source into camera control."); _MMCAMCORDER_UNLOCK_CMD(hcamcorder); return MM_ERROR_NONE; } @@ -2258,21 +2274,66 @@ int _mmcamcorder_stop_focusing(MMHandleType handle) if (control) { ret = gst_camera_control_stop_auto_focus(control); } else { - _mmcam_dbg_err("cast CAMERA_CONTROL failed"); + MMCAM_LOG_ERROR("cast CAMERA_CONTROL failed"); ret = FALSE; } _MMCAMCORDER_UNLOCK_CMD(hcamcorder); if (ret) { - _mmcam_dbg_log("Auto focusing stop success."); + MMCAM_LOG_INFO("Auto focusing stop success."); return MM_ERROR_NONE; } else { - _mmcam_dbg_err("Auto focusing stop fail."); + MMCAM_LOG_ERROR("Auto focusing stop fail."); return MM_ERROR_CAMCORDER_DEVICE_IO; } } +int _mmcamcorder_get_exposure(MMHandleType handle, int *exposure) +{ + int ret = MM_ERROR_NONE; + int state = MM_CAMCORDER_STATE_NONE; + GstCameraControl *control = NULL; + _MMCamcorderSubContext *sc = NULL; + mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); + + mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); + mmf_return_val_if_fail(exposure, MM_ERROR_CAMCORDER_INVALID_ARGUMENT); + + state = _mmcamcorder_get_state(handle); + if (state < MM_CAMCORDER_STATE_READY) { + ret = mm_camcorder_get_attributes(handle, NULL, + MMCAM_CAMERA_EXPOSURE_VALUE, exposure, + NULL); + + MMCAM_LOG_INFO("exposure[%d] from attribute[ret:0x%x]", *exposure, ret); + + return ret; + } + + sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder); + mmf_return_val_if_fail(sc, MM_ERROR_CAMCORDER_NOT_INITIALIZED); + + if (!GST_IS_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst)) { + MMCAM_LOG_ERROR("Can't cast Video source into camera control."); + return MM_ERROR_CAMCORDER_NOT_SUPPORTED; + } + + control = GST_CAMERA_CONTROL(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst); + if (!control) { + MMCAM_LOG_ERROR("cast CAMERA_CONTROL failed"); + return MM_ERROR_CAMCORDER_NOT_SUPPORTED; + } + + if (!gst_camera_control_get_exposure(control, GST_CAMERA_CONTROL_EXPOSURE_VALUE, exposure, NULL)) { + MMCAM_LOG_ERROR("get exposure failed"); + return MM_ERROR_CAMCORDER_INTERNAL; + } + + MMCAM_LOG_INFO("exposure[%d] from device", *exposure); + + return MM_ERROR_NONE; +} /*----------------------------------------------- | CAMCORDER INTERNAL LOCAL | @@ -2290,7 +2351,7 @@ static gboolean __mmcamcorder_init_gstreamer(camera_conf *conf) mmf_return_val_if_fail(conf, FALSE); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); /* alloc */ argc = malloc(sizeof(int)); @@ -2316,15 +2377,15 @@ static gboolean __mmcamcorder_init_gstreamer(camera_conf *conf) argv[*argc] = g_strdup(GSTInitOption->value[(*argc)-1]); } - _mmcam_dbg_log("initializing gstreamer with following parameter[argc:%d]", *argc); + MMCAM_LOG_INFO("initializing gstreamer with following parameter[argc:%d]", *argc); for (i = 0; i < *argc; i++) - _mmcam_dbg_log("argv[%d] : %s", i, argv[i]); + MMCAM_LOG_INFO("argv[%d] : %s", i, argv[i]); /* initializing gstreamer */ ret = gst_init_check(argc, &argv, &err); if (!ret) { - _mmcam_dbg_err("Could not initialize GStreamer: %s ", err ? err->message : "unknown error occurred"); + MMCAM_LOG_ERROR("Could not initialize GStreamer: %s ", err ? err->message : "unknown error occurred"); if (err) g_error_free(err); } @@ -2350,7 +2411,7 @@ static gboolean __mmcamcorder_init_gstreamer(camera_conf *conf) return ret; ERROR: - _mmcam_dbg_err("failed to initialize gstreamer"); + MMCAM_LOG_ERROR("failed to initialize gstreamer"); if (argv) { free(argv); @@ -2376,7 +2437,7 @@ int _mmcamcorder_get_state(MMHandleType handle) _MMCAMCORDER_LOCK_STATE(handle); state = hcamcorder->state; - /*_mmcam_dbg_log("state=%d",state);*/ + /*MMCAM_LOG_INFO("state=%d",state);*/ _MMCAMCORDER_UNLOCK_STATE(handle); @@ -2409,7 +2470,7 @@ void _mmcamcorder_set_state(MMHandleType handle, int state) mmf_return_if_fail(hcamcorder); - /*_mmcam_dbg_log("");*/ + /*MMCAM_LOG_INFO("");*/ _MMCAMCORDER_LOCK_STATE(handle); @@ -2418,7 +2479,7 @@ void _mmcamcorder_set_state(MMHandleType handle, int state) hcamcorder->state = state; hcamcorder->old_state = old_state; - _mmcam_dbg_log("set state[%d -> %d] and send state-changed message", old_state, state); + MMCAM_LOG_INFO("set state[%d -> %d] and send state-changed message", old_state, state); /* To discern who changes the state */ switch (hcamcorder->state_change_by_system) { @@ -2440,7 +2501,7 @@ void _mmcamcorder_set_state(MMHandleType handle, int state) msg.param.state.previous = old_state; msg.param.state.current = state; - /*_mmcam_dbg_log("_mmcamcorder_send_message : msg : %p, id:%x", &msg, msg.id);*/ + /*MMCAM_LOG_INFO("_mmcamcorder_send_message : msg : %p, id:%x", &msg, msg.id);*/ _mmcamcorder_send_message(handle, &msg); } @@ -2455,14 +2516,10 @@ _MMCamcorderSubContext *_mmcamcorder_alloc_subcontext(int type) int i; _MMCamcorderSubContext *sc = NULL; - /*_mmcam_dbg_log("");*/ + /*MMCAM_LOG_INFO("");*/ /* alloc container */ - sc = (_MMCamcorderSubContext *)malloc(sizeof(_MMCamcorderSubContext)); - mmf_return_val_if_fail(sc != NULL, NULL); - - /* init members */ - memset(sc, 0x00, sizeof(_MMCamcorderSubContext)); + sc = (_MMCamcorderSubContext *)g_malloc0(sizeof(_MMCamcorderSubContext)); sc->element_num = _MMCAMCORDER_PIPELINE_ELEMENT_NUM; sc->encode_element_num = _MMCAMCORDER_ENCODE_PIPELINE_ELEMENT_NUM; @@ -2471,43 +2528,20 @@ _MMCamcorderSubContext *_mmcamcorder_alloc_subcontext(int type) switch (type) { case MM_CAMCORDER_MODE_AUDIO: sc->info_audio = g_malloc0(sizeof(_MMCamcorderAudioInfo)); - if (!sc->info_audio) { - _mmcam_dbg_err("Failed to alloc info structure"); - goto ALLOC_SUBCONTEXT_FAILED; - } break; case MM_CAMCORDER_MODE_VIDEO_CAPTURE: default: sc->info_image = g_malloc0(sizeof(_MMCamcorderImageInfo)); - if (!sc->info_image) { - _mmcam_dbg_err("Failed to alloc info structure"); - goto ALLOC_SUBCONTEXT_FAILED; - } + sc->info_video = g_malloc0(sizeof(_MMCamcorderVideoInfo)); - /* init sound status */ sc->info_image->sound_status = _SOUND_STATUS_INIT; - - sc->info_video = g_malloc0(sizeof(_MMCamcorderVideoInfo)); - if (!sc->info_video) { - _mmcam_dbg_err("Failed to alloc info structure"); - goto ALLOC_SUBCONTEXT_FAILED; - } g_mutex_init(&sc->info_video->size_check_lock); break; } /* alloc element array */ - sc->element = (_MMCamcorderGstElement *)malloc(sizeof(_MMCamcorderGstElement) * sc->element_num); - if (!sc->element) { - _mmcam_dbg_err("Failed to alloc element structure"); - goto ALLOC_SUBCONTEXT_FAILED; - } - - sc->encode_element = (_MMCamcorderGstElement *)malloc(sizeof(_MMCamcorderGstElement) * sc->encode_element_num); - if (!sc->encode_element) { - _mmcam_dbg_err("Failed to alloc encode element structure"); - goto ALLOC_SUBCONTEXT_FAILED; - } + sc->element = (_MMCamcorderGstElement *)g_malloc(sizeof(_MMCamcorderGstElement) * sc->element_num); + sc->encode_element = (_MMCamcorderGstElement *)g_malloc(sizeof(_MMCamcorderGstElement) * sc->encode_element_num); for (i = 0 ; i < sc->element_num ; i++) { sc->element[i].id = _MMCAMCORDER_NONE; @@ -2526,70 +2560,48 @@ _MMCamcorderSubContext *_mmcamcorder_alloc_subcontext(int type) sc->is_modified_rate = FALSE; return sc; - -ALLOC_SUBCONTEXT_FAILED: - if (sc) { - SAFE_G_FREE(sc->info_audio); - SAFE_G_FREE(sc->info_image); - if (sc->info_video) - g_mutex_clear(&sc->info_video->size_check_lock); - - SAFE_G_FREE(sc->info_video); - if (sc->element) { - free(sc->element); - sc->element = NULL; - } - if (sc->encode_element) { - free(sc->encode_element); - sc->encode_element = NULL; - } - free(sc); - sc = NULL; - } - - return NULL; } void _mmcamcorder_dealloc_subcontext(_MMCamcorderSubContext *sc) { - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); if (sc) { if (sc->element) { - _mmcam_dbg_log("release element"); - free(sc->element); + MMCAM_LOG_INFO("release element"); + g_free(sc->element); sc->element = NULL; } if (sc->encode_element) { - _mmcam_dbg_log("release encode_element"); - free(sc->encode_element); + MMCAM_LOG_INFO("release encode_element"); + g_free(sc->encode_element); sc->encode_element = NULL; } if (sc->info_image) { - _mmcam_dbg_log("release info_image"); - free(sc->info_image); + MMCAM_LOG_INFO("release info_image"); + g_free(sc->info_image); sc->info_image = NULL; } if (sc->info_video) { - _mmcam_dbg_log("release info_video"); + MMCAM_LOG_INFO("release info_video"); SAFE_G_FREE(sc->info_video->filename); g_mutex_clear(&sc->info_video->size_check_lock); - free(sc->info_video); + g_free(sc->info_video); sc->info_video = NULL; } if (sc->info_audio) { - _mmcam_dbg_log("release info_audio"); + MMCAM_LOG_INFO("release info_audio"); SAFE_G_FREE(sc->info_audio->filename); - free(sc->info_audio); + g_free(sc->info_audio); sc->info_audio = NULL; } - free(sc); + g_free(sc); sc = NULL; } @@ -2601,7 +2613,9 @@ int _mmcamcorder_set_functions(MMHandleType handle, int type) { mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - /*_mmcam_dbg_log("");*/ + mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); + + /*MMCAM_LOG_INFO("");*/ switch (type) { case MM_CAMCORDER_MODE_AUDIO: @@ -2624,15 +2638,13 @@ gboolean _mmcamcorder_pipeline_cb_message(GstBus *bus, GstMessage *message, gpoi mmf_return_val_if_fail(hcamcorder, FALSE); mmf_return_val_if_fail(message, FALSE); - /* _mmcam_dbg_log("message type=(%d)", GST_MESSAGE_TYPE(message)); */ + + MMCAM_LOG_DEBUG("message type[0x%x]", GST_MESSAGE_TYPE(message)); switch (GST_MESSAGE_TYPE(message)) { - case GST_MESSAGE_UNKNOWN: - _mmcam_dbg_log("GST_MESSAGE_UNKNOWN"); - break; case GST_MESSAGE_EOS: { - _mmcam_dbg_err("Got EOS from element \"%s\"... but should not be reached here!", + MMCAM_LOG_ERROR("Got EOS from element[%s]... but should not be reached here!", GST_STR_NULL(GST_ELEMENT_NAME(GST_MESSAGE_SRC(message)))); break; } @@ -2646,13 +2658,13 @@ gboolean _mmcamcorder_pipeline_cb_message(GstBus *bus, GstMessage *message, gpoi __mmcamcorder_handle_gst_error((MMHandleType)hcamcorder, message, err); if (err) { - _mmcam_dbg_err("GSTERR: %s", err->message); + MMCAM_LOG_ERROR("GSTERR: %s", err->message); g_error_free(err); err = NULL; } if (debug) { - _mmcam_dbg_err("Error Debug: %s", debug); + MMCAM_LOG_ERROR("Error Debug: %s", debug); g_free(debug); debug = NULL; } @@ -2664,7 +2676,7 @@ gboolean _mmcamcorder_pipeline_cb_message(GstBus *bus, GstMessage *message, gpoi gchar *debug; gst_message_parse_warning(message, &err, &debug); - _mmcam_dbg_warn("GSTWARN: %s", err->message); + MMCAM_LOG_WARNING("GSTWARN: %s", err->message); __mmcamcorder_handle_gst_warning((MMHandleType)hcamcorder, message, err); @@ -2672,15 +2684,6 @@ gboolean _mmcamcorder_pipeline_cb_message(GstBus *bus, GstMessage *message, gpoi g_free(debug); break; } - case GST_MESSAGE_INFO: - _mmcam_dbg_log("GST_MESSAGE_INFO"); - break; - case GST_MESSAGE_TAG: - _mmcam_dbg_log("GST_MESSAGE_TAG"); - break; - case GST_MESSAGE_BUFFERING: - _mmcam_dbg_log("GST_MESSAGE_BUFFERING"); - break; case GST_MESSAGE_STATE_CHANGED: { const GValue *vnewstate; @@ -2695,72 +2698,24 @@ gboolean _mmcamcorder_pipeline_cb_message(GstBus *bus, GstMessage *message, gpoi vnewstate = gst_structure_get_value(gst_message_get_structure(message), "new-state"); if (vnewstate) { newstate = (GstState)vnewstate->data[0].v_int; - _mmcam_dbg_log("GST_MESSAGE_STATE_CHANGED[%s]", gst_element_state_get_name(newstate)); + MMCAM_LOG_INFO("GST_MESSAGE_STATE_CHANGED[%s]", gst_element_state_get_name(newstate)); } else { - _mmcam_dbg_warn("get new state failed from msg"); + MMCAM_LOG_WARNING("get new state failed from msg"); } } } } break; } - case GST_MESSAGE_STATE_DIRTY: - _mmcam_dbg_log("GST_MESSAGE_STATE_DIRTY"); - break; - case GST_MESSAGE_STEP_DONE: - _mmcam_dbg_log("GST_MESSAGE_STEP_DONE"); - break; - case GST_MESSAGE_CLOCK_PROVIDE: - _mmcam_dbg_log("GST_MESSAGE_CLOCK_PROVIDE"); - break; - case GST_MESSAGE_CLOCK_LOST: - _mmcam_dbg_log("GST_MESSAGE_CLOCK_LOST"); - break; case GST_MESSAGE_NEW_CLOCK: { GstClock *pipe_clock = NULL; gst_message_parse_new_clock(message, &pipe_clock); - /*_mmcam_dbg_log("GST_MESSAGE_NEW_CLOCK : %s", (clock ? GST_OBJECT_NAME (clock) : "NULL"));*/ + MMCAM_LOG_INFO("GST_MESSAGE_NEW_CLOCK[%s]", (pipe_clock ? GST_OBJECT_NAME(pipe_clock) : "NULL")); break; } - case GST_MESSAGE_STRUCTURE_CHANGE: - _mmcam_dbg_log("GST_MESSAGE_STRUCTURE_CHANGE"); - break; - case GST_MESSAGE_STREAM_STATUS: - /*_mmcam_dbg_log("GST_MESSAGE_STREAM_STATUS");*/ - break; - case GST_MESSAGE_APPLICATION: - _mmcam_dbg_log("GST_MESSAGE_APPLICATION"); - break; - case GST_MESSAGE_ELEMENT: - /*_mmcam_dbg_log("GST_MESSAGE_ELEMENT");*/ - break; - case GST_MESSAGE_SEGMENT_START: - _mmcam_dbg_log("GST_MESSAGE_SEGMENT_START"); - break; - case GST_MESSAGE_SEGMENT_DONE: - _mmcam_dbg_log("GST_MESSAGE_SEGMENT_DONE"); - break; - case GST_MESSAGE_DURATION_CHANGED: - _mmcam_dbg_log("GST_MESSAGE_DURATION_CHANGED"); - break; - case GST_MESSAGE_LATENCY: - _mmcam_dbg_log("GST_MESSAGE_LATENCY"); - break; - case GST_MESSAGE_ASYNC_START: - _mmcam_dbg_log("GST_MESSAGE_ASYNC_START"); - break; - case GST_MESSAGE_ASYNC_DONE: - /*_mmcam_dbg_log("GST_MESSAGE_ASYNC_DONE");*/ - break; - case GST_MESSAGE_ANY: - _mmcam_dbg_log("GST_MESSAGE_ANY"); - break; - case GST_MESSAGE_QOS: - /* _mmcam_dbg_log("GST_MESSAGE_QOS"); */ - break; default: - _mmcam_dbg_log("not handled message type=(%d)", GST_MESSAGE_TYPE(message)); + MMCAM_LOG_DEBUG("unhandled message type[0x%x]", GST_MESSAGE_TYPE(message)); break; } @@ -2770,75 +2725,71 @@ gboolean _mmcamcorder_pipeline_cb_message(GstBus *bus, GstMessage *message, gpoi GstBusSyncReply _mmcamcorder_pipeline_bus_sync_callback(GstBus *bus, GstMessage *message, gpointer data) { - GstElement *element = NULL; GError *err = NULL; gchar *debug_info = NULL; mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(data); _MMCamcorderSubContext *sc = NULL; - mmf_return_val_if_fail(hcamcorder, GST_BUS_PASS); - mmf_return_val_if_fail(message, GST_BUS_PASS); + mmf_return_val_if_fail(hcamcorder, GST_BUS_DROP); + mmf_return_val_if_fail(message, GST_BUS_DROP); sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder); - mmf_return_val_if_fail(sc, GST_BUS_PASS); + mmf_return_val_if_fail(sc, GST_BUS_DROP); if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_ERROR) { /* parse error message */ gst_message_parse_error(message, &err, &debug_info); if (debug_info) { - _mmcam_dbg_err("GST ERROR : %s", debug_info); + MMCAM_LOG_ERROR("GST ERROR : %s", debug_info); g_free(debug_info); debug_info = NULL; } if (!err) { - _mmcam_dbg_warn("failed to parse error message"); + MMCAM_LOG_WARNING("failed to parse error message"); return GST_BUS_PASS; } - /* set videosrc element to compare */ - element = GST_ELEMENT_CAST(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst); - /* check domain[RESOURCE] and element[VIDEOSRC] */ - if (err->domain == GST_RESOURCE_ERROR && GST_ELEMENT_CAST(message->src) == element) { + if (err->domain == GST_RESOURCE_ERROR && + GST_ELEMENT_CAST(message->src) == GST_ELEMENT_CAST(sc->element[_MMCAMCORDER_VIDEOSRC_SRC].gst)) { switch (err->code) { case GST_RESOURCE_ERROR_BUSY: - _mmcam_dbg_err("Camera device [busy]"); + MMCAM_LOG_ERROR("Camera device [busy]"); hcamcorder->error_code = MM_ERROR_CAMCORDER_DEVICE_BUSY; break; case GST_RESOURCE_ERROR_OPEN_WRITE: - _mmcam_dbg_err("Camera device [open failed]"); + MMCAM_LOG_ERROR("Camera device [open failed]"); hcamcorder->error_code = MM_ERROR_COMMON_INVALID_PERMISSION; - /* sc->error_code = MM_ERROR_CAMCORDER_DEVICE_OPEN; // SECURITY PART REQUEST PRIVILEGE */ break; case GST_RESOURCE_ERROR_OPEN_READ_WRITE: - _mmcam_dbg_err("Camera device [open failed]"); + MMCAM_LOG_ERROR("Camera device [open failed]"); hcamcorder->error_code = MM_ERROR_CAMCORDER_DEVICE_OPEN; break; case GST_RESOURCE_ERROR_OPEN_READ: - _mmcam_dbg_err("Camera device [register trouble]"); + MMCAM_LOG_ERROR("Camera device [register trouble]"); hcamcorder->error_code = MM_ERROR_CAMCORDER_DEVICE_REG_TROUBLE; break; case GST_RESOURCE_ERROR_NOT_FOUND: - _mmcam_dbg_err("Camera device [device not found]"); + MMCAM_LOG_ERROR("Camera device [device not found]"); hcamcorder->error_code = MM_ERROR_CAMCORDER_DEVICE_NOT_FOUND; break; case GST_RESOURCE_ERROR_TOO_LAZY: - _mmcam_dbg_err("Camera device [timeout]"); + MMCAM_LOG_ERROR("Camera device [timeout]"); hcamcorder->error_code = MM_ERROR_CAMCORDER_DEVICE_TIMEOUT; break; case GST_RESOURCE_ERROR_SETTINGS: - _mmcam_dbg_err("Camera device [not supported]"); + MMCAM_LOG_ERROR("Camera device [not supported]"); hcamcorder->error_code = MM_ERROR_CAMCORDER_NOT_SUPPORTED; break; case GST_RESOURCE_ERROR_FAILED: - _mmcam_dbg_err("Camera device [working failed]."); + MMCAM_LOG_ERROR("Camera device [working failed]."); hcamcorder->error_code = MM_ERROR_CAMCORDER_DEVICE_IO; break; default: - _mmcam_dbg_err("Camera device [General(%d)]", err->code); + MMCAM_LOG_ERROR("Camera device [General(%d)]", err->code); hcamcorder->error_code = MM_ERROR_CAMCORDER_DEVICE; break; } @@ -2857,8 +2808,6 @@ GstBusSyncReply _mmcamcorder_pipeline_bus_sync_callback(GstBus *bus, GstMessage msg.id = MM_MESSAGE_CAMCORDER_ERROR; msg.param.code = hcamcorder->error_code; _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg); - - goto DROP_MESSAGE; } } else if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_ELEMENT) { _MMCamcorderMsgItem msg; @@ -2868,27 +2817,23 @@ GstBusSyncReply _mmcamcorder_pipeline_bus_sync_callback(GstBus *bus, GstMessage int focus_state = 0; gst_structure_get_int(gst_message_get_structure(message), "focus-state", &focus_state); - _mmcam_dbg_log("Focus State:%d", focus_state); + MMCAM_LOG_INFO("Focus State:%d", focus_state); msg.id = MM_MESSAGE_CAMCORDER_FOCUS_CHANGED; msg.param.code = focus_state; _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg); - - goto DROP_MESSAGE; } else if (gst_structure_has_name(gst_message_get_structure(message), "camerasrc-HDR")) { int progress = 0; int status = 0; if (gst_structure_get_int(gst_message_get_structure(message), "progress", &progress)) { gst_structure_get_int(gst_message_get_structure(message), "status", &status); - _mmcam_dbg_log("HDR progress %d percent, status %d", progress, status); + MMCAM_LOG_INFO("HDR progress %d percent, status %d", progress, status); msg.id = MM_MESSAGE_CAMCORDER_HDR_PROGRESS; msg.param.code = progress; _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg); } - - goto DROP_MESSAGE; } else if (gst_structure_has_name(gst_message_get_structure(message), "camerasrc-FD")) { int i = 0; const GValue *g_value = gst_structure_get_value(gst_message_get_structure(message), "face-info");; @@ -2899,66 +2844,51 @@ GstBusSyncReply _mmcamcorder_pipeline_bus_sync_callback(GstBus *bus, GstMessage fd_info = (GstCameraControlFaceDetectInfo *)g_value_get_pointer(g_value); if (fd_info == NULL) { - _mmcam_dbg_warn("fd_info is NULL"); - goto DROP_MESSAGE; + MMCAM_LOG_WARNING("fd_info is NULL"); + gst_message_unref(message); + return GST_BUS_DROP; } cam_fd_info = (MMCamFaceDetectInfo *)g_malloc(sizeof(MMCamFaceDetectInfo)); - if (cam_fd_info == NULL) { - _mmcam_dbg_warn("cam_fd_info alloc failed"); - SAFE_FREE(fd_info); - goto DROP_MESSAGE; - } /* set total face count */ cam_fd_info->num_of_faces = fd_info->num_of_faces; if (cam_fd_info->num_of_faces > 0) { cam_fd_info->face_info = (MMCamFaceInfo *)g_malloc(sizeof(MMCamFaceInfo) * cam_fd_info->num_of_faces); - if (cam_fd_info->face_info) { - /* set information of each face */ - for (i = 0 ; i < fd_info->num_of_faces ; i++) { - cam_fd_info->face_info[i].id = fd_info->face_info[i].id; - cam_fd_info->face_info[i].score = fd_info->face_info[i].score; - cam_fd_info->face_info[i].rect.x = fd_info->face_info[i].rect.x; - cam_fd_info->face_info[i].rect.y = fd_info->face_info[i].rect.y; - cam_fd_info->face_info[i].rect.width = fd_info->face_info[i].rect.width; - cam_fd_info->face_info[i].rect.height = fd_info->face_info[i].rect.height; - /* - _mmcam_dbg_log("id %d, score %d, [%d,%d,%dx%d]", - fd_info->face_info[i].id, - fd_info->face_info[i].score, - fd_info->face_info[i].rect.x, - fd_info->face_info[i].rect.y, - fd_info->face_info[i].rect.width, - fd_info->face_info[i].rect.height); - */ - } - } else { - _mmcam_dbg_warn("MMCamFaceInfo alloc failed"); - - /* free allocated memory that is not sent */ - SAFE_G_FREE(cam_fd_info); + MMCAM_LOG_DEBUG("face detection - count %d", cam_fd_info->num_of_faces); + /* set information of each face */ + for (i = 0 ; i < cam_fd_info->num_of_faces ; i++) { + cam_fd_info->face_info[i].id = fd_info->face_info[i].id; + cam_fd_info->face_info[i].score = fd_info->face_info[i].score; + cam_fd_info->face_info[i].rect.x = fd_info->face_info[i].rect.x; + cam_fd_info->face_info[i].rect.y = fd_info->face_info[i].rect.y; + cam_fd_info->face_info[i].rect.width = fd_info->face_info[i].rect.width; + cam_fd_info->face_info[i].rect.height = fd_info->face_info[i].rect.height; + + MMCAM_LOG_VERBOSE(" [%d] id %d, score %d, [%d,%d,%dx%d]", + i, fd_info->face_info[i].id, + fd_info->face_info[i].score, + fd_info->face_info[i].rect.x, + fd_info->face_info[i].rect.y, + fd_info->face_info[i].rect.width, + fd_info->face_info[i].rect.height); } } else { cam_fd_info->face_info = NULL; } - if (cam_fd_info) { - /* send message - cam_fd_info should be freed by application */ - msg.id = MM_MESSAGE_CAMCORDER_FACE_DETECT_INFO; - msg.param.data = cam_fd_info; - msg.param.size = sizeof(MMCamFaceDetectInfo); - msg.param.code = 0; + /* send message - cam_fd_info should be freed by application */ + msg.id = MM_MESSAGE_CAMCORDER_FACE_DETECT_INFO; + msg.param.data = cam_fd_info; + msg.param.size = sizeof(MMCamFaceDetectInfo); + msg.param.code = 0; - _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg); - } + _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg); /* free fd_info allocated by plugin */ free(fd_info); fd_info = NULL; - - goto DROP_MESSAGE; } else if (gst_structure_has_name(gst_message_get_structure(message), "camerasrc-Capture")) { int capture_done = FALSE; @@ -2968,173 +2898,184 @@ GstBusSyncReply _mmcamcorder_pipeline_bus_sync_callback(GstBus *bus, GstMessage _mmcamcorder_sound_solo_play((MMHandleType)hcamcorder, _MMCAMCORDER_SAMPLE_SOUND_NAME_CAPTURE01, FALSE); } } - - goto DROP_MESSAGE; + } else { + _mmcamcorder_pipeline_cb_message(bus, message, data); } + } else { + _mmcamcorder_pipeline_cb_message(bus, message, data); } - return GST_BUS_PASS; - -DROP_MESSAGE: gst_message_unref(message); - message = NULL; return GST_BUS_DROP; } -GstBusSyncReply _mmcamcorder_encode_pipeline_bus_sync_callback(GstBus *bus, GstMessage *message, gpointer data) +static void __mmcamcorder_gst_handle_sync_audio_error(mmf_camcorder_t *hcamcorder, gint err_code) { - GstElement *element = NULL; - GError *err = NULL; - gchar *debug_info = NULL; + _MMCamcorderMsgItem msg; - mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(data); - _MMCamcorderSubContext *sc = NULL; + mmf_return_if_fail(hcamcorder); - mmf_return_val_if_fail(hcamcorder, GST_BUS_PASS); - mmf_return_val_if_fail(message, GST_BUS_PASS); + switch (err_code) { + case GST_RESOURCE_ERROR_OPEN_READ_WRITE: + case GST_RESOURCE_ERROR_OPEN_WRITE: + MMCAM_LOG_ERROR("audio device [open failed]"); - sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder); - mmf_return_val_if_fail(sc, GST_BUS_PASS); + /* post error to application */ + hcamcorder->error_occurs = TRUE; + hcamcorder->error_code = MM_ERROR_COMMON_INVALID_PERMISSION; - if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_EOS) { - _mmcam_dbg_log("got EOS from pipeline"); + msg.id = MM_MESSAGE_CAMCORDER_ERROR; + msg.param.code = hcamcorder->error_code; - _MMCAMCORDER_LOCK(hcamcorder); + _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg); + break; + default: + MMCAM_LOG_ERROR("unhandled error code[%d]", err_code); + break; + } +} - sc->bget_eos = TRUE; - _MMCAMCORDER_SIGNAL(hcamcorder); - _MMCAMCORDER_UNLOCK(hcamcorder); +static void __mmcamcorder_gst_handle_sync_others_error(mmf_camcorder_t *hcamcorder, gint err_code) +{ + gboolean b_committing = FALSE; + storage_state_e storage_state = STORAGE_STATE_UNMOUNTABLE; + _MMCamcorderMsgItem msg; + _MMCamcorderSubContext *sc = NULL; - goto DROP_MESSAGE; - } else if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_ERROR) { - _MMCamcorderMsgItem msg; + mmf_return_if_fail(hcamcorder); - /* parse error message */ - gst_message_parse_error(message, &err, &debug_info); + sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder); + mmf_return_if_fail(sc); - if (debug_info) { - _mmcam_dbg_err("GST ERROR : %s", debug_info); - g_free(debug_info); - debug_info = NULL; + if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) { + mmf_return_if_fail(sc->info_video); + b_committing = sc->info_video->b_committing; + } else { + mmf_return_if_fail(sc->info_audio); + b_committing = sc->info_audio->b_committing; + } + + _MMCAMCORDER_LOCK(hcamcorder); + + switch (err_code) { + case GST_RESOURCE_ERROR_WRITE: + storage_get_state(hcamcorder->storage_info.id, &storage_state); + if (storage_state == STORAGE_STATE_REMOVED || + storage_state == STORAGE_STATE_UNMOUNTABLE) { + MMCAM_LOG_ERROR("storage was removed! [storage state %d]", storage_state); + hcamcorder->error_code = MM_ERROR_OUT_OF_STORAGE; + } else { + MMCAM_LOG_ERROR("File write error, storage state %d", storage_state); + hcamcorder->error_code = MM_ERROR_FILE_WRITE; } - if (!err) { - _mmcam_dbg_warn("failed to parse error message"); - return GST_BUS_PASS; + if (sc->ferror_send == FALSE) { + sc->ferror_send = TRUE; + } else { + MMCAM_LOG_ERROR("error was already sent"); + _MMCAMCORDER_UNLOCK(hcamcorder); + return; } + break; + case GST_RESOURCE_ERROR_NO_SPACE_LEFT: + MMCAM_LOG_ERROR("No left space"); + hcamcorder->error_code = MM_MESSAGE_CAMCORDER_NO_FREE_SPACE; + break; + case GST_RESOURCE_ERROR_OPEN_WRITE: + MMCAM_LOG_ERROR("Out of storage"); + hcamcorder->error_code = MM_ERROR_OUT_OF_STORAGE; + break; + case GST_RESOURCE_ERROR_SEEK: + MMCAM_LOG_ERROR("File read(seek)"); + hcamcorder->error_code = MM_ERROR_FILE_READ; + break; + default: + MMCAM_LOG_ERROR("Resource error(%d)", err_code); + hcamcorder->error_code = MM_ERROR_CAMCORDER_GST_RESOURCE; + break; + } - /* set videosrc element to compare */ - element = GST_ELEMENT_CAST(sc->encode_element[_MMCAMCORDER_AUDIOSRC_SRC].gst); + if (b_committing) { + _MMCAMCORDER_SIGNAL(hcamcorder); + _MMCAMCORDER_UNLOCK(hcamcorder); + } else { + _MMCAMCORDER_UNLOCK(hcamcorder); - /* check domain[RESOURCE] and element[AUDIOSRC] */ - if (err->domain == GST_RESOURCE_ERROR && - GST_ELEMENT_CAST(message->src) == element) { - switch (err->code) { - case GST_RESOURCE_ERROR_OPEN_READ_WRITE: - case GST_RESOURCE_ERROR_OPEN_WRITE: - _mmcam_dbg_err("audio device [open failed]"); + msg.id = MM_MESSAGE_CAMCORDER_ERROR; + msg.param.code = hcamcorder->error_code; - /* post error to application */ - hcamcorder->error_occurs = TRUE; - hcamcorder->error_code = MM_ERROR_COMMON_INVALID_PERMISSION; + _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg); + } +} - msg.id = MM_MESSAGE_CAMCORDER_ERROR; - msg.param.code = hcamcorder->error_code; - _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg); +static void __mmcamcorder_handle_gst_sync_error(mmf_camcorder_t *hcamcorder, GstMessage *message) +{ + GError *err = NULL; + gchar *debug_info = NULL; + _MMCamcorderSubContext *sc = NULL; - _mmcam_dbg_err(" error : sc->error_occurs %d", hcamcorder->error_occurs); + mmf_return_if_fail(hcamcorder); + mmf_return_if_fail(message); - goto DROP_MESSAGE; - default: - break; - } - } else { - gboolean b_commiting = FALSE; - storage_state_e storage_state = STORAGE_STATE_UNMOUNTABLE; + sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder); + mmf_return_if_fail(sc); - if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) { - mmf_return_val_if_fail(sc->info_video, GST_BUS_PASS); - b_commiting = sc->info_video->b_commiting; - } else { - mmf_return_val_if_fail(sc->info_audio, GST_BUS_PASS); - b_commiting = sc->info_audio->b_commiting; - } + /* parse error message */ + gst_message_parse_error(message, &err, &debug_info); - _MMCAMCORDER_LOCK(hcamcorder); + if (debug_info) { + MMCAM_LOG_ERROR("GST ERROR : %s", debug_info); + g_free(debug_info); + debug_info = NULL; + } - switch (err->code) { - case GST_RESOURCE_ERROR_WRITE: - storage_get_state(hcamcorder->storage_info.id, &storage_state); - if (storage_state == STORAGE_STATE_REMOVED || - storage_state == STORAGE_STATE_UNMOUNTABLE) { - _mmcam_dbg_err("storage was removed! [storage state %d]", storage_state); - hcamcorder->error_code = MM_ERROR_OUT_OF_STORAGE; - } else { - _mmcam_dbg_err("File write error, storage state %d", storage_state); - hcamcorder->error_code = MM_ERROR_FILE_WRITE; - } + if (!err) { + MMCAM_LOG_ERROR("failed to parse error message"); + return; + } - if (sc->ferror_send == FALSE) { - sc->ferror_send = TRUE; - } else { - _mmcam_dbg_err("error was already sent"); - _MMCAMCORDER_UNLOCK(hcamcorder); - goto DROP_MESSAGE; - } - break; - case GST_RESOURCE_ERROR_NO_SPACE_LEFT: - _mmcam_dbg_err("No left space"); - hcamcorder->error_code = MM_MESSAGE_CAMCORDER_NO_FREE_SPACE; - break; - case GST_RESOURCE_ERROR_OPEN_WRITE: - _mmcam_dbg_err("Out of storage"); - hcamcorder->error_code = MM_ERROR_OUT_OF_STORAGE; - break; - case GST_RESOURCE_ERROR_SEEK: - _mmcam_dbg_err("File read(seek)"); - hcamcorder->error_code = MM_ERROR_FILE_READ; - break; - default: - _mmcam_dbg_err("Resource error(%d)", err->code); - hcamcorder->error_code = MM_ERROR_CAMCORDER_GST_RESOURCE; - break; - } + /* check domain[RESOURCE] and element[AUDIOSRC] */ + if (err->domain == GST_RESOURCE_ERROR && + GST_ELEMENT_CAST(message->src) == GST_ELEMENT_CAST(sc->encode_element[_MMCAMCORDER_AUDIOSRC_SRC].gst)) + __mmcamcorder_gst_handle_sync_audio_error(hcamcorder, err->code); + else + __mmcamcorder_gst_handle_sync_others_error(hcamcorder, err->code); - if (b_commiting) { - _MMCAMCORDER_SIGNAL(hcamcorder); - _MMCAMCORDER_UNLOCK(hcamcorder); - } else { - _MMCAMCORDER_UNLOCK(hcamcorder); + g_error_free(err); +} - msg.id = MM_MESSAGE_CAMCORDER_ERROR; - msg.param.code = hcamcorder->error_code; - _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg); - } +GstBusSyncReply _mmcamcorder_encode_pipeline_bus_sync_callback(GstBus *bus, GstMessage *message, gpointer data) +{ + mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(data); + _MMCamcorderSubContext *sc = NULL; - goto DROP_MESSAGE; - } - } + mmf_return_val_if_fail(hcamcorder, GST_BUS_DROP); + mmf_return_val_if_fail(message, GST_BUS_DROP); - if (err) { - g_error_free(err); - err = NULL; - } + sc = MMF_CAMCORDER_SUBCONTEXT(hcamcorder); + mmf_return_val_if_fail(sc, GST_BUS_DROP); - return GST_BUS_PASS; + if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_EOS) { + MMCAM_LOG_INFO("got EOS from pipeline"); -DROP_MESSAGE: - if (err) { - g_error_free(err); - err = NULL; + _MMCAMCORDER_LOCK(hcamcorder); + + sc->bget_eos = TRUE; + _MMCAMCORDER_SIGNAL(hcamcorder); + + _MMCAMCORDER_UNLOCK(hcamcorder); + } else if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_ERROR) { + __mmcamcorder_handle_gst_sync_error(hcamcorder, message); + } else { + _mmcamcorder_pipeline_cb_message(bus, message, data); } gst_message_unref(message); - message = NULL; return GST_BUS_DROP; } @@ -3150,11 +3091,11 @@ void _mmcamcorder_dpm_camera_policy_changed_cb(const char *name, const char *val current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder); if (current_state <= MM_CAMCORDER_STATE_NONE || current_state >= MM_CAMCORDER_STATE_NUM) { - _mmcam_dbg_err("Abnormal state. Or null handle. (%p, %d)", hcamcorder, current_state); + MMCAM_LOG_ERROR("Abnormal state. Or null handle. (%p, %d)", hcamcorder, current_state); return; } - _mmcam_dbg_warn("camera policy [%s], current state [%d]", value, current_state); + MMCAM_LOG_WARNING("camera policy [%s], current state [%d]", value, current_state); if (!strcmp(value, "disallowed")) { _MMCAMCORDER_LOCK_INTERRUPT(hcamcorder); @@ -3166,7 +3107,7 @@ void _mmcamcorder_dpm_camera_policy_changed_cb(const char *name, const char *val _mmcamcorder_request_dpm_popup(hcamcorder->gdbus_conn, "camera"); } - _mmcam_dbg_warn("done"); + MMCAM_LOG_WARNING("done"); return; } @@ -3179,7 +3120,7 @@ int _mmcamcorder_create_pipeline(MMHandleType handle, int type) _MMCamcorderSubContext *sc = NULL; GstElement *pipeline = NULL; - _mmcam_dbg_log("handle : %p, type : %d", handle, type); + MMCAM_LOG_INFO("handle : %p, type : %d", handle, type); mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); @@ -3194,17 +3135,11 @@ int _mmcamcorder_create_pipeline(MMHandleType handle, int type) break; case MM_CAMCORDER_MODE_VIDEO_CAPTURE: + /* fall through */ default: ret = _mmcamcorder_create_preview_pipeline(handle); if (ret != MM_ERROR_NONE) return ret; - - /* connect capture signal */ - if (!sc->bencbin_capture) { - ret = _mmcamcorder_connect_capture_signal(handle); - if (ret != MM_ERROR_NONE) - return ret; - } break; } @@ -3218,12 +3153,12 @@ int _mmcamcorder_create_pipeline(MMHandleType handle, int type) } #ifdef _MMCAMCORDER_GET_DEVICE_INFO if (!_mmcamcorder_get_device_info(handle)) - _mmcam_dbg_err("Getting device information error!!"); + MMCAM_LOG_ERROR("Getting device information error!!"); #endif - _mmcam_dbg_log("ret[%x]", ret); + MMCAM_LOG_INFO("ret[%x]", ret); if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("error : destroy pipeline"); + MMCAM_LOG_ERROR("error : destroy pipeline"); _mmcamcorder_destroy_pipeline(handle, hcamcorder->type); } @@ -3238,66 +3173,45 @@ void _mmcamcorder_destroy_pipeline(MMHandleType handle, int type) gint i = 0; int element_num = 0; _MMCamcorderGstElement *element = NULL; - GstBus *bus = NULL; mmf_return_if_fail(hcamcorder); sc = MMF_CAMCORDER_SUBCONTEXT(handle); mmf_return_if_fail(sc); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); /* Inside each pipeline destroy function, Set GST_STATE_NULL to Main pipeline */ switch (type) { case MM_CAMCORDER_MODE_VIDEO_CAPTURE: element = sc->element; element_num = sc->element_num; - bus = gst_pipeline_get_bus(GST_PIPELINE(sc->element[_MMCAMCORDER_MAIN_PIPE].gst)); _mmcamcorder_destroy_video_capture_pipeline(handle); break; case MM_CAMCORDER_MODE_AUDIO: element = sc->encode_element; element_num = sc->encode_element_num; - bus = gst_pipeline_get_bus(GST_PIPELINE(sc->encode_element[_MMCAMCORDER_ENCODE_MAIN_PIPE].gst)); _mmcamcorder_destroy_audio_pipeline(handle); break; default: - _mmcam_dbg_err("unknown type %d", type); + MMCAM_LOG_ERROR("unknown type %d", type); break; } - _mmcam_dbg_log("Pipeline clear!!"); - - /* Remove pipeline message callback */ - if (hcamcorder->pipeline_cb_event_id > 0) { - g_source_remove(hcamcorder->pipeline_cb_event_id); - hcamcorder->pipeline_cb_event_id = 0; - } - - /* Remove remained message in bus */ - if (bus) { - GstMessage *gst_msg = NULL; - while ((gst_msg = gst_bus_pop(bus)) != NULL) { - _mmcamcorder_pipeline_cb_message(bus, gst_msg, (gpointer)hcamcorder); - gst_message_unref(gst_msg); - gst_msg = NULL; - } - gst_object_unref(bus); - bus = NULL; - } + MMCAM_LOG_INFO("Pipeline clear!!"); /* checking unreleased element */ for (i = 0 ; i < element_num ; i++) { if (element[i].gst) { if (GST_IS_ELEMENT(element[i].gst)) { - _mmcam_dbg_warn("Still alive element - ID[%d], name [%s], ref count[%d], status[%s]", + MMCAM_LOG_WARNING("Still alive element - ID[%d], name [%s], ref count[%d], status[%s]", element[i].id, GST_OBJECT_NAME(element[i].gst), GST_OBJECT_REFCOUNT(element[i].gst), gst_element_state_get_name(GST_STATE(element[i].gst))); g_object_weak_unref(G_OBJECT(element[i].gst), (GWeakNotify)_mmcamcorder_element_release_noti, sc); } else { - _mmcam_dbg_warn("The element[%d] is still aliving, check it", element[i].id); + MMCAM_LOG_WARNING("The element[%d] is still alive, check it", element[i].id); } element[i].id = _MMCAMCORDER_NONE; @@ -3309,28 +3223,6 @@ void _mmcamcorder_destroy_pipeline(MMHandleType handle, int type) } -#ifdef _MMCAMCORDER_USE_SET_ATTR_CB -static gboolean __mmcamcorder_set_attr_to_camsensor_cb(gpointer data) -{ - mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(data); - - mmf_return_val_if_fail(hcamcorder, FALSE); - - _mmcam_dbg_log(""); - - _mmcamcorder_set_attribute_to_camsensor((MMHandleType)hcamcorder); - - /* initialize */ - hcamcorder->setting_event_id = 0; - - _mmcam_dbg_log("Done"); - - /* once */ - return FALSE; -} -#endif /* _MMCAMCORDER_USE_SET_ATTR_CB */ - - int _mmcamcorder_gst_set_state(MMHandleType handle, GstElement *pipeline, GstState target_state) { unsigned int k = 0; @@ -3346,10 +3238,10 @@ int _mmcamcorder_gst_set_state(MMHandleType handle, GstElement *pipeline, GstSta mmf_return_val_if_fail(sc && sc->element, MM_ERROR_CAMCORDER_NOT_INITIALIZED); if (sc->element[_MMCAMCORDER_MAIN_PIPE].gst == pipeline) { - _mmcam_dbg_log("Set state to %d - PREVIEW PIPELINE", target_state); + MMCAM_LOG_INFO("Set state to %d - PREVIEW PIPELINE", target_state); state_lock = &_MMCAMCORDER_GET_GST_STATE_LOCK(handle); } else { - _mmcam_dbg_log("Set state to %d - ENDODE PIPELINE", target_state); + MMCAM_LOG_INFO("Set state to %d - ENDODE PIPELINE", target_state); state_lock = &_MMCAMCORDER_GET_GST_ENCODE_STATE_LOCK(handle); } @@ -3357,34 +3249,34 @@ int _mmcamcorder_gst_set_state(MMHandleType handle, GstElement *pipeline, GstSta for (k = 0; k < _MMCAMCORDER_STATE_SET_COUNT; k++) { setChangeReturn = gst_element_set_state(pipeline, target_state); - _mmcam_dbg_log("gst_element_set_state[%d] return %d", target_state, setChangeReturn); + MMCAM_LOG_INFO("gst_element_set_state[%d] return %d", target_state, setChangeReturn); if (setChangeReturn != GST_STATE_CHANGE_FAILURE) { getChangeReturn = gst_element_get_state(pipeline, &pipeline_state, NULL, get_timeout); switch (getChangeReturn) { case GST_STATE_CHANGE_NO_PREROLL: - _mmcam_dbg_log("status=GST_STATE_CHANGE_NO_PREROLL."); + MMCAM_LOG_INFO("status=GST_STATE_CHANGE_NO_PREROLL."); /* fall through */ case GST_STATE_CHANGE_SUCCESS: /* if we reached the final target state, exit */ if (pipeline_state == target_state) { - _mmcam_dbg_log("Set state to %d - DONE", target_state); + MMCAM_LOG_INFO("Set state to %d - DONE", target_state); g_mutex_unlock(state_lock); return MM_ERROR_NONE; } break; case GST_STATE_CHANGE_ASYNC: - _mmcam_dbg_log("status=GST_STATE_CHANGE_ASYNC."); + MMCAM_LOG_INFO("status=GST_STATE_CHANGE_ASYNC."); break; default: g_mutex_unlock(state_lock); - _mmcam_dbg_log("status=GST_STATE_CHANGE_FAILURE."); + MMCAM_LOG_INFO("status=GST_STATE_CHANGE_FAILURE."); return MM_ERROR_CAMCORDER_GST_STATECHANGE; } g_mutex_unlock(state_lock); - _mmcam_dbg_err("timeout of gst_element_get_state()!!"); + MMCAM_LOG_ERROR("timeout of gst_element_get_state()!!"); return MM_ERROR_CAMCORDER_RESPONSE_TIMEOUT; } @@ -3394,7 +3286,7 @@ int _mmcamcorder_gst_set_state(MMHandleType handle, GstElement *pipeline, GstSta g_mutex_unlock(state_lock); - _mmcam_dbg_err("Failure. gst_element_set_state timeout!!"); + MMCAM_LOG_ERROR("Failure. gst_element_set_state timeout!!"); return MM_ERROR_CAMCORDER_RESPONSE_TIMEOUT; } @@ -3461,10 +3353,10 @@ void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder, int state_change_by_s do { if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) { if (cmd_try_count++ < __MMCAMCORDER_FORCE_STOP_TRY_COUNT) { - _mmcam_dbg_warn("Another command is running. try again after %d ms", __MMCAMCORDER_FORCE_STOP_WAIT_TIME/1000); + MMCAM_LOG_WARNING("Another command is running. try again after %d ms", __MMCAMCORDER_FORCE_STOP_WAIT_TIME/1000); usleep(__MMCAMCORDER_FORCE_STOP_WAIT_TIME); } else { - _mmcam_dbg_err("wait timeout"); + MMCAM_LOG_ERROR("wait timeout"); break; } } else { @@ -3475,13 +3367,13 @@ void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder, int state_change_by_s current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder); - _mmcam_dbg_warn("Force STOP MMFW Camcorder by %d", state_change_by_system); + MMCAM_LOG_WARNING("Force STOP MMFW Camcorder by %d", state_change_by_system); /* set state_change_by_system for state change message */ hcamcorder->state_change_by_system = state_change_by_system; if (current_state >= MM_CAMCORDER_STATE_READY) { - _mmcam_dbg_warn("send state change started message to notify"); + MMCAM_LOG_WARNING("send state change started message to notify"); memset(&msg, 0x0, sizeof(_MMCamcorderMsgItem)); @@ -3500,7 +3392,7 @@ void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder, int state_change_by_s msg.param.state.code = hcamcorder->interrupt_code; _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg); } else { - _mmcam_dbg_err("should not be reached here %d", state_change_by_system); + MMCAM_LOG_ERROR("should not be reached here %d", state_change_by_system); } } @@ -3515,9 +3407,9 @@ void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder, int state_change_by_s mmf_return_if_fail(sc); mmf_return_if_fail((info = sc->info_image)); - _mmcam_dbg_warn("Stop capturing."); + MMCAM_LOG_WARNING("Stop capturing."); - /* if caturing isn't finished, waiting for 2 sec to finish real capture operation. check 'info->capturing'. */ + /* if capturing isn't finished, waiting for 2 sec to finish real capture operation. check 'info->capturing'. */ mm_camcorder_set_attributes((MMHandleType)hcamcorder, NULL, MMCAM_CAPTURE_BREAK_CONTINUOUS_SHOT, TRUE, NULL); @@ -3526,20 +3418,20 @@ void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder, int state_change_by_s usleep(100000); if (i == 20) - _mmcam_dbg_err("Timeout. Can't check stop capturing."); + MMCAM_LOG_ERROR("Timeout. Can't check stop capturing."); while ((itr_cnt--) && ((result = _mmcamcorder_capture_stop((MMHandleType)hcamcorder)) != MM_ERROR_NONE)) - _mmcam_dbg_warn("Can't stop capturing.(%x)", result); + MMCAM_LOG_WARNING("Can't stop capturing.(%x)", result); break; } case MM_CAMCORDER_STATE_RECORDING: case MM_CAMCORDER_STATE_PAUSED: { - _mmcam_dbg_warn("Stop recording."); + MMCAM_LOG_WARNING("Stop recording."); while ((itr_cnt--) && ((result = _mmcamcorder_commit((MMHandleType)hcamcorder)) != MM_ERROR_NONE)) { - _mmcam_dbg_warn("Can't commit.(%x), cancel it.", result); + MMCAM_LOG_WARNING("Can't commit.(%x), cancel it.", result); _mmcamcorder_cancel((MMHandleType)hcamcorder); } @@ -3547,24 +3439,24 @@ void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder, int state_change_by_s } case MM_CAMCORDER_STATE_PREPARE: { - _mmcam_dbg_warn("Stop preview."); + MMCAM_LOG_WARNING("Stop preview."); while ((itr_cnt--) && ((result = _mmcamcorder_stop((MMHandleType)hcamcorder)) != MM_ERROR_NONE)) - _mmcam_dbg_warn("Can't stop preview.(%x)", result); + MMCAM_LOG_WARNING("Can't stop preview.(%x)", result); break; } case MM_CAMCORDER_STATE_READY: { - _mmcam_dbg_warn("unrealize"); + MMCAM_LOG_WARNING("unrealize"); if ((result = _mmcamcorder_unrealize((MMHandleType)hcamcorder)) != MM_ERROR_NONE) - _mmcam_dbg_warn("Can't unrealize.(%x)", result); + MMCAM_LOG_WARNING("Can't unrealize.(%x)", result); break; } default: - _mmcam_dbg_warn("Already stopped."); + MMCAM_LOG_WARNING("Already stopped."); break; } @@ -3574,7 +3466,7 @@ void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder, int state_change_by_s /* restore */ hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_NORMAL; - _mmcam_dbg_warn("Done."); + MMCAM_LOG_WARNING("Done."); return; } @@ -3589,20 +3481,23 @@ static gboolean __mmcamcorder_handle_gst_error(MMHandleType handle, GstMessage * mmf_return_val_if_fail(hcamcorder, FALSE); mmf_return_val_if_fail(error, FALSE); + sc = MMF_CAMCORDER_SUBCONTEXT(handle); mmf_return_val_if_fail(sc, FALSE); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO("error code %d", error->code); + + mmf_return_val_if_fail(hcamcorder->state >= MM_CAMCORDER_STATE_READY, FALSE); /* filtering filesink related errors */ if (hcamcorder->state == MM_CAMCORDER_STATE_RECORDING && - (error->code == GST_RESOURCE_ERROR_WRITE || error->code == GST_RESOURCE_ERROR_SEEK)) { + (error->code == GST_RESOURCE_ERROR_WRITE || error->code == GST_RESOURCE_ERROR_SEEK)) { if (sc->ferror_count == 2 && sc->ferror_send == FALSE) { sc->ferror_send = TRUE; msg.param.code = __mmcamcorder_gst_handle_resource_error(handle, error->code, message); } else { sc->ferror_count++; - _mmcam_dbg_warn("Skip error"); + MMCAM_LOG_WARNING("Skip error"); return TRUE; } } @@ -3616,7 +3511,7 @@ static gboolean __mmcamcorder_handle_gst_error(MMHandleType handle, GstMessage * } else if (error->domain == GST_STREAM_ERROR) { msg.param.code = __mmcamcorder_gst_handle_stream_error(handle, error->code, message); } else { - _mmcam_dbg_warn("This error domain is not defined."); + MMCAM_LOG_WARNING("This error domain is not defined."); /* we treat system error as an internal error */ msg.param.code = MM_ERROR_CAMCORDER_INTERNAL; @@ -3624,17 +3519,17 @@ static gboolean __mmcamcorder_handle_gst_error(MMHandleType handle, GstMessage * if (message->src) { msg_src_element = GST_ELEMENT_NAME(GST_ELEMENT_CAST(message->src)); - _mmcam_dbg_err("-Msg src : [%s] Domain : [%s] Error : [%s] Code : [%d] is tranlated to error code : [0x%x]", + MMCAM_LOG_ERROR("-Msg src : [%s] Domain : [%s] Error : [%s] Code : [%d] is tranlated to error code : [0x%x]", msg_src_element, g_quark_to_string(error->domain), error->message, error->code, msg.param.code); } else { - _mmcam_dbg_err("Domain : [%s] Error : [%s] Code : [%d] is tranlated to error code : [0x%x]", + MMCAM_LOG_ERROR("Domain : [%s] Error : [%s] Code : [%d] is tranlated to error code : [0x%x]", g_quark_to_string(error->domain), error->message, error->code, msg.param.code); } #ifdef _MMCAMCORDER_SKIP_GST_FLOW_ERROR /* Check whether send this error to application */ if (msg.param.code == MM_ERROR_CAMCORDER_GST_FLOW_ERROR) { - _mmcam_dbg_log("We got the error. But skip it."); + MMCAM_LOG_INFO("We got the error. But skip it."); return TRUE; } #endif /* _MMCAMCORDER_SKIP_GST_FLOW_ERROR */ @@ -3656,7 +3551,7 @@ static gint __mmcamcorder_gst_handle_core_error(MMHandleType handle, int code, G _MMCamcorderSubContext *sc = NULL; GstElement *element = NULL; - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); @@ -3702,7 +3597,7 @@ static gint __mmcamcorder_gst_handle_library_error(MMHandleType handle, int code mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); /* Specific plugin - NONE */ @@ -3715,7 +3610,7 @@ static gint __mmcamcorder_gst_handle_library_error(MMHandleType handle, int code case GST_LIBRARY_ERROR_SETTINGS: case GST_LIBRARY_ERROR_ENCODE: default: - _mmcam_dbg_err("Library error(%d)", code); + MMCAM_LOG_ERROR("Library error(%d)", code); return MM_ERROR_CAMCORDER_GST_LIBRARY; } } @@ -3732,17 +3627,17 @@ static gint __mmcamcorder_gst_handle_resource_error(MMHandleType handle, int cod sc = MMF_CAMCORDER_SUBCONTEXT(handle); mmf_return_val_if_fail(sc, MM_ERROR_CAMCORDER_NOT_INITIALIZED); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); /* Specific plugin */ /* video sink */ element = GST_ELEMENT_CAST(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst); if (GST_ELEMENT_CAST(message->src) == element) { if (code == GST_RESOURCE_ERROR_WRITE) { - _mmcam_dbg_err("Display device [Off]"); + MMCAM_LOG_ERROR("Display device [Off]"); return MM_ERROR_CAMCORDER_DISPLAY_DEVICE_OFF; } else { - _mmcam_dbg_err("Display device [General(%d)]", code); + MMCAM_LOG_ERROR("Display device [General(%d)]", code); } } @@ -3753,7 +3648,7 @@ static gint __mmcamcorder_gst_handle_resource_error(MMHandleType handle, int cod int ret = MM_ERROR_NONE; int current_state = MM_CAMCORDER_STATE_NONE; - _mmcam_dbg_err("DPM mic DISALLOWED - current state %d", current_state); + MMCAM_LOG_ERROR("DPM mic DISALLOWED - current state %d", current_state); _MMCAMCORDER_LOCK_INTERRUPT(hcamcorder); @@ -3763,10 +3658,10 @@ static gint __mmcamcorder_gst_handle_resource_error(MMHandleType handle, int cod hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_BY_DPM; ret = _mmcamcorder_commit((MMHandleType)hcamcorder); - _mmcam_dbg_log("commit result : 0x%x", ret); + MMCAM_LOG_INFO("commit result : 0x%x", ret); if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("commit failed, cancel it"); + MMCAM_LOG_ERROR("commit failed, cancel it"); ret = _mmcamcorder_cancel((MMHandleType)hcamcorder); } } @@ -3786,10 +3681,10 @@ static gint __mmcamcorder_gst_handle_resource_error(MMHandleType handle, int cod element = GST_ELEMENT_CAST(sc->encode_element[_MMCAMCORDER_ENCSINK_VENC].gst); if (GST_ELEMENT_CAST(message->src) == element) { if (code == GST_RESOURCE_ERROR_FAILED) { - _mmcam_dbg_err("Encoder [Resource error]"); + MMCAM_LOG_ERROR("Encoder [Resource error]"); return MM_ERROR_CAMCORDER_ENCODER_BUFFER; } else { - _mmcam_dbg_err("Encoder [General(%d)]", code); + MMCAM_LOG_ERROR("Encoder [General(%d)]", code); return MM_ERROR_CAMCORDER_ENCODER; } } @@ -3797,16 +3692,16 @@ static gint __mmcamcorder_gst_handle_resource_error(MMHandleType handle, int cod /* General */ switch (code) { case GST_RESOURCE_ERROR_WRITE: - _mmcam_dbg_err("File write error"); + MMCAM_LOG_ERROR("File write error"); return MM_ERROR_FILE_WRITE; case GST_RESOURCE_ERROR_NO_SPACE_LEFT: - _mmcam_dbg_err("No left space"); + MMCAM_LOG_ERROR("No left space"); return MM_MESSAGE_CAMCORDER_NO_FREE_SPACE; case GST_RESOURCE_ERROR_OPEN_WRITE: - _mmcam_dbg_err("Out of storage"); + MMCAM_LOG_ERROR("Out of storage"); return MM_ERROR_OUT_OF_STORAGE; case GST_RESOURCE_ERROR_SEEK: - _mmcam_dbg_err("File read(seek)"); + MMCAM_LOG_ERROR("File read(seek)"); return MM_ERROR_FILE_READ; case GST_RESOURCE_ERROR_NOT_FOUND: case GST_RESOURCE_ERROR_FAILED: @@ -3819,7 +3714,7 @@ static gint __mmcamcorder_gst_handle_resource_error(MMHandleType handle, int cod case GST_RESOURCE_ERROR_SYNC: case GST_RESOURCE_ERROR_SETTINGS: default: - _mmcam_dbg_err("Resource error(%d)", code); + MMCAM_LOG_ERROR("Resource error(%d)", code); return MM_ERROR_CAMCORDER_GST_RESOURCE; } } @@ -3836,7 +3731,7 @@ static gint __mmcamcorder_gst_handle_stream_error(MMHandleType handle, int code, sc = MMF_CAMCORDER_SUBCONTEXT(handle); mmf_return_val_if_fail(sc, MM_ERROR_CAMCORDER_NOT_INITIALIZED); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); /* Specific plugin */ /* video encoder */ @@ -3844,16 +3739,16 @@ static gint __mmcamcorder_gst_handle_stream_error(MMHandleType handle, int code, if (GST_ELEMENT_CAST(message->src) == element) { switch (code) { case GST_STREAM_ERROR_WRONG_TYPE: - _mmcam_dbg_err("Video encoder [wrong stream type]"); + MMCAM_LOG_ERROR("Video encoder [wrong stream type]"); return MM_ERROR_CAMCORDER_ENCODER_WRONG_TYPE; case GST_STREAM_ERROR_ENCODE: - _mmcam_dbg_err("Video encoder [encode error]"); + MMCAM_LOG_ERROR("Video encoder [encode error]"); return MM_ERROR_CAMCORDER_ENCODER_WORKING; case GST_STREAM_ERROR_FAILED: - _mmcam_dbg_err("Video encoder [stream failed]"); + MMCAM_LOG_ERROR("Video encoder [stream failed]"); return MM_ERROR_CAMCORDER_ENCODER_WORKING; default: - _mmcam_dbg_err("Video encoder [General(%d)]", code); + MMCAM_LOG_ERROR("Video encoder [General(%d)]", code); return MM_ERROR_CAMCORDER_ENCODER; } } @@ -3861,10 +3756,10 @@ static gint __mmcamcorder_gst_handle_stream_error(MMHandleType handle, int code, /* General plugin */ switch (code) { case GST_STREAM_ERROR_FORMAT: - _mmcam_dbg_err("General [negotiation error(%d)]", code); + MMCAM_LOG_ERROR("General [negotiation error(%d)]", code); return MM_ERROR_CAMCORDER_GST_NEGOTIATION; case GST_STREAM_ERROR_FAILED: - _mmcam_dbg_err("General [flow error(%d)]", code); + MMCAM_LOG_ERROR("General [flow error(%d)]", code); return MM_ERROR_CAMCORDER_GST_FLOW_ERROR; case GST_STREAM_ERROR_TYPE_NOT_FOUND: case GST_STREAM_ERROR_DECODE: @@ -3878,7 +3773,7 @@ static gint __mmcamcorder_gst_handle_stream_error(MMHandleType handle, int code, case GST_STREAM_ERROR_DECRYPT_NOKEY: case GST_STREAM_ERROR_WRONG_TYPE: default: - _mmcam_dbg_err("General [error(%d)]", code); + MMCAM_LOG_ERROR("General [error(%d)]", code); return MM_ERROR_CAMCORDER_GST_STREAM; } } @@ -3893,21 +3788,21 @@ static gboolean __mmcamcorder_handle_gst_warning(MMHandleType handle, GstMessage mmf_return_val_if_fail(hcamcorder, FALSE); mmf_return_val_if_fail(error, FALSE); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); gst_message_parse_warning(message, &err, &debug); if (error->domain == GST_CORE_ERROR) { - _mmcam_dbg_warn("GST warning: GST_CORE domain"); + MMCAM_LOG_WARNING("GST warning: GST_CORE domain"); } else if (error->domain == GST_LIBRARY_ERROR) { - _mmcam_dbg_warn("GST warning: GST_LIBRARY domain"); + MMCAM_LOG_WARNING("GST warning: GST_LIBRARY domain"); } else if (error->domain == GST_RESOURCE_ERROR) { - _mmcam_dbg_warn("GST warning: GST_RESOURCE domain"); + MMCAM_LOG_WARNING("GST warning: GST_RESOURCE domain"); __mmcamcorder_gst_handle_resource_warning(handle, message, error); } else if (error->domain == GST_STREAM_ERROR) { - _mmcam_dbg_warn("GST warning: GST_STREAM domain"); + MMCAM_LOG_WARNING("GST warning: GST_STREAM domain"); } else { - _mmcam_dbg_warn("This error domain(%d) is not defined.", error->domain); + MMCAM_LOG_WARNING("This error domain(%d) is not defined.", error->domain); } if (err != NULL) { @@ -3915,7 +3810,7 @@ static gboolean __mmcamcorder_handle_gst_warning(MMHandleType handle, GstMessage err = NULL; } if (debug != NULL) { - _mmcam_dbg_err("Debug: %s", debug); + MMCAM_LOG_ERROR("Debug: %s", debug); g_free(debug); debug = NULL; } @@ -3936,7 +3831,7 @@ static gint __mmcamcorder_gst_handle_resource_warning(MMHandleType handle, GstMe sc = MMF_CAMCORDER_SUBCONTEXT(handle); mmf_return_val_if_fail(sc, MM_ERROR_CAMCORDER_NOT_INITIALIZED); - _mmcam_dbg_log(""); + MMCAM_LOG_INFO(""); /* Special message handling */ /* video source */ @@ -3944,7 +3839,7 @@ static gint __mmcamcorder_gst_handle_resource_warning(MMHandleType handle, GstMe if (GST_ELEMENT_CAST(message->src) == element) { if (error->code == GST_RESOURCE_ERROR_FAILED) { msg_src_element = GST_ELEMENT_NAME(GST_ELEMENT_CAST(message->src)); - _mmcam_dbg_warn("-Msg src:[%s] Domain:[%s] Error:[%s]", + MMCAM_LOG_WARNING("-Msg src:[%s] Domain:[%s] Error:[%s]", msg_src_element, g_quark_to_string(error->domain), error->message); return MM_ERROR_NONE; } @@ -3967,7 +3862,7 @@ static gint __mmcamcorder_gst_handle_resource_warning(MMHandleType handle, GstMe case GST_RESOURCE_ERROR_SYNC: case GST_RESOURCE_ERROR_SETTINGS: default: - _mmcam_dbg_warn("General GST warning(%d)", error->code); + MMCAM_LOG_WARNING("General GST warning(%d)", error->code); break; } @@ -3982,7 +3877,7 @@ void _mmcamcorder_emit_signal(MMHandleType handle, const char *object_name, mmf_return_if_fail(hcamcorder && object_name && interface_name && signal_name); - _mmcam_dbg_log("object %s, interface %s, signal %s, value %d", + MMCAM_LOG_INFO("object %s, interface %s, signal %s, value %d", object_name, interface_name, signal_name, value); _mmcamcorder_emit_dbus_signal(hcamcorder->gdbus_conn, object_name, interface_name, signal_name, value); @@ -3999,7 +3894,7 @@ static int __mmcamcorder_resource_release_cb(mm_resource_manager_h rm, mmf_return_val_if_fail(hcamcorder, FALSE); - _mmcam_dbg_warn("enter"); + MMCAM_LOG_WARNING("enter"); _MMCAMCORDER_LOCK_RESOURCE(hcamcorder); @@ -4013,7 +3908,7 @@ static int __mmcamcorder_resource_release_cb(mm_resource_manager_h rm, if (res == hcamcorder->video_encoder_resource) { /* Stop video recording */ if (_mmcamcorder_commit((MMHandleType)hcamcorder) != MM_ERROR_NONE) { - _mmcam_dbg_err("commit failed, cancel it"); + MMCAM_LOG_ERROR("commit failed, cancel it"); _mmcamcorder_cancel((MMHandleType)hcamcorder); } } else { @@ -4037,49 +3932,12 @@ static int __mmcamcorder_resource_release_cb(mm_resource_manager_h rm, _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); - _mmcam_dbg_warn("leave"); + MMCAM_LOG_WARNING("leave"); - return FALSE; + return TRUE; } #endif /* _MMCAMCORDER_MM_RM_SUPPORT */ - -#ifdef _MMCAMCORDER_RM_SUPPORT -rm_cb_result _mmcamcorder_rm_callback(int handle, rm_callback_type event_src, - rm_device_request_s *info, void* cb_data) -{ - mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(cb_data); - int current_state = MM_CAMCORDER_STATE_NONE; - rm_cb_result cb_res = RM_CB_RESULT_OK; - - mmf_return_val_if_fail((MMHandleType)hcamcorder, RM_CB_RESULT_OK); - - current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder); - - _mmcam_dbg_warn("current state %d (handle %p)", current_state, hcamcorder); - - _MMCAMCORDER_LOCK_INTERRUPT(hcamcorder); - - /* set RM event code for sending it to application */ - hcamcorder->interrupt_code = event_src; - - _mmcam_dbg_log("RM conflict callback : event code 0x%x", event_src); - switch (event_src) { - case RM_CALLBACK_TYPE_RESOURCE_CONFLICT: - case RM_CALLBACK_TYPE_RESOURCE_CONFLICT_UD: - __mmcamcorder_force_stop(hcamcorder, _MMCAMCORDER_STATE_CHANGE_BY_RM); - break; - default: - break; - } - - _MMCAMCORDER_UNLOCK_INTERRUPT(hcamcorder); - - return cb_res; -} -#endif /* _MMCAMCORDER_RM_SUPPORT */ - - int _mmcamcorder_manage_external_storage_state(MMHandleType handle, int storage_state) { int ret = MM_ERROR_NONE; @@ -4089,12 +3947,12 @@ int _mmcamcorder_manage_external_storage_state(MMHandleType handle, int storage_ mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_INVALID_ARGUMENT); - _mmcam_dbg_warn("storage state %d", storage_state); + MMCAM_LOG_WARNING("storage state %d", storage_state); /* check storage state */ if (storage_state != STORAGE_STATE_UNMOUNTABLE && storage_state != STORAGE_STATE_REMOVED) { - _mmcam_dbg_warn("nothing to do"); + MMCAM_LOG_WARNING("nothing to do"); return MM_ERROR_NONE; } @@ -4103,16 +3961,16 @@ int _mmcamcorder_manage_external_storage_state(MMHandleType handle, int storage_ /* check recording state */ current_state = _mmcamcorder_get_state(handle); - _mmcam_dbg_warn("current_state %d", current_state); + MMCAM_LOG_WARNING("current_state %d", current_state); if (current_state < MM_CAMCORDER_STATE_RECORDING) { - _mmcam_dbg_warn("no recording now"); + MMCAM_LOG_WARNING("no recording now"); goto _MANAGE_DONE; } /* check storage type */ if (hcamcorder->storage_info.type != STORAGE_TYPE_EXTERNAL) { - _mmcam_dbg_warn("external storage is not used"); + MMCAM_LOG_WARNING("external storage is not used"); goto _MANAGE_DONE; } @@ -4128,7 +3986,7 @@ int _mmcamcorder_manage_external_storage_state(MMHandleType handle, int storage_ _MANAGE_DONE: _MMCAMCORDER_UNLOCK_INTERRUPT(hcamcorder); - _mmcam_dbg_warn("done - ret 0x%x", ret); + MMCAM_LOG_WARNING("done - ret 0x%x", ret); return ret; }