From 0348ed68d6aeccc33ff96f0cc426d53b6e584532 Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Fri, 17 Feb 2017 19:07:51 +0900 Subject: [PATCH] Change log level for some messages [Version] 0.10.106 [Profile] Common [Issue Type] Update [Dependency module] N/A [Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-3.0-mobile_20170210.1] Change-Id: I58327e49b21d1eca81ce7954a8bee1b83e6b4fe8 Signed-off-by: Jeongmo Yang --- packaging/libmm-camcorder.spec | 2 +- src/mm_camcorder_internal.c | 34 +++++++++++++++++++--------------- src/mm_camcorder_resource.c | 20 ++++++++++---------- src/mm_camcorder_util.c | 18 ++++++++++++------ 4 files changed, 42 insertions(+), 32 deletions(-) diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec index 61f2384..b487f48 100644 --- a/packaging/libmm-camcorder.spec +++ b/packaging/libmm-camcorder.spec @@ -1,6 +1,6 @@ Name: libmm-camcorder Summary: Camera and recorder library -Version: 0.10.107 +Version: 0.10.108 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/mm_camcorder_internal.c b/src/mm_camcorder_internal.c index a97aa5c..a32c699 100644 --- a/src/mm_camcorder_internal.c +++ b/src/mm_camcorder_internal.c @@ -3281,7 +3281,7 @@ void _mmcamcorder_sound_focus_cb(int id, mm_sound_focus_type_e focus_type, return; } - _mmcam_dbg_log("sound focus callback : focus state %d, reason %s", + _mmcam_dbg_warn("sound focus callback : focus state %d, reason %s", focus_state, reason_for_change ? reason_for_change : "N/A"); if (hcamcorder->session_flags & MM_SESSION_OPTION_UNINTERRUPTIBLE) { @@ -3309,26 +3309,26 @@ void _mmcamcorder_sound_focus_cb(int id, mm_sound_focus_type_e focus_type, if (focus_state == FOCUS_IS_RELEASED) { hcamcorder->acquired_focus &= ~focus_type; - _mmcam_dbg_log("FOCUS is released [type %d, remained focus %d] : Stop pipeline[state:%d]", + _mmcam_dbg_warn("FOCUS is released [type %d, remained focus %d] : Stop pipeline[state:%d]", focus_type, hcamcorder->acquired_focus, current_state); __mmcamcorder_force_stop(hcamcorder); - _mmcam_dbg_log("Finish opeartion. Pipeline is released"); + _mmcam_dbg_warn("Finish opeartion. Pipeline is released"); } else if (focus_state == FOCUS_IS_ACQUIRED) { _MMCamcorderMsgItem msg; hcamcorder->acquired_focus |= focus_type; - _mmcam_dbg_log("FOCUS is acquired [type %d, new focus %d]", + _mmcam_dbg_warn("FOCUS is acquired [type %d, new focus %d]", focus_type, hcamcorder->acquired_focus); msg.id = MM_MESSAGE_READY_TO_RESUME; _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg); - _mmcam_dbg_log("Finish opeartion"); + _mmcam_dbg_warn("Finish opeartion"); } else { - _mmcam_dbg_log("unknown focus state %d", focus_state); + _mmcam_dbg_warn("unknown focus state %d", focus_state); } /* restore value */ @@ -3336,6 +3336,8 @@ void _mmcamcorder_sound_focus_cb(int id, mm_sound_focus_type_e focus_type, _MMCAMCORDER_UNLOCK_ASM(hcamcorder); + _mmcam_dbg_warn("done"); + return; } @@ -3346,17 +3348,17 @@ void _mmcamcorder_sound_signal_callback(mm_sound_signal_name_t signal, int value mmf_return_if_fail(hcamcorder); - _mmcam_dbg_log("sound signal %d - value %d", signal, value); + _mmcam_dbg_warn("sound signal %d - value %d", signal, value); _MMCAMCORDER_LOCK_ASM(hcamcorder); if (signal == MM_SOUND_SIGNAL_RELEASE_INTERNAL_FOCUS && value == 1) { - _mmcam_dbg_log("watch cb id %d", hcamcorder->sound_focus_watch_id); + _mmcam_dbg_warn("watch cb id %d", hcamcorder->sound_focus_watch_id); /* unregister watch callback */ if (hcamcorder->sound_focus_watch_id > 0) { mm_sound_unset_focus_watch_callback(hcamcorder->sound_focus_watch_id); - _mmcam_dbg_log("unset watch cb done"); + _mmcam_dbg_warn("unset watch cb done"); hcamcorder->sound_focus_watch_id = 0; } } @@ -3387,7 +3389,7 @@ void _mmcamcorder_sound_focus_watch_cb(int id, mm_sound_focus_type_e focus_type, return; } - _mmcam_dbg_log("sound focus watch callback : id %d, focus state %d, reason %s", + _mmcam_dbg_warn("sound focus watch callback : id %d, focus state %d, reason %s", id, focus_state, reason_for_change ? reason_for_change : "N/A"); if (hcamcorder->session_flags & MM_SESSION_OPTION_UNINTERRUPTIBLE) { @@ -3415,20 +3417,20 @@ void _mmcamcorder_sound_focus_watch_cb(int id, mm_sound_focus_type_e focus_type, if (focus_state == FOCUS_IS_RELEASED) { _MMCamcorderMsgItem msg; - _mmcam_dbg_log("other process's FOCUS is released"); + _mmcam_dbg_warn("other process's FOCUS is released"); msg.id = MM_MESSAGE_READY_TO_RESUME; _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg); - _mmcam_dbg_log("Finish opeartion"); + _mmcam_dbg_warn("Finish opeartion"); } else if (focus_state == FOCUS_IS_ACQUIRED) { - _mmcam_dbg_log("other process's FOCUS is acquired : Stop pipeline[state:%d]", current_state); + _mmcam_dbg_warn("other process's FOCUS is acquired : Stop pipeline[state:%d]", current_state); __mmcamcorder_force_stop(hcamcorder); - _mmcam_dbg_log("Finish opeartion. Pipeline is released"); + _mmcam_dbg_warn("Finish opeartion. Pipeline is released"); } else { - _mmcam_dbg_log("unknown focus state %d", focus_state); + _mmcam_dbg_warn("unknown focus state %d", focus_state); } /* restore value */ @@ -3436,6 +3438,8 @@ void _mmcamcorder_sound_focus_watch_cb(int id, mm_sound_focus_type_e focus_type, _MMCAMCORDER_UNLOCK_ASM(hcamcorder); + _mmcam_dbg_warn("done"); + return; } diff --git a/src/mm_camcorder_resource.c b/src/mm_camcorder_resource.c index f472296..1b76787 100644 --- a/src/mm_camcorder_resource.c +++ b/src/mm_camcorder_resource.c @@ -86,13 +86,13 @@ static void __mmcamcorder_resource_state_callback(mrp_res_context_t *context, mr mmf_return_if_fail((MMHandleType)camcorder); mmf_return_if_fail(context); - _mmcam_dbg_log("enter - state %d", context->state); + _mmcam_dbg_warn("enter - state %d", context->state); _MMCAMCORDER_LOCK_RESOURCE(camcorder); switch (context->state) { case MRP_RES_CONNECTED: - _mmcam_dbg_log(" - connected to Murphy"); + _mmcam_dbg_warn(" - connected to Murphy"); if ((rset = mrp_res_list_resources(context)) != NULL) { mrp_res_string_array_t *resource_names; resource_names = mrp_res_list_resource_names(rset); @@ -104,7 +104,7 @@ static void __mmcamcorder_resource_state_callback(mrp_res_context_t *context, mr for (i = 0; i < resource_names->num_strings; i++) { resource = mrp_res_get_resource_by_name(rset, resource_names->strings[i]); if (resource) - _mmcam_dbg_log(" - available resource: %s", resource->name); + _mmcam_dbg_warn(" - available resource: %s", resource->name); } mrp_res_free_string_array(resource_names); } @@ -142,7 +142,7 @@ static void __mmcamcorder_resource_state_callback(mrp_res_context_t *context, mr _MMCAMCORDER_UNLOCK_RESOURCE(camcorder); - _mmcam_dbg_log("leave"); + _mmcam_dbg_warn("leave"); return; } @@ -172,14 +172,14 @@ static void __mmcamcorder_resource_set_state_callback(mrp_res_context_t *cx, con if (res == NULL) { _mmcam_dbg_warn(" -- %s not present in resource set", mm_camcorder_resource_str[i]); } else { - _mmcam_dbg_log(" -- resource name [%s] -> [%s]", + _mmcam_dbg_warn(" -- resource name [%s] -> [%s]", res->name, __mmcamcorder_resource_state_to_str(res->state)); if (res->state == MRP_RES_RESOURCE_ACQUIRED) { camcorder->resource_manager.acquire_remain--; if (camcorder->resource_manager.acquire_remain <= 0) { - _mmcam_dbg_log("send signal - resource acquire done"); + _mmcam_dbg_warn("send signal - resource acquire done"); _MMCAMCORDER_RESOURCE_SIGNAL(camcorder); } else { _mmcam_dbg_warn("remained acquire count %d", @@ -189,13 +189,13 @@ static void __mmcamcorder_resource_set_state_callback(mrp_res_context_t *cx, con camcorder->resource_manager.acquire_remain++; if (camcorder->resource_manager.acquire_remain >= camcorder->resource_manager.acquire_count) { - _mmcam_dbg_log("resource release done"); + _mmcam_dbg_warn("resource release done"); if (camcorder->state > MM_CAMCORDER_STATE_NULL) { - _mmcam_dbg_log("send resource signal"); + _mmcam_dbg_warn("send resource signal"); _MMCAMCORDER_RESOURCE_SIGNAL(camcorder); } else { - _mmcam_dbg_log("skip resource signal - state %d", camcorder->state); + _mmcam_dbg_warn("skip resource signal - state %d", camcorder->state); } } else { _mmcam_dbg_warn("acquired %d, lost %d", @@ -250,7 +250,7 @@ static void __mmcamcorder_resource_release_cb(mrp_res_context_t *cx, const mrp_r if (res == NULL) { _mmcam_dbg_warn(" -- %s not present in resource set", mm_camcorder_resource_str[i]); } else { - _mmcam_dbg_log(" -- resource name [%s] -> [%s]", res->name, __mmcamcorder_resource_state_to_str(res->state)); + _mmcam_dbg_warn(" -- resource name [%s] -> [%s]", res->name, __mmcamcorder_resource_state_to_str(res->state)); } } diff --git a/src/mm_camcorder_util.c b/src/mm_camcorder_util.c index b490600..0e6bc3f 100644 --- a/src/mm_camcorder_util.c +++ b/src/mm_camcorder_util.c @@ -105,14 +105,14 @@ static int __gdbus_method_call_sync(GDBusConnection *conn, const char *bus_name, return MM_ERROR_INVALID_ARGUMENT; } - _mmcam_dbg_log("Dbus call - obj [%s], iface [%s], method [%s]", object, iface, method); + _mmcam_dbg_warn("Dbus call - obj [%s], iface [%s], method [%s]", object, iface, method); if (is_sync) { dbus_reply = g_dbus_connection_call_sync(conn, bus_name, object, iface, method, args, NULL, G_DBUS_CALL_FLAGS_NONE, G_DBUS_TIMEOUT, NULL, NULL); if (dbus_reply) { - _mmcam_dbg_log("Method Call '%s.%s' Success", iface, method); + _mmcam_dbg_warn("Method Call '%s.%s' Success", iface, method); *result = dbus_reply; } else { _mmcam_dbg_err("dbus method call sync reply failed"); @@ -123,6 +123,8 @@ static int __gdbus_method_call_sync(GDBusConnection *conn, const char *bus_name, G_DBUS_CALL_FLAGS_NONE, G_DBUS_TIMEOUT, NULL, NULL, NULL); } + _mmcam_dbg_warn("done"); + return ret; } @@ -164,7 +166,7 @@ static void __gdbus_stream_eos_cb(GDBusConnection *connection, _MMCamcorderGDbusCbInfo *gdbus_info = NULL; mmf_camcorder_t *hcamcorder = NULL; - _mmcam_dbg_log("entered"); + _mmcam_dbg_warn("entered"); if (!param || !user_data) { _mmcam_dbg_err("invalid parameter %p %p", param, user_data); @@ -178,7 +180,7 @@ static void __gdbus_stream_eos_cb(GDBusConnection *connection, g_mutex_lock(&gdbus_info->sync_mutex); - _mmcam_dbg_log("gdbus_info->param %d, played_idx : %d, handle : %p", + _mmcam_dbg_warn("gdbus_info->param %d, played_idx : %d, handle : %p", gdbus_info->param, played_idx, hcamcorder); if (gdbus_info->param == played_idx) { @@ -193,6 +195,8 @@ static void __gdbus_stream_eos_cb(GDBusConnection *connection, g_mutex_unlock(&gdbus_info->sync_mutex); + _mmcam_dbg_warn("done"); + return; } @@ -208,7 +212,7 @@ static int __gdbus_wait_for_cb_return(_MMCamcorderGDbusCbInfo *gdbus_info, int t g_mutex_lock(&gdbus_info->sync_mutex); - _mmcam_dbg_log("entered"); + _mmcam_dbg_warn("entered"); if (gdbus_info->is_playing == FALSE) { _mmcam_dbg_log("callback is already returned"); @@ -219,7 +223,7 @@ static int __gdbus_wait_for_cb_return(_MMCamcorderGDbusCbInfo *gdbus_info, int t end_time = g_get_monotonic_time() + (time_out * G_TIME_SPAN_MILLISECOND); if (g_cond_wait_until(&gdbus_info->sync_cond, &gdbus_info->sync_mutex, end_time)) { - _mmcam_dbg_log("wait signal received"); + _mmcam_dbg_warn("wait signal received"); } else { _mmcam_dbg_err("wait time is expired"); ret = MM_ERROR_CAMCORDER_RESPONSE_TIMEOUT; @@ -227,6 +231,8 @@ static int __gdbus_wait_for_cb_return(_MMCamcorderGDbusCbInfo *gdbus_info, int t g_mutex_unlock(&gdbus_info->sync_mutex); + _mmcam_dbg_warn("done"); + return ret; } -- 2.7.4