Use g_hash_table_contains() in case of just checking existance

[Issue Type] Improvement
[Version] 0.1.128

Change-Id: I14fd1edccd421ae0b969e895dff24de8e4b7dca8
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/packaging/capi-media-streamer.spec b/packaging/capi-media-streamer.spec
index 7ceebef..d519a06 100644 (file)
--- a/packaging/capi-media-streamer.spec
+++ b/packaging/capi-media-streamer.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-streamer
 Summary:    A Media Streamer API
-Version:    0.1.127
+Version:    0.1.128
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_streamer_gst.c b/src/media_streamer_gst.c
index 9bb5c8b..ce77f60 100644 (file)
--- a/src/media_streamer_gst.c
+++ b/src/media_streamer_gst.c
@@ -2021,16 +2021,12 @@ gboolean ms_element_unlock_state(const GValue *item, GValue *ret, gpointer user_
 
 static gboolean __ms_skip_set_state(media_streamer_s *ms_streamer)
 {
-       media_streamer_node_s *webrtc = NULL;
-
        ms_retvm_if(ms_streamer == NULL, MEDIA_STREAMER_ERROR_INVALID_PARAMETER, "ms_streamer is NULL");
        ms_retvm_if(ms_streamer->nodes_table == NULL, MEDIA_STREAMER_ERROR_INVALID_PARAMETER, "nodes_table is NULL");
 
-       ms_debug_fenter();
-
-       webrtc = (media_streamer_node_s *)g_hash_table_lookup(ms_streamer->nodes_table, "webrtc_container");
-       if (webrtc && ms_streamer->pend_state == MEDIA_STREAMER_STATE_READY) {
-               ms_debug_fleave();
+       if (g_hash_table_contains(ms_streamer->nodes_table, "webrtc_container") &&
+               ms_streamer->pend_state == MEDIA_STREAMER_STATE_READY) {
+               ms_info("Skip set state, state will be set after connecting ICE connection.");
                return TRUE;
        }
 
@@ -2095,8 +2091,7 @@ static gboolean __ms_bus_cb(GstBus *bus, GstMessage *message, gpointer userdata)
                        break;
                }
 
-               if(__ms_skip_set_state(ms_streamer)) {
-                       ms_info("Skip set state, state is set after connecting ICE connection.");
+               if (__ms_skip_set_state(ms_streamer)) {
                        g_mutex_unlock(&ms_streamer->mutex_lock);
                        break;
                }

diff --git a/src/media_streamer_priv.c b/src/media_streamer_priv.c
index 1e3923a..7d3b5f2 100644 (file)
--- a/src/media_streamer_priv.c
+++ b/src/media_streamer_priv.c
@@ -107,8 +107,7 @@ int ms_set_state(media_streamer_s *ms_streamer, media_streamer_state_e state)
                         * set SSRC information to SDP properly inside of webrtcbin. Therefore, we set the state to PLAYING
                         * for a short time as below.
                         */
-                       media_streamer_node_s *webrtc = (media_streamer_node_s *)g_hash_table_lookup(ms_streamer->nodes_table, "webrtc_container");
-                       if (webrtc) {
+                       if (g_hash_table_contains(ms_streamer->nodes_table, "webrtc_container")) {
                                if (ms_pipeline_is_get_state_with_no_preroll(ms_streamer)) {
                                        ms_info("No preroll, we make the GST state to PLAYING here");
                                        ms_streamer->need_paused_by_live_source = TRUE;