Change the name of the toplogy_bin to transform_bin

Topology is a term of MediaSession,
the components of MediaSession include Source Node,Transform Node, Output Node and Tee Node.
I want to change the name of the TopologyBin to TransformBin
because Toppology is the same as GstBin or GstPipeline of Gstreamer,
then leves are correct and we don't need to use the term of MediaSession.

Change-Id: I174322f3d4041e3aa4ea5faea4168a4de2762c20
Signed-off-by: Hyunil <hyunil46.park@samsung.com>

diff --git a/include/media_streamer_gst.h b/include/media_streamer_gst.h
index 11b1da8d0b87151e3dfbc248ff959f0a60118804..69e7c68a72a6c129f3fe70d96671027a8a24f7d8 100644 (file)
--- a/include/media_streamer_gst.h
+++ b/include/media_streamer_gst.h
@@ -23,7 +23,7 @@
 #define MEDIA_STREAMER_PIPELINE_NAME "media-streamer-pipeline"
 #define MEDIA_STREAMER_SRC_BIN_NAME "streamer_src"
 #define MEDIA_STREAMER_SINK_BIN_NAME "streamer_sink"
-#define MEDIA_STREAMER_TOPOLOGY_BIN_NAME "streamer_topology"
+#define MEDIA_STREAMER_TRANSFORM_BIN_NAME "streamer_transform"
 
 #define MEDIA_STREAMER_PAYLOADER_KLASS "Codec/Payloader/Network/RTP"
 #define MEDIA_STREAMER_RTP_KLASS "Filter/Network/RTP"
@@ -192,7 +192,7 @@ gboolean __ms_element_lock_state(const GValue *item, GValue *ret, gpointer user_
 gboolean __ms_element_unlock_state(const GValue *item, GValue *ret, gpointer user_data);
 
 /**
- * @brief Creates pipeline, bus and src/sink/topology bins.
+ * @brief Creates pipeline, bus and src/sink/transform bins.
  *
  * @since_tizen 3.0
  */

diff --git a/include/media_streamer_priv.h b/include/media_streamer_priv.h
index 6d2e8898123abfa2f56702ea841020297dd35afe..ad6df636a854d7f9d5acc2fbc5f1f2a0b6e27df4 100644 (file)
--- a/include/media_streamer_priv.h
+++ b/include/media_streamer_priv.h
@@ -96,7 +96,7 @@ typedef struct {
 
        GstElement *src_bin;
        GstElement *sink_bin;
-       GstElement *topology_bin;
+       GstElement *transform_bin;
 
        GHashTable *nodes_table;
        GMutex mutex_lock;

diff --git a/src/media_streamer_gst.c b/src/media_streamer_gst.c
index 5a8c6ce7ca8d687714394ffc9bb8cd562aec334d..502ec4ee2f0094f99d29333792c74497d6974363 100644 (file)
--- a/src/media_streamer_gst.c
+++ b/src/media_streamer_gst.c
@@ -535,36 +535,36 @@ static void __decodebin_nomore_pads_combine(GstPad *src_pad, media_streamer_s *m
        const gchar *new_pad_type = __ms_get_pad_type(src_pad);
 
        if (MS_ELEMENT_IS_VIDEO(new_pad_type)) {
-               if (__ms_bin_find_element_by_type(found_element, src_pad, ms_streamer->topology_bin, __ms_node_get_klass_by_its_type(MEDIA_STREAMER_NODE_TYPE_TEXT_OVERLAY))) {
-                       found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_TEXT_OVERLAY);
+               if (__ms_bin_find_element_by_type(found_element, src_pad, ms_streamer->transform_bin, __ms_node_get_klass_by_its_type(MEDIA_STREAMER_NODE_TYPE_TEXT_OVERLAY))) {
+                       found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_TEXT_OVERLAY);
                        src_pad = NULL;
                }
                if (sink_bin_type == MEDIA_STREAMER_SINK_BIN_RTP_SERVER) {
-                       found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_VIDEO_ENCODER);
-                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_VIDEO_PAY);
-                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_RTP);
+                       found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_VIDEO_ENCODER);
+                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_VIDEO_PAY);
+                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_RTP);
                } else if (sink_bin_type == MEDIA_STREAMER_SINK_BIN_ADAPTIVE) {
-                       found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_VIDEO_ENCODER);
-                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_MUXER);
+                       found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_VIDEO_ENCODER);
+                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_MUXER);
                        found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->sink_bin, MEDIA_STREAMER_NODE_TYPE_SINK);
                } else {
-                       found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_VIDEO_CONVERTER);
+                       found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_VIDEO_CONVERTER);
                        found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->sink_bin, MEDIA_STREAMER_NODE_TYPE_SINK);
                }
        } else if (MS_ELEMENT_IS_AUDIO(new_pad_type)) {
                if (sink_bin_type == MEDIA_STREAMER_SINK_BIN_RTP_SERVER) {
-                       found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_AUDIO_ENCODER);
-                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_AUDIO_PAY);
-                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_RTP);
+                       found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_AUDIO_ENCODER);
+                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_AUDIO_PAY);
+                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_RTP);
                } else if (sink_bin_type == MEDIA_STREAMER_SINK_BIN_ADAPTIVE) {
-                       found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_AUDIO_ENCODER);
-                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_MUXER);
+                       found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_AUDIO_ENCODER);
+                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_MUXER);
                        found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->sink_bin, MEDIA_STREAMER_NODE_TYPE_SINK);
                } else {
                        found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->sink_bin, MEDIA_STREAMER_NODE_TYPE_SINK);
                }
        } else if (MS_ELEMENT_IS_TEXT(new_pad_type)) {
-               found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_TEXT_OVERLAY);
+               found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_TEXT_OVERLAY);
        } else {
                ms_error("Unsupported pad type [%s]!", new_pad_type);
        }
@@ -621,7 +621,7 @@ GstElement *__ms_decodebin_create(media_streamer_s * ms_streamer, char * name)
        ms_retvm_if(!ms_streamer, NULL, "Handle is NULL");
 
        GstElement *decodebin = __ms_element_create(DEFAULT_DECODEBIN, name);
-       __ms_bin_add_element(ms_streamer->topology_bin, decodebin, TRUE);
+       __ms_bin_add_element(ms_streamer->transform_bin, decodebin, TRUE);
        gst_element_sync_state_with_parent(decodebin);
 
        __ms_signal_create(&ms_streamer->autoplug_sig_list, decodebin, "pad-added", G_CALLBACK(__decodebin_newpad_cb), ms_streamer);
@@ -641,8 +641,8 @@ static gboolean __ms_sink_bin_prepare(media_streamer_s * ms_streamer, GstPad * s
 
        if (MS_ELEMENT_IS_VIDEO(src_pad_type)) {
                gst_object_ref(parent_rtp_element);
-               found_element = __ms_combine_next_element(parent_rtp_element, source_pad, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_VIDEO_DEPAY);
-               decoder_element = __ms_bin_find_element_by_type(found_element, NULL, ms_streamer->topology_bin, __ms_node_get_klass_by_its_type(MEDIA_STREAMER_NODE_TYPE_VIDEO_DECODER));
+               found_element = __ms_combine_next_element(parent_rtp_element, source_pad, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_VIDEO_DEPAY);
+               decoder_element = __ms_bin_find_element_by_type(found_element, NULL, ms_streamer->transform_bin, __ms_node_get_klass_by_its_type(MEDIA_STREAMER_NODE_TYPE_VIDEO_DECODER));
 
                if (!decoder_element) {
                        if (ms_streamer->ini.use_decodebin) {
@@ -653,7 +653,7 @@ static gboolean __ms_sink_bin_prepare(media_streamer_s * ms_streamer, GstPad * s
                                return TRUE;
                        } else {
                                gst_object_ref(found_element);
-                               found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_VIDEO_DECODER);
+                               found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_VIDEO_DECODER);
                                found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->sink_bin, MEDIA_STREAMER_NODE_TYPE_SINK);
                        }
                } else {
@@ -662,8 +662,8 @@ static gboolean __ms_sink_bin_prepare(media_streamer_s * ms_streamer, GstPad * s
                }
        } else if (MS_ELEMENT_IS_AUDIO(src_pad_type)) {
                gst_object_ref(parent_rtp_element);
-               found_element = __ms_combine_next_element(parent_rtp_element, source_pad, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_AUDIO_DEPAY);
-               found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_AUDIO_DECODER);
+               found_element = __ms_combine_next_element(parent_rtp_element, source_pad, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_AUDIO_DEPAY);
+               found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_AUDIO_DECODER);
                found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->sink_bin, MEDIA_STREAMER_NODE_TYPE_SINK);
        } else {
                ms_info("Unknown media type received from rtp element!");
@@ -776,11 +776,11 @@ static int __ms_adaptive_sink_prepare(media_streamer_s * ms_streamer)
        node_plug_s mux_plug_info = {&(nodes_info[2]), muxer_src_caps, NULL, NULL};
        GstElement *muxer = __ms_node_element_create(&mux_plug_info, MEDIA_STREAMER_NODE_TYPE_MUXER);
 
-       __ms_bin_add_element(ms_streamer->topology_bin, muxer, FALSE);
+       __ms_bin_add_element(ms_streamer->transform_bin, muxer, FALSE);
        gst_element_sync_state_with_parent(muxer);
-       __ms_bin_add_element(ms_streamer->topology_bin, video_enc, FALSE);
+       __ms_bin_add_element(ms_streamer->transform_bin, video_enc, FALSE);
        gst_element_sync_state_with_parent(video_enc);
-       __ms_bin_add_element(ms_streamer->topology_bin, audio_enc, FALSE);
+       __ms_bin_add_element(ms_streamer->transform_bin, audio_enc, FALSE);
        gst_element_sync_state_with_parent(audio_enc);
 
        return MEDIA_STREAMER_ERROR_NONE;
@@ -1584,8 +1584,8 @@ int __ms_add_node_into_bin(media_streamer_s *ms_streamer, media_streamer_node_s
                bin = ms_streamer->sink_bin;
                break;
        default:
-               /* Another elements will be add into topology bin */
-               bin = ms_streamer->topology_bin;
+               /* Another elements will be add into transform bin */
+               bin = ms_streamer->transform_bin;
                break;
        }
 
@@ -1863,10 +1863,10 @@ int __ms_pipeline_create(media_streamer_s *ms_streamer)
        ms_streamer->sink_bin = gst_bin_new(MEDIA_STREAMER_SINK_BIN_NAME);
        ms_retvm_if(ms_streamer->sink_bin == NULL, MEDIA_STREAMER_ERROR_INVALID_OPERATION, "Error creating Sink bin");
 
-       ms_streamer->topology_bin = gst_bin_new(MEDIA_STREAMER_TOPOLOGY_BIN_NAME);
-       ms_retvm_if(ms_streamer->topology_bin == NULL, MEDIA_STREAMER_ERROR_INVALID_OPERATION, "Error creating Topology bin");
+       ms_streamer->transform_bin = gst_bin_new(MEDIA_STREAMER_TRANSFORM_BIN_NAME);
+       ms_retvm_if(ms_streamer->transform_bin == NULL, MEDIA_STREAMER_ERROR_INVALID_OPERATION, "Error creating Transform bin");
 
-       gst_bin_add_many(GST_BIN(ms_streamer->pipeline), ms_streamer->src_bin, ms_streamer->sink_bin, ms_streamer->topology_bin, NULL);
+       gst_bin_add_many(GST_BIN(ms_streamer->pipeline), ms_streamer->src_bin, ms_streamer->sink_bin, ms_streamer->transform_bin, NULL);
        ms_info("Media streamer pipeline created successfully.");
 
        return ret;
@@ -2222,11 +2222,11 @@ static void __demux_nomore_pads_combine(GstPad *src_pad, media_streamer_s *ms_st
        GstElement *found_element = gst_pad_get_parent_element(src_pad);
        const gchar *new_pad_type = __ms_get_pad_type(src_pad);
        if (MS_ELEMENT_IS_VIDEO(new_pad_type))
-               found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_VIDEO_DECODER);
+               found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_VIDEO_DECODER);
        else if (MS_ELEMENT_IS_AUDIO(new_pad_type))
-               found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_AUDIO_DECODER);
+               found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_AUDIO_DECODER);
        else if (MS_ELEMENT_IS_TEXT(new_pad_type))
-               found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_TEXT_OVERLAY);
+               found_element = __ms_combine_next_element(found_element, src_pad, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_TEXT_OVERLAY);
        else
                ms_error("Unsupported pad type [%s]!", new_pad_type);
 
@@ -2291,7 +2291,7 @@ int __ms_find_type(media_streamer_s *ms_streamer, GstElement *src_element)
        ms_retvm_if(typefind == NULL, MEDIA_STREAMER_ERROR_INVALID_OPERATION,
                        "Error creating element [typefind]");
 
-       __ms_bin_add_element(ms_streamer->topology_bin, typefind, TRUE);
+       __ms_bin_add_element(ms_streamer->transform_bin, typefind, TRUE);
        gst_element_sync_state_with_parent(typefind);
 
        g_signal_connect(typefind, "have-type", G_CALLBACK(__ms_typefound_cb), ms_streamer);

diff --git a/src/media_streamer_node.c b/src/media_streamer_node.c
index d7018b4d2553378a842f63b96d6c1b389e5553cd..ff7563ac7de1e8af619721321ea92d42ffbc26cd 100644 (file)
--- a/src/media_streamer_node.c
+++ b/src/media_streamer_node.c
@@ -807,19 +807,19 @@ static gboolean _src_node_prepare(const GValue *item, GValue *ret, gpointer user
                }
                /* It is media streamer Server part */
                if (MS_ELEMENT_IS_VIDEO(new_pad_type) || MS_ELEMENT_IS_IMAGE(new_pad_type)) {
-                       found_element = __ms_combine_next_element(src_element, src_pad, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_FILTER);
+                       found_element = __ms_combine_next_element(src_element, src_pad, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_FILTER);
                        GstCaps *videoCaps = gst_caps_from_string(MEDIA_STREAMER_DEFAULT_CAMERA_FORMAT);
                        g_object_set(G_OBJECT(found_element), "caps", videoCaps, NULL);
                        gst_caps_unref(videoCaps);
 
-                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_VIDEO_ENCODER);
-                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_VIDEO_PAY);
-                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_RTP);
+                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_VIDEO_ENCODER);
+                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_VIDEO_PAY);
+                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_RTP);
                }
                if (MS_ELEMENT_IS_AUDIO(new_pad_type)) {
-                       found_element = __ms_combine_next_element(src_element, src_pad, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_AUDIO_ENCODER);
-                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_AUDIO_PAY);
-                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->topology_bin, MEDIA_STREAMER_NODE_TYPE_RTP);
+                       found_element = __ms_combine_next_element(src_element, src_pad, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_AUDIO_ENCODER);
+                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_AUDIO_PAY);
+                       found_element = __ms_combine_next_element(found_element, NULL, ms_streamer->transform_bin, MEDIA_STREAMER_NODE_TYPE_RTP);
                }
                __ms_generate_dots(ms_streamer->pipeline, "after_connecting_rtp");
                MS_SAFE_UNREF(found_element);
@@ -913,7 +913,7 @@ int __ms_pipeline_prepare(media_streamer_s *ms_streamer)
        }
 
        if (adaptive_src) {
-               if (GST_BIN(ms_streamer->topology_bin)->numchildren == 0)
+               if (GST_BIN(ms_streamer->transform_bin)->numchildren == 0)
                        ret = __ms_adaptive_element_prepare(adaptive_src, true);
                else
                        ret = __ms_adaptive_element_prepare(adaptive_src, false);
@@ -1037,7 +1037,7 @@ int __ms_pipeline_unprepare(media_streamer_s *ms_streamer)
        }
 
        MS_BIN_UNPREPARE(ms_streamer->src_bin);
-       MS_BIN_UNPREPARE(ms_streamer->topology_bin);
+       MS_BIN_UNPREPARE(ms_streamer->transform_bin);
        MS_BIN_UNPREPARE(ms_streamer->sink_bin);
 
        return ret;

diff --git a/src/media_streamer_priv.c b/src/media_streamer_priv.c
index e0efc4e032178aea65dc215453173f328dd22cc7..30f29083b7fa07576ef106ebf7b091a4fb5dd5d0 100644 (file)
--- a/src/media_streamer_priv.c
+++ b/src/media_streamer_priv.c
@@ -218,14 +218,14 @@ int __ms_acquire_resources(media_streamer_s *ms_streamer)
                return ret;
        }
 
-       /* Acquire resources for topology bin. If user doesn't
+       /* Acquire resources for transform bin. If user doesn't
           add nodes explicitly they will be acquired later.
                 For example when decodebin is used resources are quired
                 when 'autoplug-select' signal is triggered for new GstElement. */
-       ret = __ms_bin_foreach_elements(GST_BIN(ms_streamer->topology_bin),
+       ret = __ms_bin_foreach_elements(GST_BIN(ms_streamer->transform_bin),
                _ms_node_resouces_acquire_iter, ms_streamer);
        if (MEDIA_STREAMER_ERROR_NONE != ret) {
-               ms_error("Failed to acquire resources for topology bin");
+               ms_error("Failed to acquire resources for transform bin");
                return ret;
        }
 
@@ -252,13 +252,13 @@ int __ms_release_resources(media_streamer_s *ms_streamer)
                return ret;
        }
 
-       /* Release resources for topology bin. Here we also consider
+       /* Release resources for transform bin. Here we also consider
                 nodes that were not added by user explicitly (e.g. decodebin
                 was used). */
-       ret = __ms_bin_foreach_elements(GST_BIN(ms_streamer->topology_bin),
+       ret = __ms_bin_foreach_elements(GST_BIN(ms_streamer->transform_bin),
                _ms_node_resouces_release_iter, ms_streamer);
        if (MEDIA_STREAMER_ERROR_NONE != ret) {
-               ms_error("Failed to release resources for topology bin");
+               ms_error("Failed to release resources for trannsform bin");
                return ret;
        }