[UTC][capi-media-streamer][Non-ACR][Fix memory leak in pull_packet tests and get_para...

Change-Id: I38e8627cde99bde55b764456c7cdde7223c0ca23
Signed-off-by: Volodymyr Brynza <v.brynza@samsung.com>

diff --git a/src/utc/capi-media-streamer/utc-capi-media-streamer.c b/src/utc/capi-media-streamer/utc-capi-media-streamer.c
index 5a4de57..1418bce 100755 (executable)
--- a/src/utc/capi-media-streamer/utc-capi-media-streamer.c
+++ b/src/utc/capi-media-streamer/utc-capi-media-streamer.c
@@ -154,8 +154,21 @@ static void wait_for_async(unsigned int sec)
 /* Application sink callback */
 void new_buffer_cb(media_streamer_node_h node, void *user_data)
 {
-       media_packet_h *p_packet = (media_packet_h *)user_data;
-       pull_packet_res = media_streamer_node_pull_packet(node, p_packet);
+       char *received_data = NULL;
+       media_packet_h packet = NULL;
+
+       pull_packet_res = media_streamer_node_pull_packet(node, &packet);
+       assert_neq(packet, NULL);
+
+       media_packet_get_buffer_data_ptr(packet, (void **)&received_data);
+
+       assert_neq(received_data, NULL);
+
+       free(received_data);
+       received_data = NULL;
+
+       media_packet_destroy (packet);
+       packet = NULL;
 }
 
 //& purpose: A purpose of a first positive TC.
@@ -1458,8 +1471,6 @@ int utc_media_streamer_node_create_sink_n2(void)
 int utc_media_streamer_node_pull_packet_p(void)
 {
        int ret = MEDIA_STREAMER_ERROR_NONE;
-       char *received_data = NULL;
-       media_packet_h packet = NULL;
 
        media_streamer_node_h app_src = NULL;
        ret = media_streamer_node_create_src(MEDIA_STREAMER_NODE_SRC_TYPE_CUSTOM, &app_src);
@@ -1488,7 +1499,7 @@ int utc_media_streamer_node_pull_packet_p(void)
        ret = media_streamer_src_set_buffer_status_cb(app_src, buffer_status_cb, NULL);
        assert_eq(ret, MEDIA_STREAMER_ERROR_NONE);
 
-       ret = media_streamer_sink_set_data_ready_cb(app_sink, new_buffer_cb, &packet);
+       ret = media_streamer_sink_set_data_ready_cb(app_sink, new_buffer_cb, NULL);
        assert_eq(ret, MEDIA_STREAMER_ERROR_NONE);
 
        ret = media_streamer_prepare(streamer);
@@ -1504,14 +1515,6 @@ int utc_media_streamer_node_pull_packet_p(void)
 
        assert_eq(pull_packet_res, MEDIA_STREAMER_ERROR_NONE);
 
-       assert_neq(packet, NULL);
-
-       media_packet_get_buffer_data_ptr(packet, (void **)&received_data);
-
-       assert_neq(received_data, NULL);
-
-       free(received_data);
-
        return 0;
 }
 
@@ -1524,8 +1527,6 @@ int utc_media_streamer_node_pull_packet_p(void)
 int utc_media_streamer_node_pull_packet_n(void)
 {
        int ret = MEDIA_STREAMER_ERROR_NONE;
-       char *received_data = NULL;
-       media_packet_h packet = NULL;
        media_packet_h local_packet = NULL;
 
        media_streamer_node_h app_src = NULL;
@@ -1555,11 +1556,9 @@ int utc_media_streamer_node_pull_packet_n(void)
        ret = media_streamer_src_set_buffer_status_cb(app_src, buffer_status_cb, NULL);
        assert_eq(ret, MEDIA_STREAMER_ERROR_NONE);
 
-       ret = media_streamer_sink_set_data_ready_cb(app_sink, new_buffer_cb, &packet);
+       ret = media_streamer_sink_set_data_ready_cb(app_sink, new_buffer_cb, NULL);
        assert_eq(ret, MEDIA_STREAMER_ERROR_NONE);
 
-       ret = media_streamer_node_push_packet(app_src, packet);
-
        ret = media_streamer_node_pull_packet(NULL, &local_packet);
        assert_eq(ret, MEDIA_STREAMER_ERROR_INVALID_PARAMETER);
 
@@ -1582,14 +1581,6 @@ int utc_media_streamer_node_pull_packet_n(void)
 
        assert_eq(pull_packet_res, MEDIA_STREAMER_ERROR_NONE);
 
-       assert_eq(packet, NULL);
-
-       media_packet_get_buffer_data_ptr(packet, (void **)&received_data);
-
-       assert_eq(received_data, NULL);
-
-       free(received_data);
-
        return 0;
 }
 
@@ -2719,6 +2710,8 @@ int utc_media_streamer_node_get_params_p5(void)
        bundle_add_str(params, MEDIA_STREAMER_PARAM_CAMERA_ID, CAMERA_ID);
        ret = media_streamer_node_set_params(video_capture, params);
        assert_eq(ret, MEDIA_STREAMER_ERROR_NONE);
+       bundle_free(params);
+       params = NULL;
        ret = media_streamer_node_get_params(video_capture, &params);
        assert_eq(ret, MEDIA_STREAMER_ERROR_NONE);
        bundle_get_str (params, MEDIA_STREAMER_PARAM_CAMERA_ID, &string_ret);