mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/rtsp/gstrtspsrc.c: If we don't hav a session manager, set the caps on outgoing buffers ourselves.

Browse source 
Original commit message from CVS:
* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_activate_streams),
(gst_rtspsrc_loop_interleaved), (gst_rtspsrc_parse_methods),
(gst_rtspsrc_create_transports_string),
(gst_rtspsrc_prepare_transports):
If we don't hav a session manager, set the caps on outgoing buffers
ourselves.
Force PAUSE/PLAY methods for now until the extensions can overwrite.
Append final bit of the transport string even when it does not contain a
placeholder.
This commit is contained in:
Wim Taymans 2007-07-27 16:56:45 +00:00
parent a8ee445da6
commit 9ace67724c
2 changed files with 35 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2007-07-27 Wim Taymans <wim.taymans@gmail.com>
* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_activate_streams),
(gst_rtspsrc_loop_interleaved), (gst_rtspsrc_parse_methods),
(gst_rtspsrc_create_transports_string),
(gst_rtspsrc_prepare_transports):
If we don't hav a session manager, set the caps on outgoing buffers
ourselves.
Force PAUSE/PLAY methods for now until the extensions can overwrite.
Append final bit of the transport string even when it does not contain a
placeholder.
2007-07-27 Wim Taymans <wim.taymans@gmail.com> 2007-07-27 Wim Taymans <wim.taymans@gmail.com>
* gst/rtsp/gstrtspext.c: (gst_rtsp_ext_list_free), * gst/rtsp/gstrtspext.c: (gst_rtsp_ext_list_free),

25
gst/rtsp/gstrtspsrc.c
View file

@ -1936,9 +1936,18 @@ gst_rtspsrc_activate_streams (GstRTSPSrc * src)
g_object_set (G_OBJECT (stream->udpsrc[0]), "timeout", (guint64) 0, NULL); g_object_set (G_OBJECT (stream->udpsrc[0]), "timeout", (guint64) 0, NULL);
} }
if (stream->srcpad) { if (stream->srcpad) {
/* if we don't have a session manager, set the caps now. If we have a
* session, we will get a notification of the pad and the caps. */
if (!src->session) {
GST_DEBUG_OBJECT (src, "setting pad caps for stream %p", stream);
gst_pad_set_caps (stream->srcpad, stream->caps);
}
GST_DEBUG_OBJECT (src, "activating stream pad %p", stream);
gst_pad_set_active (stream->srcpad, TRUE); gst_pad_set_active (stream->srcpad, TRUE);
/* add the pad */ /* add the pad */
if (!stream->added) { if (!stream->added) {
GST_DEBUG_OBJECT (src, "adding stream pad %p", stream);
gst_element_add_pad (GST_ELEMENT_CAST (src), stream->srcpad); gst_element_add_pad (GST_ELEMENT_CAST (src), stream->srcpad);
stream->added = TRUE; stream->added = TRUE;
} }
@ -1950,6 +1959,7 @@ gst_rtspsrc_activate_streams (GstRTSPSrc * src)
GstRTSPStream *stream = (GstRTSPStream *) walk->data; GstRTSPStream *stream = (GstRTSPStream *) walk->data;
if (stream->blockedpad) { if (stream->blockedpad) {
GST_DEBUG_OBJECT (src, "unblocking stream pad %p", stream);
gst_pad_set_blocked_async (stream->blockedpad, FALSE, gst_pad_set_blocked_async (stream->blockedpad, FALSE,
(GstPadBlockCallback) pad_unblocked, src); (GstPadBlockCallback) pad_unblocked, src);
stream->blockedpad = NULL; stream->blockedpad = NULL;
@ -2273,6 +2283,12 @@ gst_rtspsrc_loop_interleaved (GstRTSPSrc * src)
src->need_activate = FALSE; src->need_activate = FALSE;
} }
if (!src->session) {
/* set stream caps on buffer when we don't have a session manager to do it
* for us */
gst_buffer_set_caps (buf, stream->caps);
}
/* chain to the peer pad */ /* chain to the peer pad */
if (GST_PAD_IS_SINK (outpad)) if (GST_PAD_IS_SINK (outpad))
ret = gst_pad_chain (outpad, buf); ret = gst_pad_chain (outpad, buf);
@ -2916,8 +2932,9 @@ gst_rtspsrc_parse_methods (GstRTSPSrc * src, GstRTSPMessage * response)
gint indx = 0; gint indx = 0;
gint i; gint i;
/* clear supported methods */ /* clear supported methods, FIXME, extensions should be able to configure
src->methods = 0; * this. */
src->methods = GST_RTSP_PLAY | GST_RTSP_PAUSE;
/* Try Allow Header first */ /* Try Allow Header first */
field = GST_RTSP_HDR_ALLOW; field = GST_RTSP_HDR_ALLOW;
@ -3001,6 +3018,8 @@ gst_rtspsrc_create_transports_string (GstRTSPSrc * src,
if (res < 0) if (res < 0)
goto failed; goto failed;
GST_DEBUG_OBJECT (src, "got transports %s", GST_STR_NULL (*transports));
/* extension listed transports, use those */ /* extension listed transports, use those */
if (*transports != NULL) if (*transports != NULL)
return GST_RTSP_OK; return GST_RTSP_OK;
@ -3104,6 +3123,8 @@ gst_rtspsrc_prepare_transports (GstRTSPStream * stream, gchar ** transports)
p = next + 4; p = next + 4;
} }
/* append final part */
g_string_append (str, p);
g_free (*transports); g_free (*transports);
*transports = g_string_free (str, FALSE); *transports = g_string_free (str, FALSE);