Check if adative sink exists before calling ms_http_server_stop/destroy()

Meaningless "server is NULL" error log was printed in spite of
a pipeline without adaptive sink.

[Issue Type] Improvement
[Version] 0.1.127

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

diff --git a/include/media_streamer_priv.h b/include/media_streamer_priv.h
index e63fdc2810e727ddccafcffe79cc56bd740854b2..d6b22062485c65af22b0eb6f0d3e8225b443fbd7 100644 (file)
--- a/include/media_streamer_priv.h
+++ b/include/media_streamer_priv.h
@@ -221,6 +221,8 @@ int ms_set_state(media_streamer_s *ms_streamer, media_streamer_state_e state);
 
 void ms_trigger_state_cb(media_streamer_s *ms_streamer, media_streamer_state_e old_state);
 
+gboolean ms_has_adaptive_sink_node(media_streamer_s *ms_streamer);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

diff --git a/packaging/capi-media-streamer.spec b/packaging/capi-media-streamer.spec
index f89e3ba976303aecdc8140f273875821743ffcee..7ceebefe98497923b7eeac1032f9033fed9410fb 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.126
+Version:    0.1.127
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_streamer.c b/src/media_streamer.c
index 51f0b7a5d7ab20033e213906835a04e01a389709..e12de32400569931e02345990c5cd84789673523 100644 (file)
--- a/src/media_streamer.c
+++ b/src/media_streamer.c
@@ -234,7 +234,8 @@ int media_streamer_unprepare(media_streamer_h streamer)
 
        ret = ms_pipeline_unprepare(ms_streamer);
 
-       ms_http_server_destroy(ms_streamer->http_server);
+       if (ms_has_adaptive_sink_node(ms_streamer))
+               ms_http_server_destroy(ms_streamer->http_server);
 
        ms_generate_dots(ms_streamer->pipeline, "after_unprepare");
 
@@ -589,7 +590,8 @@ int media_streamer_stop(media_streamer_h streamer)
        else
                ret = ms_set_state(ms_streamer, MEDIA_STREAMER_STATE_PAUSED);
 
-       ms_http_server_stop(ms_streamer->http_server);
+       if (ms_has_adaptive_sink_node(ms_streamer))
+               ms_http_server_stop(ms_streamer->http_server);
 
        g_mutex_unlock(&ms_streamer->mutex_lock);
 
@@ -1054,4 +1056,4 @@ int media_streamer_webrtc_node_unset_message_cb(media_streamer_node_h webrtc)
 
        return MEDIA_STREAMER_ERROR_NONE;
 }
-//LCOV_EXCL_STOP
\ No newline at end of file
+//LCOV_EXCL_STOP

diff --git a/src/media_streamer_priv.c b/src/media_streamer_priv.c
index 6aa645550840f777508543df1615467105054ad3..1e3923a3fde0c454f0932b4411c477c4e6d2a480 100644 (file)
--- a/src/media_streamer_priv.c
+++ b/src/media_streamer_priv.c
@@ -475,3 +475,10 @@ static int __ms_change_dpm_policy_state(media_streamer_s *ms_streamer, media_str
 
        return ret;
 }
+
+gboolean ms_has_adaptive_sink_node(media_streamer_s *ms_streamer)
+{
+       ms_retvm_if(ms_streamer == NULL, FALSE, "ms_streamer is NULL");
+
+       return g_hash_table_contains(ms_streamer->nodes_table, "adaptive_sink");
+}
\ No newline at end of file