Improve _gstcs_init() API

Change-Id: I6fa62a4f3823873e8d2a8268656193dcaed10141

diff --git a/gstcs/mm_util_gstcs.c b/gstcs/mm_util_gstcs.c
index f1a0344..e168c8d 100644 (file)
--- a/gstcs/mm_util_gstcs.c
+++ b/gstcs/mm_util_gstcs.c
@@ -621,59 +621,32 @@ static int _gstcs_destroy_default_thread(gstreamer_s *gstreamer)
        return GSTCS_ERROR_NONE;
 }
 
-static int _gstcs_init(gstreamer_s** gstreamer)
+static void _gstcs_init(void)
 {
        static const int max_argc = 50;
        gint argc = 0;
        gchar** argv = NULL;
        int i = 0;
-       int ret = GSTCS_ERROR_NONE;
-
-       argv = malloc(sizeof(gchar*) * max_argc);
 
-       gstcs_retvm_if(argv == NULL, GSTCS_ERROR_OUT_OF_MEMORY, "argv is not allocated");
-
-       memset(argv, 0, sizeof(gchar*) * max_argc);
+       argv = g_malloc0(sizeof(gchar*) * max_argc);
 
        argv[argc] = g_strdup("mmutil_gstcs");
-       if (argv[argc] == NULL) {
-               gstcs_error("argv[%d] is not allocated", argc);
-               ret = GSTCS_ERROR_OUT_OF_MEMORY;
-       }
        argc++;
        /* check disable registry scan */
        argv[argc] = g_strdup("--gst-disable-registry-update");
-       if (argv[argc] == NULL) {
-               gstcs_error("argv[%d] is not allocated", argc);
-               ret = GSTCS_ERROR_OUT_OF_MEMORY;
-       }
        argc++;
-       if (ret != GSTCS_ERROR_NONE) {
-               for (i = 0; i < argc; i++)
-                       GSTCS_FREE(argv[i]);
-
-               GSTCS_FREE(argv);
-               return ret;
-       }
 
        gst_init(&argc, &argv);
 
-       *gstreamer = g_new0(gstreamer_s, 1);
-       if (*gstreamer == NULL) {
-               gstcs_error("gstreamer structure is not allocated");
-               ret = GSTCS_ERROR_OUT_OF_MEMORY;
-       }
-
        for (i = 0; i < argc; i++)
-               GSTCS_FREE(argv[i]);
+               g_free(argv[i]);
 
-       GSTCS_FREE(argv);
-       return ret;
+       g_free(argv);
 }
 
 static int _mm_imgp_gstcs(imgp_info_s* pImgp_info, unsigned char *src, unsigned char **dst)
 {
-       gstreamer_s* pGstreamer_s;
+       gstreamer_s* pGstreamer_s = NULL;
        int ret = GSTCS_ERROR_NONE;
 
        /* Print debug message for inout structure */
@@ -681,11 +654,9 @@ static int _mm_imgp_gstcs(imgp_info_s* pImgp_info, unsigned char *src, unsigned
        pImgp_info->src_width, pImgp_info->src_height, pImgp_info->src_format, pImgp_info->dst_width, pImgp_info->dst_height, pImgp_info->dst_format, pImgp_info->angle);
 
        /* Initialize gstreamer */
-       ret = _gstcs_init(&pGstreamer_s);
-       if (ret != GSTCS_ERROR_NONE) {
-               gstcs_error("Error: _gstcs_new is failed");
-               return ret;
-       }
+       _gstcs_init();
+
+       pGstreamer_s = g_new0(gstreamer_s, 1);
 
        /* Create default thread for async behavior */
        ret = _gstcs_create_default_thread(pGstreamer_s);