Modified error handling in mediamuxer null check macros

Change-Id: Id8c8b715562d89698338759814ea8bcc0c408897
Signed-off-by: Mahesh Kondiparthi <kd.mahesh@samsung.com>

diff --git a/include/mediamuxer_error.h b/include/mediamuxer_error.h
index 853296c..7473e74 100755 (executable)
--- a/include/mediamuxer_error.h
+++ b/include/mediamuxer_error.h
@@ -102,7 +102,7 @@ typedef enum {
        MX_ERROR = -1,                  /**< muxer happens error */
        MX_MEMORY_ERROR = -2,           /**< muxer memory is not enough */
        MX_PARAM_ERROR = -3,            /**< muxer parameter is error */
-       MX_INVALID_ARG = -4,            /**< muxer has invalid arguments */
+       MX_INVALID_ARGUMENT = -4,       /**< muxer has invalid arguments */
        MX_PERMISSION_DENIED = -5,
        MX_INVALID_STATUS = -6,         /**< muxer works at invalid status */
        MX_NOT_SUPPORTED = -7,          /**< muxer can't support this specific video format */

diff --git a/include/mediamuxer_util.h b/include/mediamuxer_util.h
index dff07bc..7ea22aa 100755 (executable)
--- a/include/mediamuxer_util.h
+++ b/include/mediamuxer_util.h
@@ -73,8 +73,8 @@ extern "C" {
 #define MEDIAMUXER_CHECK_NULL(x_var) \
        do { \
                if (!x_var) { \
-                       MX_E("[%s] is NULL\n", #x_var); \
-                       goto ERROR; \
+                        MX_E("[%s] is NULL, Line_No:%x\n", #x_var, __LINE__); \
+                        return MX_INVALID_ARGUMENT; \
                } \
        } while (0)
 #define MEDIAMUXER_CHECK_SET_AND_PRINT(x_var, x_cond, ret, ret_val, err_text)\
@@ -82,7 +82,8 @@ extern "C" {
                if (x_var != x_cond) { \
                        ret = ret_val; \
                        MX_E("%s\n", #err_text); \
-                       goto ERROR; \
+                       MEDIAMUXER_FLEAVE(); \
+                       return ret; \
                } \
        } while (0)
 #ifdef __cplusplus

diff --git a/src/mediamuxer_port.c b/src/mediamuxer_port.c
index d22d6c4..777a8be 100644 (file)
--- a/src/mediamuxer_port.c
+++ b/src/mediamuxer_port.c
@@ -42,7 +42,7 @@ register_port register_port_func[] = {
 
 int mx_create(MMHandleType *muxer)
 {
-       int result = MX_ERROR_NONE;
+       int ret = MX_ERROR_NONE;
        media_port_muxer_ops *pOps = NULL;
        mx_handle_t *new_muxer = NULL;
        MEDIAMUXER_FENTER();
@@ -52,32 +52,36 @@ int mx_create(MMHandleType *muxer)
 
        /* alloc ops structure */
        pOps = (media_port_muxer_ops *) g_malloc(sizeof(media_port_muxer_ops));
-       MEDIAMUXER_CHECK_NULL(pOps);
+       if (pOps == NULL) {
+               ret = MX_INVALID_ARGUMENT;
+               goto ERROR;
+       }
 
        new_muxer->muxer_ops = pOps;
        MX_I("mx_create allocating new_muxer->muxer_ops %p:\n",
             new_muxer->muxer_ops);
        pOps->n_size = sizeof(media_port_muxer_ops);
        /* load ini files */
-       result = mx_ini_load(&new_muxer->ini);
-       MEDIAMUXER_CHECK_SET_AND_PRINT(result, MX_ERROR_NONE, result,
-                                       MX_COURRPTED_INI, "can't load ini");
+       ret = mx_ini_load(&new_muxer->ini);
+       if (ret != MX_ERROR_NONE) {
+               ret = MX_COURRPTED_INI;
+               goto ERROR;
+       }
 
        register_port_func[new_muxer->ini.port_type](pOps);
-       result = pOps->init(&new_muxer->mxport_handle);
-       MEDIAMUXER_CHECK_SET_AND_PRINT(result, MX_ERROR_NONE, result,
+       ret = pOps->init(&new_muxer->mxport_handle);
+       MEDIAMUXER_CHECK_SET_AND_PRINT(ret, MX_ERROR_NONE, ret,
                                        MX_NOT_INITIALIZED, "mx_create failed");
        *muxer = (MMHandleType) new_muxer;
        MEDIAMUXER_FLEAVE();
-       return result;
+       return ret;
 ERROR:
-       *muxer = (MMHandleType) 0;
        if (pOps)
                g_free(pOps);
        if (new_muxer)
                g_free(new_muxer);
        MEDIAMUXER_FLEAVE();
-       return result;
+       return ret;
 }
 
 int mx_set_data_sink(MMHandleType mediamuxer, char *uri, mediamuxer_output_format_e format)
@@ -91,10 +95,6 @@ int mx_set_data_sink(MMHandleType mediamuxer, char *uri, mediamuxer_output_forma
        ret = pOps->set_data_sink(mx_handle->mxport_handle, uri, format);
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       ret = MX_ERROR_INVALID_ARGUMENT;
-       MEDIAMUXER_FLEAVE();
-       return ret;
 }
 
 int mx_add_track(MMHandleType mediamuxer, media_format_h media_format, int *track_index)
@@ -110,9 +110,6 @@ int mx_add_track(MMHandleType mediamuxer, media_format_h media_format, int *trac
                                        "error while adding track");
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       MEDIAMUXER_FLEAVE();
-       return ret;
 }
 
 int mx_prepare(MMHandleType mediamuxer)
@@ -128,9 +125,6 @@ int mx_prepare(MMHandleType mediamuxer)
                                        "error while preparing");
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       MEDIAMUXER_FLEAVE();
-       return ret;
 }
 
 int mx_start(MMHandleType mediamuxer)
@@ -146,9 +140,6 @@ int mx_start(MMHandleType mediamuxer)
                                        "error while starting");
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       MEDIAMUXER_FLEAVE();
-       return ret;
 }
 
 int mx_write_sample(MMHandleType mediamuxer, int track_index, media_packet_h inbuf)
@@ -164,9 +155,6 @@ int mx_write_sample(MMHandleType mediamuxer, int track_index, media_packet_h inb
                                        "error while writing sample");
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       MEDIAMUXER_FLEAVE();
-       return ret;
 }
 
 int mx_close_track(MMHandleType mediamuxer, int track_index)
@@ -182,9 +170,6 @@ int mx_close_track(MMHandleType mediamuxer, int track_index)
                                        "error while closing track");
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       MEDIAMUXER_FLEAVE();
-       return ret;
 }
 
 int mx_pause(MMHandleType mediamuxer)
@@ -200,9 +185,6 @@ int mx_pause(MMHandleType mediamuxer)
                                        "error while pausing");
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       MEDIAMUXER_FLEAVE();
-       return ret;
 }
 
 int mx_resume(MMHandleType mediamuxer)
@@ -218,9 +200,6 @@ int mx_resume(MMHandleType mediamuxer)
                                        "error while resuming");
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       MEDIAMUXER_FLEAVE();
-       return ret;
 }
 
 int mx_stop(MMHandleType mediamuxer)
@@ -236,9 +215,6 @@ int mx_stop(MMHandleType mediamuxer)
                                        "error while stopping");
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       MEDIAMUXER_FLEAVE();
-       return ret;
 }
 
 int mx_unprepare(MMHandleType mediamuxer)
@@ -254,9 +230,6 @@ int mx_unprepare(MMHandleType mediamuxer)
                                        "error while destroying");
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       MEDIAMUXER_FLEAVE();
-       return ret;
 }
 
 int mx_destroy(MMHandleType mediamuxer)
@@ -282,7 +255,6 @@ int mx_destroy(MMHandleType mediamuxer)
                g_free((void *)mx_handle);
                mx_handle = NULL;
        }
-ERROR:
        MEDIAMUXER_FLEAVE();
        return ret;
 }
@@ -301,8 +273,4 @@ int mx_set_error_cb(MMHandleType muxer,
                        MX_ERROR, "error while setting error call back");
        MEDIAMUXER_FLEAVE();
        return result;
-ERROR:
-       result = MX_ERROR_INVALID_ARGUMENT;
-       MEDIAMUXER_FLEAVE();
-       return result;
 }

diff --git a/src/port_custom/mediamuxer_port_custom.c b/src/port_custom/mediamuxer_port_custom.c
index 887be98..036778c 100644 (file)
--- a/src/port_custom/mediamuxer_port_custom.c
+++ b/src/port_custom/mediamuxer_port_custom.c
@@ -45,9 +45,6 @@ int custom_port_register(media_port_muxer_ops *pOps)
 
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       ret = MX_ERROR_INVALID_ARGUMENT;
-       return ret;
 }
 
 static int custom_muxer_init(MMHandleType *pHandle)

diff --git a/src/port_ffmpeg/mediamuxer_port_ffmpeg.c b/src/port_ffmpeg/mediamuxer_port_ffmpeg.c
index 54d23f9..0197667 100644 (file)
--- a/src/port_ffmpeg/mediamuxer_port_ffmpeg.c
+++ b/src/port_ffmpeg/mediamuxer_port_ffmpeg.c
@@ -45,9 +45,6 @@ int ffmpeg_port_register(media_port_muxer_ops *pOps)
 
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       ret = MX_ERROR_INVALID_ARGUMENT;
-       return ret;
 }
 
 static int ffmpeg_muxer_init(MMHandleType *pHandle)

diff --git a/src/port_gst/mediamuxer_port_gst.c b/src/port_gst/mediamuxer_port_gst.c
index 78bbe78..a62dd54 100755 (executable)
--- a/src/port_gst/mediamuxer_port_gst.c
+++ b/src/port_gst/mediamuxer_port_gst.c
@@ -75,10 +75,6 @@ int gst_port_register(media_port_muxer_ops *pOps)
 
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       ret = MX_ERROR_INVALID_ARGUMENT;
-       MEDIAMUXER_FLEAVE();
-       return ret;
 }
 
 static int gst_muxer_init(MMHandleType *pHandle)
@@ -127,10 +123,6 @@ static int gst_muxer_set_data_sink(MMHandleType pHandle,
        mx_handle_gst->muxed_format = format;
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       MX_E("muxer handle already NULL, returning \n");
-       MEDIAMUXER_FLEAVE();
-       return ret;
 }
 
 static int gst_muxer_add_track(MMHandleType pHandle,
@@ -217,10 +209,6 @@ static int gst_muxer_add_track(MMHandleType pHandle,
        }
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       MX_E(" gst_muxer_add_track failed \n");
-       MEDIAMUXER_FLEAVE();
-       return ret;
 }
 
 static gint __gst_handle_resource_error(mxgst_handle_t* gst_handle, int code)
@@ -641,11 +629,6 @@ static int gst_muxer_prepare(MMHandleType pHandle)
        ret = _gst_create_pipeline(new_mediamuxer);
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       MX_E("muxer handle NULL, returning \n");
-       ret = MX_ERROR_INVALID_ARGUMENT;
-       MEDIAMUXER_FLEAVE();
-       return ret;
 }
 
 static int gst_muxer_start(MMHandleType pHandle)
@@ -669,11 +652,6 @@ STATE_CHANGE_FAILED:
        ret = MX_ERROR_INVALID_ARGUMENT;
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       MX_E("muxer handle NULL, returning \n");
-       ret = MX_ERROR_INVALID_ARGUMENT;
-       MEDIAMUXER_FLEAVE();
-       return ret;
 }
 
 int __gst_codec_specific_caps(GstCaps *new_cap,
@@ -1207,10 +1185,6 @@ static int gst_muxer_pause(MMHandleType pHandle)
        }
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       ret = MX_ERROR_INVALID_ARGUMENT;
-       MEDIAMUXER_FLEAVE();
-       return ret;
 }
 
 static int gst_muxer_resume(MMHandleType pHandle)
@@ -1228,10 +1202,6 @@ static int gst_muxer_resume(MMHandleType pHandle)
        }
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       ret = MX_ERROR_INVALID_ARGUMENT;
-       MEDIAMUXER_FLEAVE();
-       return ret;
 }
 
 static int gst_muxer_stop(MMHandleType pHandle)
@@ -1252,11 +1222,6 @@ STATE_CHANGE_FAILED:
        ret = MX_ERROR_INVALID_ARGUMENT;
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       MX_E("muxer handle NULL, returning \n");
-       ret = MX_ERROR_INVALID_ARGUMENT;
-       MEDIAMUXER_FLEAVE();
-       return ret;
 }
 
 mx_ret_e _gst_destroy_pipeline(mxgst_handle_t *gst_handle)
@@ -1305,10 +1270,6 @@ static int gst_muxer_unprepare(MMHandleType pHandle)
        ret = _gst_destroy_pipeline(gst_handle);
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       ret = MX_ERROR_INVALID_ARGUMENT;
-       MEDIAMUXER_FLEAVE();
-       return ret;
 }
 
 static int gst_muxer_destroy(MMHandleType pHandle)
@@ -1322,10 +1283,6 @@ static int gst_muxer_destroy(MMHandleType pHandle)
        g_free(new_mediamuxer);
        MEDIAMUXER_FLEAVE();
        return ret;
-ERROR:
-       MX_E("muxer handle already NULL, returning \n");
-       MEDIAMUXER_FLEAVE();
-       return ret;
 }
 
 int gst_set_error_cb(MMHandleType pHandle, gst_error_cb callback, void* user_data)
@@ -1337,7 +1294,7 @@ int gst_set_error_cb(MMHandleType pHandle, gst_error_cb callback, void* user_dat
 
        if (!gst_handle) {
                MX_E("fail invaild param\n");
-               ret = MX_INVALID_ARG;
+               ret = MX_INVALID_ARGUMENT;
                goto ERROR;
        }