Fix coverity issue

[platform/core/multimedia/libmm-camcorder.git] / src / mm_camcorder_internal.c

diff --git a/src/mm_camcorder_internal.c b/src/mm_camcorder_internal.c
index 61db73b..99eae25 100644 (file)
--- a/src/mm_camcorder_internal.c
+++ b/src/mm_camcorder_internal.c
@@ -485,19 +485,15 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info)
 
        /* get model name */
        sys_info_ret = system_info_get_platform_string("http://tizen.org/system/model_name", &hcamcorder->model_name);
-       if (hcamcorder->model_name) {
-               _mmcam_dbg_log("model name [%s], sys_info_ret 0x%x", hcamcorder->model_name, sys_info_ret);
-       } else {
-               _mmcam_dbg_warn("failed get model name, sys_info_ret 0x%x", sys_info_ret);
-       }
+
+       _mmcam_dbg_warn("model name [%s], ret 0x%x",
+               hcamcorder->model_name ? hcamcorder->model_name : "NULL", sys_info_ret);
 
        /* get software version */
        sys_info_ret = system_info_get_platform_string("http://tizen.org/system/build.string", &hcamcorder->software_version);
-       if (hcamcorder->software_version) {
-               _mmcam_dbg_log("software version [%s], sys_info_ret 0x%d", hcamcorder->software_version, sys_info_ret);
-       } else {
-               _mmcam_dbg_warn("failed get software version, sys_info_ret 0x%x", sys_info_ret);
-       }
+
+       _mmcam_dbg_warn("software version [%s], ret 0x%x",
+               hcamcorder->software_version ? hcamcorder->software_version : "NULL", sys_info_ret);
 
 #ifdef _MMCAMCORDER_MURPHY_SUPPORT
        if (info->videodev_type != MM_VIDEO_DEVICE_NONE) {
@@ -1123,9 +1119,8 @@ int _mmcamcorder_realize(MMHandleType handle)
 
                /* create resource set */
                ret = _mmcamcorder_resource_create_resource_set(&hcamcorder->resource_manager);
-               if (ret != MM_ERROR_NONE) {
+               if (ret != MM_ERROR_NONE)
                        goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
-               }
 
                hcamcorder->resource_manager.acquire_count = 0;
 
@@ -1301,14 +1296,8 @@ int _mmcamcorder_realize(MMHandleType handle)
 _ERR_CAMCORDER_CMD:
 #ifdef _MMCAMCORDER_MURPHY_SUPPORT
        /* release hw resources */
-       if (hcamcorder->type == MM_CAMCORDER_MODE_VIDEO_CAPTURE) {
-               int ret_resource = _mmcamcorder_resource_manager_release(&hcamcorder->resource_manager);
-               if (ret_resource == MM_ERROR_RESOURCE_INVALID_STATE) {
-                       _mmcam_dbg_warn("it could be in the middle of resource callback or there's no acquired resource");
-               } else if (ret_resource != MM_ERROR_NONE) {
-                       _mmcam_dbg_err("failed to release resource, ret_resource(0x%x)", ret_resource);
-               }
-       }
+       if (hcamcorder->type == MM_CAMCORDER_MODE_VIDEO_CAPTURE)
+               _mmcamcorder_resource_manager_release(&hcamcorder->resource_manager);
 #endif /* _MMCAMCORDER_MURPHY_SUPPORT */
 #ifdef _MMCAMCORDER_RM_SUPPORT
        if (hcamcorder->rm_handle) {
@@ -2066,10 +2055,7 @@ int _mmcamcorder_set_video_stream_callback(MMHandleType handle, mm_camcorder_vid
        if (callback == NULL)
                _mmcam_dbg_warn("Video Stream Callback is disabled, because application sets it to NULL");
 
-       if (!_MMCAMCORDER_TRYLOCK_VSTREAM_CALLBACK(hcamcorder)) {
-               _mmcam_dbg_warn("Application's video stream callback is running now");
-               return MM_ERROR_CAMCORDER_INVALID_CONDITION;
-       }
+       _MMCAMCORDER_LOCK_VSTREAM_CALLBACK(hcamcorder);
 
        hcamcorder->vstream_cb = callback;
        hcamcorder->vstream_cb_param = user_data;
@@ -3816,6 +3802,7 @@ void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder, int state_change_by_s
        int result = MM_ERROR_NONE;
        int cmd_try_count = 0;
        int current_state = MM_CAMCORDER_STATE_NONE;
+       _MMCamcorderMsgItem msg;
 
        mmf_return_if_fail(hcamcorder);
 
@@ -3842,6 +3829,33 @@ void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder, int state_change_by_s
        /* 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");
+
+               memset(&msg, 0x0, sizeof(_MMCamcorderMsgItem));
+
+               switch (state_change_by_system) {
+               case _MMCAMCORDER_STATE_CHANGE_BY_FOCUS:
+                       msg.id = MM_MESSAGE_CAMCORDER_STATE_CHANGE_STARTED_BY_ASM;
+                       break;
+               case _MMCAMCORDER_STATE_CHANGE_BY_RM:
+                       msg.id = MM_MESSAGE_CAMCORDER_STATE_CHANGE_STARTED_BY_RM;
+                       break;
+               case _MMCAMCORDER_STATE_CHANGE_BY_DPM:
+                       msg.id = MM_MESSAGE_CAMCORDER_STATE_CHANGE_STARTED_BY_SECURITY;
+                       break;
+               default:
+                       break;
+               }
+
+               if (msg.id != 0) {
+                       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);
+               }
+       }
+
        for (loop = 0 ; current_state > MM_CAMCORDER_STATE_NULL && loop < __MMCAMCORDER_CMD_ITERATE_MAX * 3 ; loop++) {
                itr_cnt = __MMCAMCORDER_CMD_ITERATE_MAX;
                switch (current_state) {
@@ -3887,9 +3901,8 @@ void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder, int state_change_by_s
                {
                        _mmcam_dbg_warn("Stop preview.");
 
-                       while ((itr_cnt--) && ((result = _mmcamcorder_stop((MMHandleType)hcamcorder)) != MM_ERROR_NONE)) {
+                       while ((itr_cnt--) && ((result = _mmcamcorder_stop((MMHandleType)hcamcorder)) != MM_ERROR_NONE))
                                _mmcam_dbg_warn("Can't stop preview.(%x)", result);
-                       }
 
                        break;
                }
@@ -3897,9 +3910,8 @@ void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder, int state_change_by_s
                {
                        _mmcam_dbg_warn("unrealize");
 
-                       if ((result = _mmcamcorder_unrealize((MMHandleType)hcamcorder)) != MM_ERROR_NONE) {
+                       if ((result = _mmcamcorder_unrealize((MMHandleType)hcamcorder)) != MM_ERROR_NONE)
                                _mmcam_dbg_warn("Can't unrealize.(%x)", result);
-                       }
 
                        break;
                }
@@ -3928,8 +3940,8 @@ static gboolean __mmcamcorder_handle_gst_error(MMHandleType handle, GstMessage *
        gchar *msg_src_element = NULL;
        _MMCamcorderSubContext *sc = NULL;
 
-       return_val_if_fail(hcamcorder, FALSE);
-       return_val_if_fail(error, FALSE);
+       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);
 
@@ -4041,7 +4053,7 @@ static gint __mmcamcorder_gst_handle_core_error(MMHandleType handle, int code, G
 static gint __mmcamcorder_gst_handle_library_error(MMHandleType handle, int code, GstMessage *message)
 {
        mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
-       return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
+       mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
 
        _mmcam_dbg_log("");
 
@@ -4231,8 +4243,8 @@ static gboolean __mmcamcorder_handle_gst_warning(MMHandleType handle, GstMessage
        gchar *debug = NULL;
        GError *err = NULL;
 
-       return_val_if_fail(hcamcorder, FALSE);
-       return_val_if_fail(error, FALSE);
+       mmf_return_val_if_fail(hcamcorder, FALSE);
+       mmf_return_val_if_fail(error, FALSE);
 
        _mmcam_dbg_log("");
 
@@ -4343,9 +4355,8 @@ rm_cb_result _mmcamcorder_rm_callback(int handle, rm_callback_type event_src,
        mmf_return_val_if_fail((MMHandleType)hcamcorder, RM_CB_RESULT_OK);
 
        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_dbg_warn("current state %d (handle %p)", current_state, hcamcorder);
 
        _MMCAMCORDER_LOCK_ASM(hcamcorder);