From 758b7ba480367aa89898f2ae9337593c7df37924 Mon Sep 17 00:00:00 2001 From: Hyunsoo Park Date: Tue, 2 Jun 2020 11:05:14 +0900 Subject: [PATCH] [rtsp-server] change 'gst_rtsp_media_set_target_state' api scope For using other file, change this api's scope. It is fix up of I7370e4c5d75508aa33e90cd0e8819db7ad0b3ee2. Change-Id: I02f8d1c0ea8dd9ae6fc2e470b93e12d3b1c0048d Signed-off-by: Hyunsoo Park --- gst/rtsp-server/rtsp-media.c | 14 +++++++------- packaging/gst-rtsp-server.spec | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gst/rtsp-server/rtsp-media.c b/gst/rtsp-server/rtsp-media.c index 0c17fe1..f291950 100644 --- a/gst/rtsp-server/rtsp-media.c +++ b/gst/rtsp-server/rtsp-media.c @@ -2918,8 +2918,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; @@ -3242,7 +3242,7 @@ start_preroll (GstRTSPMedia * media) /* start blocked since it is possible that there are no sink elements yet */ media_streams_set_blocked (media, TRUE); - 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: @@ -3812,7 +3812,7 @@ gst_rtsp_media_unprepare (GstRTSPMedia * media) goto is_busy; GST_INFO ("unprepare media %p", media); - 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) { @@ -4177,13 +4177,13 @@ 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; 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 @@ -4384,7 +4384,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/packaging/gst-rtsp-server.spec b/packaging/gst-rtsp-server.spec index bb00e1a..580fbdc 100644 --- a/packaging/gst-rtsp-server.spec +++ b/packaging/gst-rtsp-server.spec @@ -1,7 +1,7 @@ Name: gst-rtsp-server Summary: Multimedia Framework Library Version: 1.16.2 -Release: 3 +Release: 4 Url: http://gstreamer.freedesktop.org/ Group: System/Libraries License: LGPL-2.0+ -- 2.7.4