Modify __demux_find to __find_node 50/234750/6
authorHyunil <hyunil46.park@samsung.com>
Thu, 28 May 2020 09:19:28 +0000 (18:19 +0900)
committerHyunil <hyunil46.park@samsung.com>
Thu, 28 May 2020 10:51:38 +0000 (19:51 +0900)
- now, function is used for all node

[Version] 0.1.47
[Issue Type] Improvement

Change-Id: Id323af85dd26f347febeca488fe00cbc67c92d8a
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
packaging/capi-media-streamer.spec
src/media_streamer_gst.c

index de43d43..780957f 100644 (file)
@@ -1,6 +1,6 @@
 Name:       capi-media-streamer
 Summary:    A Media Streamer API
-Version:    0.1.46
+Version:    0.1.47
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
index 855bb1f..fb8f8bb 100644 (file)
@@ -2099,9 +2099,11 @@ int ms_pipeline_create(media_streamer_s *ms_streamer)
        return ret;
 }
 
-static gboolean __demux_find(gpointer key, gpointer value, gpointer user_data)
+static gboolean __find_node(gpointer key, gpointer value, gpointer user_data)
 {
-       return g_strrstr((char *)key, "demux") != NULL;
+       gchar *node_name = (gchar *)user_data;
+
+       return g_strrstr((char *)key, node_name) != NULL;
 }
 
 static void __ms_pending_pads_remove(void *data)
@@ -2175,6 +2177,7 @@ int ms_pipeline_prepare(media_streamer_s *ms_streamer)
        media_streamer_node_s *demux = NULL;
        media_streamer_node_s *adaptive_src = NULL;
        media_streamer_node_s *adaptive_sink = NULL;
+       gchar *find_node_name = "demux";
 
        ms_debug_fenter();
 
@@ -2184,7 +2187,7 @@ int ms_pipeline_prepare(media_streamer_s *ms_streamer)
        ms_retvm_if(ms_streamer->transform_bin == NULL, MEDIA_STREAMER_ERROR_INVALID_PARAMETER, "ms_streamer->transform_bin is NULL");
 
        rtp = (media_streamer_node_s *)g_hash_table_lookup(ms_streamer->nodes_table, "rtp_container");
-       demux = (media_streamer_node_s *)g_hash_table_find(ms_streamer->nodes_table, (GHRFunc)__demux_find, NULL);
+       demux = (media_streamer_node_s *)g_hash_table_find(ms_streamer->nodes_table, (GHRFunc)__find_node, find_node_name);
        adaptive_src = (media_streamer_node_s *)g_hash_table_lookup(ms_streamer->nodes_table, "adaptive_src");
        adaptive_sink = (media_streamer_node_s *)g_hash_table_lookup(ms_streamer->nodes_table, "adaptive_sink");