From 678cf657fb0b2c45a571a8185beca250973db901 Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Tue, 12 Nov 2024 14:19:52 +0900 Subject: [PATCH] Clean up code - Fix typo - Adjust log level - Add/remove log - Correct indentation - Replace error handling code by macro [Version] 1.3.3 [Issue Type] Clean up Change-Id: Ieeb81eac8319ce88c9c14a62c4ed114c1a7c8c0e Signed-off-by: Jeongmo Yang --- packaging/libmm-camcorder.spec | 2 +- src/mm_camcorder_internal.c | 10 ++--- src/mm_camcorder_rm.c | 79 ++++++++++++++++------------------ 3 files changed, 44 insertions(+), 47 deletions(-) diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec index 590112c..37602b9 100755 --- a/packaging/libmm-camcorder.spec +++ b/packaging/libmm-camcorder.spec @@ -1,6 +1,6 @@ Name: libmm-camcorder Summary: Camera and recorder library -Version: 1.3.2 +Version: 1.3.3 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/mm_camcorder_internal.c b/src/mm_camcorder_internal.c index fd4e76b..2f8af19 100644 --- a/src/mm_camcorder_internal.c +++ b/src/mm_camcorder_internal.c @@ -498,7 +498,7 @@ static gint __mmcamcorder_init_configure_video_capture(mmf_camcorder_t *hcamcord _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, - "UpdateCapsByRotation", + "UpdateCapsByStreamRotation", &hcamcorder->update_caps_by_stream_rotation); _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, @@ -1806,7 +1806,7 @@ int _mmcamcorder_set_video_capture_callback(MMHandleType handle, mm_camcorder_vi mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); if (callback == NULL) - MMCAM_LOG_WARNING("Video Capture Callback is disabled, because application sets it to NULLL"); + MMCAM_LOG_WARNING("Video Capture Callback is disabled, because application sets it to NULL"); if (!_MMCAMCORDER_TRYLOCK_VCAPTURE_CALLBACK(hcamcorder)) { MMCAM_LOG_WARNING("Application's video capture callback is running now"); @@ -3085,7 +3085,7 @@ int _mmcamcorder_gst_set_state(MMHandleType handle, GstElement *pipeline, GstSta MMCAM_LOG_INFO("Set state to %d - PREVIEW PIPELINE", target_state); state_lock = &_MMCAMCORDER_GET_GST_STATE_LOCK(handle); } else { - MMCAM_LOG_INFO("Set state to %d - ENDODE PIPELINE", target_state); + MMCAM_LOG_INFO("Set state to %d - ENCODE PIPELINE", target_state); state_lock = &_MMCAMCORDER_GET_GST_ENCODE_STATE_LOCK(handle); } @@ -3363,10 +3363,10 @@ static gboolean __mmcamcorder_handle_gst_error(MMHandleType handle, GstMessage * if (message->src) { msg_src_element = GST_ELEMENT_NAME(GST_ELEMENT_CAST(message->src)); - MMCAM_LOG_ERROR("-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 translated to error code : [0x%x]", msg_src_element, g_quark_to_string(error->domain), error->message, error->code, msg.param.code); } else { - MMCAM_LOG_ERROR("Domain : [%s] Error : [%s] Code : [%d] is tranlated to error code : [0x%x]", + MMCAM_LOG_ERROR("Domain : [%s] Error : [%s] Code : [%d] is translated to error code : [0x%x]", g_quark_to_string(error->domain), error->message, error->code, msg.param.code); } diff --git a/src/mm_camcorder_rm.c b/src/mm_camcorder_rm.c index cdb3696..34da9c3 100644 --- a/src/mm_camcorder_rm.c +++ b/src/mm_camcorder_rm.c @@ -40,18 +40,18 @@ static rm_cb_result __mmcamcorder_rm_callback(int handle, rm_callback_type event 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); + mmf_return_val_if_fail(hcamcorder, RM_CB_RESULT_OK); current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder); - MMCAM_LOG_WARNING("current state %d (handle %p)", current_state, hcamcorder); + MMCAM_LOG_WARNING("[handle:%p] state[%d], event[0x%x]", + hcamcorder, current_state, event_src); _MMCAMCORDER_LOCK_INTERRUPT(hcamcorder); /* set RM event code for sending it to application */ hcamcorder->interrupt_code = event_src; - MMCAM_LOG_INFO("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: @@ -63,6 +63,8 @@ static rm_cb_result __mmcamcorder_rm_callback(int handle, rm_callback_type event _MMCAMCORDER_UNLOCK_INTERRUPT(hcamcorder); + MMCAM_LOG_WARNING("done"); + return cb_res; } @@ -75,7 +77,6 @@ void _mmcamcorder_get_appid_bypid(int pid, char *name, size_t size) unsigned int ret_pos = 0; char *read = NULL; - mmf_return_if_fail(name); if (size > 0u) { @@ -88,7 +89,7 @@ void _mmcamcorder_get_appid_bypid(int pid, char *name, size_t size) cmdline = fopen(buf, "r"); if (NULL == cmdline) { - MMCAM_LOG_ERROR("File[%s] open failed", buf); + MMCAM_LOG_ERROR("[%s] open failed", buf); return; } @@ -96,57 +97,56 @@ void _mmcamcorder_get_appid_bypid(int pid, char *name, size_t size) fclose(cmdline); if (NULL == read) { - MMCAM_LOG_ERROR("File read failed"); + MMCAM_LOG_ERROR("[%s] read failed", buf); return; } for (buf_pos = 0; buf_pos < sizeof(buf); buf_pos++) { switch(buf[buf_pos]) { - case '\0': - name[ret_pos] = '\0'; - return; - case '/': - ret_pos = 0; - break; - default: - if (ret_pos < size) - name[ret_pos] = buf[buf_pos]; - - ret_pos++; - break; + case '\0': + name[ret_pos] = '\0'; + return; + case '/': + ret_pos = 0; + break; + default: + if (ret_pos < size) + name[ret_pos] = buf[buf_pos]; + + ret_pos++; + break; } } - } int _mmcamcorder_rm_create(MMHandleType handle) { int ret = RM_OK; - mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - if (!hcamcorder) { - MMCAM_LOG_ERROR("Not initialized"); - return MM_ERROR_CAMCORDER_NOT_INITIALIZED; - } + + mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); + memset(&hcamcorder->rci, 0x00, sizeof(rm_consumer_info)); + mm_camcorder_get_attributes(handle, NULL, MMCAM_CLIENT_PID, &hcamcorder->rci.app_pid, NULL); + _mmcamcorder_get_appid_bypid(hcamcorder->rci.app_pid, hcamcorder->rci.app_id, sizeof(hcamcorder->rci.app_id)); /* RM register */ /* NULL should be passed for the rci parameter if the application does not have "visibility" */ if (hcamcorder->rm_handle == 0) { ret = rm_register((rm_resource_cb)__mmcamcorder_rm_callback, - (void*)hcamcorder, - &(hcamcorder->rm_handle), - (hcamcorder->rci.app_id[0] != '\0') ? &hcamcorder->rci : NULL); + (void*)hcamcorder, &hcamcorder->rm_handle, + (hcamcorder->rci.app_id[0] != '\0' ? &hcamcorder->rci : NULL)); if (ret != RM_OK) { MMCAM_LOG_ERROR("rm_register fail ret = %d",ret); return MM_ERROR_RESOURCE_INTERNAL; } } + return MM_ERROR_NONE; } @@ -159,12 +159,9 @@ int _mmcamcorder_rm_allocate(MMHandleType handle) int resource_count = 0; int display_surface_type = MM_DISPLAY_SURFACE_OVERLAY; int camera_width = 0; - mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - if (!hcamcorder) { - MMCAM_LOG_ERROR("Not initialized"); - return MM_ERROR_CAMCORDER_NOT_INITIALIZED; - } + + mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); MMCAM_LOG_INFO("app id : %s", hcamcorder->rci.app_id); /* if the app_id is null, @@ -270,16 +267,18 @@ int _mmcamcorder_rm_deallocate(MMHandleType handle) mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); rm_device_return_s *r_devices; - if (!hcamcorder->rm_handle) { - MMCAM_LOG_ERROR("Resource is not initialized "); - return MM_ERROR_RESOURCE_NOT_INITIALIZED; - } + mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); + mmf_return_val_if_fail_warning(hcamcorder->rm_handle, MM_ERROR_CAMCORDER_NOT_INITIALIZED); r_devices = &hcamcorder->returned_devices; + MMCAM_LOG_INFO("allocated num[%d]", r_devices->allocated_num); + if (r_devices->allocated_num > 0) { memset(&requested, 0x0, sizeof(rm_device_request_s)); + requested.request_num = r_devices->allocated_num; + for (idx = 0; idx < requested.request_num; idx++) requested.device_id[idx] = r_devices->device_id[idx]; @@ -305,18 +304,16 @@ int _mmcamcorder_rm_deallocate(MMHandleType handle) int _mmcamcorder_rm_release(MMHandleType handle) { int rm_ret = RM_OK; - mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - if (!hcamcorder->rm_handle) { - MMCAM_LOG_ERROR("Resource is not initialized "); - return MM_ERROR_RESOURCE_NOT_INITIALIZED; - } + mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); + mmf_return_val_if_fail_warning(hcamcorder->rm_handle, MM_ERROR_CAMCORDER_NOT_INITIALIZED); /* unregister RM */ rm_ret = rm_unregister(hcamcorder->rm_handle); if (rm_ret != RM_OK) MMCAM_LOG_ERROR("rm_unregister() failed"); + hcamcorder->rm_handle = 0; return MM_ERROR_NONE; -- 2.34.1