mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 17:50:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtspsrc: remove unused flush param

Browse source
This commit is contained in:
Wim Taymans 2011-12-06 13:59:52 +01:00
parent 86961d5986
commit d0b936acc7
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gst/rtsp/gstrtspsrc.c
View file

@ -250,8 +250,7 @@ static void gst_rtspsrc_handle_message (GstBin * bin, GstMessage * message);
static gboolean gst_rtspsrc_setup_auth (GstRTSPSrc * src, static gboolean gst_rtspsrc_setup_auth (GstRTSPSrc * src,
GstRTSPMessage * response); GstRTSPMessage * response);
static void gst_rtspsrc_loop_send_cmd (GstRTSPSrc * src, gint cmd, static void gst_rtspsrc_loop_send_cmd (GstRTSPSrc * src, gint cmd);
gboolean flush);
static GstRTSPResult gst_rtspsrc_send_cb (GstRTSPExtension * ext, static GstRTSPResult gst_rtspsrc_send_cb (GstRTSPExtension * ext,
GstRTSPMessage * request, GstRTSPMessage * response, GstRTSPSrc * src); GstRTSPMessage * request, GstRTSPMessage * response, GstRTSPSrc * src);
@ -1687,7 +1686,7 @@ gst_rtspsrc_flush (GstRTSPSrc * src, gboolean flush, gboolean playing)
} }
} }
gst_rtspsrc_push_event (src, event, FALSE); gst_rtspsrc_push_event (src, event, FALSE);
gst_rtspsrc_loop_send_cmd (src, cmd, flush); gst_rtspsrc_loop_send_cmd (src, cmd);
/* set up manager before data-flow resumes */ /* set up manager before data-flow resumes */
/* to manage jitterbuffer buffer mode */ /* to manage jitterbuffer buffer mode */
@ -4054,12 +4053,10 @@ gst_rtspsrc_loop_end_cmd (GstRTSPSrc * src, gint cmd, GstRTSPResult ret)
} }
static void static void
gst_rtspsrc_loop_send_cmd (GstRTSPSrc * src, gint cmd, gboolean flush) gst_rtspsrc_loop_send_cmd (GstRTSPSrc * src, gint cmd)
{ {
gint old; gint old;
/* FIXME flush param mute; remove at discretion */
/* start new request */ /* start new request */
gst_rtspsrc_loop_start_cmd (src, cmd); gst_rtspsrc_loop_start_cmd (src, cmd);
@ -6386,7 +6383,7 @@ gst_rtspsrc_handle_message (GstBin * bin, GstMessage * message)
/* we only act on the first udp timeout message, others are irrelevant /* we only act on the first udp timeout message, others are irrelevant
* and can be ignored. */ * and can be ignored. */
if (!ignore_timeout) if (!ignore_timeout)
gst_rtspsrc_loop_send_cmd (rtspsrc, CMD_RECONNECT, TRUE); gst_rtspsrc_loop_send_cmd (rtspsrc, CMD_RECONNECT);
/* eat and free */ /* eat and free */
gst_message_unref (message); gst_message_unref (message);
return; return;
@ -6537,7 +6534,7 @@ gst_rtspsrc_stop (GstRTSPSrc * src)
GST_DEBUG_OBJECT (src, "stopping"); GST_DEBUG_OBJECT (src, "stopping");
/* also cancels pending task */ /* also cancels pending task */
gst_rtspsrc_loop_send_cmd (src, CMD_WAIT, TRUE); gst_rtspsrc_loop_send_cmd (src, CMD_WAIT);
GST_OBJECT_LOCK (src); GST_OBJECT_LOCK (src);
if ((task = src->task)) { if ((task = src->task)) {
@ -6585,12 +6582,12 @@ gst_rtspsrc_change_state (GstElement * element, GstStateChange transition)
/* first attempt, don't ignore timeouts */ /* first attempt, don't ignore timeouts */
rtspsrc->ignore_timeout = FALSE; rtspsrc->ignore_timeout = FALSE;
rtspsrc->open_error = FALSE; rtspsrc->open_error = FALSE;
gst_rtspsrc_loop_send_cmd (rtspsrc, CMD_OPEN, FALSE); gst_rtspsrc_loop_send_cmd (rtspsrc, CMD_OPEN);
break; break;
case GST_STATE_CHANGE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
case GST_STATE_CHANGE_PLAYING_TO_PAUSED: case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
/* unblock the tcp tasks and make the loop waiting */ /* unblock the tcp tasks and make the loop waiting */
gst_rtspsrc_loop_send_cmd (rtspsrc, CMD_WAIT, TRUE); gst_rtspsrc_loop_send_cmd (rtspsrc, CMD_WAIT);
break; break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
break; break;
@ -6604,18 +6601,18 @@ gst_rtspsrc_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_PLAYING: case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
gst_rtspsrc_loop_send_cmd (rtspsrc, CMD_PLAY, FALSE); gst_rtspsrc_loop_send_cmd (rtspsrc, CMD_PLAY);
break; break;
case GST_STATE_CHANGE_PLAYING_TO_PAUSED: case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
/* send pause request and keep the idle task around */ /* send pause request and keep the idle task around */
gst_rtspsrc_loop_send_cmd (rtspsrc, CMD_PAUSE, FALSE); gst_rtspsrc_loop_send_cmd (rtspsrc, CMD_PAUSE);
ret = GST_STATE_CHANGE_NO_PREROLL; ret = GST_STATE_CHANGE_NO_PREROLL;
break; break;
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
ret = GST_STATE_CHANGE_NO_PREROLL; ret = GST_STATE_CHANGE_NO_PREROLL;
break; break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_rtspsrc_loop_send_cmd (rtspsrc, CMD_CLOSE, FALSE); gst_rtspsrc_loop_send_cmd (rtspsrc, CMD_CLOSE);
break; break;
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
gst_rtspsrc_stop (rtspsrc); gst_rtspsrc_stop (rtspsrc);