From 454ddee8481bf499e91a3597a79421a7f98522fe Mon Sep 17 00:00:00 2001 From: SeokHoon Lee Date: Fri, 27 May 2016 09:36:43 +0900 Subject: [PATCH] change function name - set_target_state -> gst_rtsp_media_set_target_state - delete static in function gst_rtsp_media_set_target_state, set_rtsp_media_set_status Signed-off-by: SeokHoon Lee Change-Id: I681092d03e9071831e5b0010818457c68b1446b1 --- gst/rtsp-server/rtsp-media.c | 16 ++++++++-------- gst/rtsp-server/rtsp-media.h | 2 ++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/gst/rtsp-server/rtsp-media.c b/gst/rtsp-server/rtsp-media.c index 5a6f758..0b8c821 100644 --- a/gst/rtsp-server/rtsp-media.c +++ b/gst/rtsp-server/rtsp-media.c @@ -1811,7 +1811,7 @@ media_streams_set_blocked (GstRTSPMedia * media, gboolean blocked) g_ptr_array_foreach (priv->streams, (GFunc) stream_update_blocked, media); } -static void +void gst_rtsp_media_set_status (GstRTSPMedia * media, GstRTSPMediaStatus status) { GstRTSPMediaPrivate *priv = media->priv; @@ -2061,8 +2061,8 @@ set_state (GstRTSPMedia * media, GstState state) return ret; } -static GstStateChangeReturn -set_target_state (GstRTSPMedia * media, GstState state, gboolean do_state) +GstStateChangeReturn +gst_rtsp_media_set_target_state (GstRTSPMedia * media, GstState state, gboolean do_state) { GstRTSPMediaPrivate *priv = media->priv; GstStateChangeReturn ret; @@ -2401,7 +2401,7 @@ start_preroll (GstRTSPMedia * media) GST_INFO ("setting pipeline to PAUSED for media %p", media); /* first go to PAUSED */ - ret = set_target_state (media, GST_STATE_PAUSED, TRUE); + ret = gst_rtsp_media_set_target_state (media, GST_STATE_PAUSED, TRUE); switch (ret) { case GST_STATE_CHANGE_SUCCESS: @@ -2875,7 +2875,7 @@ gst_rtsp_media_unprepare (GstRTSPMedia * media) GST_INFO ("unprepare media %p", media); if (priv->blocked) media_streams_set_blocked (media, FALSE); - set_target_state (media, GST_STATE_NULL, FALSE); + gst_rtsp_media_set_target_state (media, GST_STATE_NULL, FALSE); success = TRUE; if (priv->status == GST_RTSP_MEDIA_STATUS_PREPARED) { @@ -3722,14 +3722,14 @@ default_suspend (GstRTSPMedia * media) break; case GST_RTSP_SUSPEND_MODE_PAUSE: GST_DEBUG ("media %p suspend to PAUSED", media); - ret = set_target_state (media, GST_STATE_PAUSED, TRUE); + ret = gst_rtsp_media_set_target_state (media, GST_STATE_PAUSED, TRUE); if (ret == GST_STATE_CHANGE_FAILURE) goto state_failed; unblock = TRUE; break; case GST_RTSP_SUSPEND_MODE_RESET: GST_DEBUG ("media %p suspend to NULL", media); - ret = set_target_state (media, GST_STATE_NULL, TRUE); + ret = gst_rtsp_media_set_target_state (media, GST_STATE_NULL, TRUE); if (ret == GST_STATE_CHANGE_FAILURE) goto state_failed; /* Because payloader needs to set the sequence number as @@ -3912,7 +3912,7 @@ media_set_pipeline_state_locked (GstRTSPMedia * media, GstState state) gst_rtsp_media_unprepare (media); } else { GST_INFO ("state %s media %p", gst_element_state_get_name (state), media); - set_target_state (media, state, FALSE); + gst_rtsp_media_set_target_state (media, state, FALSE); /* when we are buffering, don't update the state yet, this will be done * when buffering finishes */ if (priv->buffering) { diff --git a/gst/rtsp-server/rtsp-media.h b/gst/rtsp-server/rtsp-media.h index f1be13c..10988f8 100644 --- a/gst/rtsp-server/rtsp-media.h +++ b/gst/rtsp-server/rtsp-media.h @@ -257,6 +257,8 @@ gboolean gst_rtsp_media_set_state (GstRTSPMedia *media, GstS GPtrArray *transports); void gst_rtsp_media_set_pipeline_state (GstRTSPMedia * media, GstState state); +GstStateChangeReturn gst_rtsp_media_set_target_state (GstRTSPMedia * media, GstState state, gboolean do_state); +void gst_rtsp_media_set_status (GstRTSPMedia * media, GstRTSPMediaStatus status); G_END_DECLS -- 2.7.4