Code clean up

- Replace memory allocation method
- Check proper return value
- Remove unnecessary code

[Version] 1.1.4
[Issue Type] Clean up

Change-Id: I851cdcaa285071c4c96be4709b434047594ad543
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/packaging/capi-media-codec.spec b/packaging/capi-media-codec.spec
index db1a2540b3180b77a0b4bbf31f0237b70733db97..1b43307e6f90af7ad432265dd69fc73e7faa8d63 100644 (file)
--- a/packaging/capi-media-codec.spec
+++ b/packaging/capi-media-codec.spec
@@ -4,7 +4,7 @@
 
 Name:       capi-media-codec
 Summary:    A Media Codec library in Tizen Native API
-Version:    1.1.3
+Version:    1.1.4
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_codec.c b/src/media_codec.c
index 599cc49aee69f81d95a208a1c2e4914f73a07bb1..162cb84c05bd185c4ed23b56edea4da442d27176 100644 (file)
--- a/src/media_codec.c
+++ b/src/media_codec.c
@@ -128,23 +128,14 @@ int mediacodec_create(mediacodec_h *mediacodec)
 
        LOGD("mediacodec_create..");
 
-       handle = (mediacodec_s *)malloc(sizeof(mediacodec_s));
-       if (handle != NULL) {
-               memset(handle, 0 , sizeof(mediacodec_s));
-       } else {
-               LOGE("MEDIACODEC_ERROR_OUT_OF_MEMORY(0x%08x)", MEDIACODEC_ERROR_OUT_OF_MEMORY); //LCOV_EXCL_LINE
-               return MEDIACODEC_ERROR_OUT_OF_MEMORY;
-       }
+       handle = g_new0(mediacodec_s, 1);
 
        ret = mc_create(&handle->mc_handle);
-       if (ret != MEDIACODEC_ERROR_NONE) {
+       if (ret != MC_ERROR_NONE) {
 //LCOV_EXCL_START
-               LOGE("MEDIACODEC_ERROR_INVALID_OPERATION(0x%08x)", MEDIACODEC_ERROR_INVALID_OPERATION); //LCOV_EXCL_LINE
-               handle->state = MEDIACODEC_STATE_NONE;
-               g_free(handle->mc_handle);
+               LOGE("MEDIACODEC_ERROR_INVALID_OPERATION(0x%08x)", MEDIACODEC_ERROR_INVALID_OPERATION);
                g_free(handle);
-               handle = NULL;
-               return MEDIACODEC_ERROR_INVALID_OPERATION;
+               return __convert_error_code(ret, (char *)__FUNCTION__);
 //LCOV_EXCL_STOP
        }
 
@@ -159,13 +150,11 @@ int mediacodec_create(mediacodec_h *mediacodec)
        ret = mediacodec_resource_create(handle);
        if (ret != MEDIACODEC_ERROR_NONE) {
 //LCOV_EXCL_START
-               handle->state = MEDIACODEC_STATE_NONE;
-               if (mc_destroy(handle->mc_handle) != MEDIACODEC_ERROR_NONE) {
-                       LOGE("MEDIACODEC_ERROR_INVALID_OPERATION(0x%08x)", MEDIACODEC_ERROR_INVALID_OPERATION);
-                       return MEDIACODEC_ERROR_INVALID_OPERATION;
-               }
+               if (mc_destroy(handle->mc_handle) != MC_ERROR_NONE)
+                       LOGW("mc_destroy failed");
+
                g_free(handle);
-               return __convert_error_code(ret, (char *)__FUNCTION__);
+               return ret;
 //LCOV_EXCL_STOP
        }
 #endif
@@ -185,22 +174,22 @@ int mediacodec_destroy(mediacodec_h mediacodec)
        MEDIACODEC_INSTANCE_CHECK(mediacodec);
        mediacodec_s *handle = (mediacodec_s *)mediacodec;
 
-       int ret = mc_destroy(handle->mc_handle);
-       if (ret != MEDIACODEC_ERROR_NONE) {
-               LOGE("MEDIACODEC_ERROR_INVALID_OPERATION(0x%08x)", MEDIACODEC_ERROR_INVALID_OPERATION); //LCOV_EXCL_LINE
-               return MEDIACODEC_ERROR_INVALID_OPERATION;
-       }
+       int ret = 0;
 
 #ifdef RM_COMMON
        ret = mediacodec_resource_release(handle);
-       if (ret != MEDIACODEC_ERROR_NONE) {
-               return __convert_error_code(ret, (char *)__FUNCTION__);
-       }
+       if (ret != MEDIACODEC_ERROR_NONE)
+               return ret;
 #endif
 
+       ret = mc_destroy(handle->mc_handle);
+       if (ret != MC_ERROR_NONE)
+               return __convert_error_code(ret, (char *)__FUNCTION__);
+
        handle->state = MEDIACODEC_STATE_NONE;
-       free(handle);
-       handle = NULL;
+
+       g_free(handle);
+
        return MEDIACODEC_ERROR_NONE;
 
 }

diff --git a/src/media_codec_port.c b/src/media_codec_port.c
index 58ec20ceff65cc9cb3a772ff221b854ebfdf074e..45b4390897dd96053a5233eb33d6f71feedb4ac1 100644 (file)
--- a/src/media_codec_port.c
+++ b/src/media_codec_port.c
@@ -36,14 +36,7 @@ int mc_create(MMHandleType *mediacodec)
        int ret = MC_ERROR_NONE;
 
        /* alloc mediacodec structure */
-       new_mediacodec = (mc_handle_t *)g_malloc(sizeof(mc_handle_t));
-
-       if (!new_mediacodec) {
-               LOGE("Cannot allocate memory for mediacodec");
-               ret = MC_ERROR;
-               goto ERROR;
-       }
-       memset(new_mediacodec, 0, sizeof(mc_handle_t));
+       new_mediacodec = g_new0(mc_handle_t, 1);
 
        new_mediacodec->is_encoder = false;
        new_mediacodec->is_video = false;
@@ -63,8 +56,10 @@ int mc_create(MMHandleType *mediacodec)
        /* load ini files */
        if (!mc_ini.loaded) {
                ret = mc_ini_load(&mc_ini);
-               if (ret != MC_ERROR_NONE)
-                       goto ERROR;
+               if (ret != MC_ERROR_NONE) {
+                       g_free(new_mediacodec);
+                       return ret;
+               }
 
                mc_ini.loaded = TRUE;
        }
@@ -79,20 +74,15 @@ int mc_create(MMHandleType *mediacodec)
 
        *mediacodec = (MMHandleType)new_mediacodec;
 
-       return ret;
-
-ERROR:
-       g_free(new_mediacodec);
-       return MC_INVALID_ARG;
+       return MC_ERROR_NONE;
 }
 
 int mc_destroy(MMHandleType mediacodec)
 {
-       int ret = MC_ERROR_NONE;
        mc_handle_t *mc_handle = (mc_handle_t *) mediacodec;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }
 
@@ -112,9 +102,9 @@ int mc_destroy(MMHandleType mediacodec)
                mc_handle->extra_converter.name = NULL;
        }
 
-       g_free((void *)mc_handle);
+       g_free(mc_handle);
 
-       return ret;
+       return MC_ERROR_NONE;
 }
 
 int mc_set_codec(MMHandleType mediacodec, mediacodec_codec_type_e codec_id, int flags)
@@ -168,7 +158,7 @@ int mc_set_vdec_info(MMHandleType mediacodec, int width, int height)
        mc_handle_t* mc_handle = (mc_handle_t *)mediacodec;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }
 
@@ -194,7 +184,7 @@ int mc_set_venc_info(MMHandleType mediacodec, int width, int height, int fps, in
        mc_handle_t *mc_handle = (mc_handle_t *) mediacodec;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }
 
@@ -221,7 +211,7 @@ int mc_set_adec_info(MMHandleType mediacodec, int samplerate, int channel, int b
        mc_handle_t *mc_handle = (mc_handle_t *) mediacodec;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }
 
@@ -247,7 +237,7 @@ int mc_set_aenc_info(MMHandleType mediacodec, int samplerate, int channel, int b
        mc_handle_t * mc_handle = (mc_handle_t *) mediacodec;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }
 
@@ -401,7 +391,7 @@ int mc_prepare(MMHandleType mediacodec)
        mc_handle_t *mc_handle = (mc_handle_t *) mediacodec;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }
 
@@ -433,7 +423,7 @@ int mc_unprepare(MMHandleType mediacodec)
        mc_handle_t *mc_handle = (mc_handle_t *)mediacodec;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }
 
@@ -496,7 +486,7 @@ int mc_get_output(MMHandleType mediacodec, media_packet_h *outbuf, uint64_t time
        mc_handle_t *mc_handle = (mc_handle_t *) mediacodec;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }
 
@@ -530,7 +520,7 @@ int mc_flush_buffers(MMHandleType mediacodec)
        mc_handle_t *mc_handle = (mc_handle_t *)mediacodec;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }
 
@@ -564,7 +554,7 @@ int mc_get_supported_type(MMHandleType mediacodec, mediacodec_codec_type_e codec
        *support_type = 0;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }
 
@@ -589,7 +579,7 @@ int mc_set_empty_buffer_cb(MMHandleType mediacodec, mediacodec_input_buffer_used
        mc_handle_t *mc_handle = (mc_handle_t *)mediacodec;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }
 
@@ -616,7 +606,7 @@ int mc_unset_empty_buffer_cb(MMHandleType mediacodec)
        mc_handle_t *mc_handle = (mc_handle_t *)mediacodec;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }
 
@@ -632,7 +622,7 @@ int mc_set_fill_buffer_cb(MMHandleType mediacodec, mediacodec_output_buffer_avai
        mc_handle_t *mc_handle = (mc_handle_t *)mediacodec;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }
 
@@ -658,7 +648,7 @@ int mc_unset_fill_buffer_cb(MMHandleType mediacodec)
        mc_handle_t *mc_handle = (mc_handle_t *)mediacodec;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }
 
@@ -674,18 +664,18 @@ int mc_set_error_cb(MMHandleType mediacodec, mediacodec_error_cb callback, void
        mc_handle_t *mc_handle = (mc_handle_t *) mediacodec;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }
 
        if (mc_handle->user_cb[_MEDIACODEC_EVENT_TYPE_ERROR]) {
-               LOGE("Already set mediacodec_fill_buffer_cb\n");
+               LOGE("Already set mediacodec_fill_buffer_cb");
                return MC_PARAM_ERROR;
        } else {
                if (!callback)
                        return MC_INVALID_ARG;
 
-               LOGD("Set event handler callback(cb = %p, data = %p)\n", callback, user_data);
+               LOGD("Set event handler callback(cb = %p, data = %p)", callback, user_data);
 
                mc_handle->user_cb[_MEDIACODEC_EVENT_TYPE_ERROR] = (mc_error_cb) callback;
                mc_handle->user_data[_MEDIACODEC_EVENT_TYPE_ERROR] = user_data;
@@ -716,7 +706,7 @@ int mc_set_eos_cb(MMHandleType mediacodec, mediacodec_eos_cb callback, void *use
        mc_handle_t *mc_handle = (mc_handle_t *) mediacodec;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }
 
@@ -727,7 +717,7 @@ int mc_set_eos_cb(MMHandleType mediacodec, mediacodec_eos_cb callback, void *use
                if (!callback)
                        return MC_INVALID_ARG;
 
-               LOGD("Set event handler callback(cb = %p, data = %p)\n", callback, user_data);
+               LOGD("Set event handler callback(cb = %p, data = %p)", callback, user_data);
 
                mc_handle->user_cb[_MEDIACODEC_EVENT_TYPE_EOS] = (mc_eos_cb) callback;
                mc_handle->user_data[_MEDIACODEC_EVENT_TYPE_EOS] = user_data;
@@ -742,7 +732,7 @@ int mc_unset_eos_cb(MMHandleType mediacodec)
        mc_handle_t *mc_handle = (mc_handle_t *)mediacodec;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }
 
@@ -758,18 +748,18 @@ int mc_set_buffer_status_cb(MMHandleType mediacodec, mediacodec_buffer_status_cb
        mc_handle_t *mc_handle = (mc_handle_t *)mediacodec;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }
 
        if (mc_handle->user_cb[_MEDIACODEC_EVENT_TYPE_BUFFER_STATUS]) {
-               LOGE("Already set mediacodec_need_data_cb\n");
+               LOGE("Already set mediacodec_need_data_cb");
                return MC_PARAM_ERROR;
        } else {
                if (!callback)
                        return MC_INVALID_ARG;
 
-               LOGD("Set start feed callback(cb = %p, data = %p)\n", callback, user_data);
+               LOGD("Set start feed callback(cb = %p, data = %p)", callback, user_data);
 
                mc_handle->user_cb[_MEDIACODEC_EVENT_TYPE_BUFFER_STATUS] = (mc_buffer_status_cb) callback;
                mc_handle->user_data[_MEDIACODEC_EVENT_TYPE_BUFFER_STATUS] = user_data;
@@ -784,7 +774,7 @@ int mc_unset_buffer_status_cb(MMHandleType mediacodec)
        mc_handle_t *mc_handle = (mc_handle_t *)mediacodec;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }
 
@@ -799,7 +789,7 @@ int mc_enable_extra_video_converter(MMHandleType mediacodec, gboolean enable, co
        mc_handle_t *mc_handle = (mc_handle_t *) mediacodec;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }
 
@@ -869,7 +859,7 @@ int mc_get_packet_pool(MMHandleType mediacodec, media_packet_pool_h *pool)
        mc_handle_t *mc_handle = (mc_handle_t *)mediacodec;
 
        if (!mc_handle) {
-               LOGE("fail invaild param\n");
+               LOGE("fail invaild param");
                return MC_INVALID_ARG;
        }