mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-11 14:21:20 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/rtsp/gstrtspsrc.*: For container formats we only need to activate one of the streams so that we correctly signal ...

Browse source 
Original commit message from CVS:
* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_create_stream),
(new_session_pad), (gst_rtspsrc_setup_streams):
* gst/rtsp/gstrtspsrc.h:
For container formats we only need to activate one of the streams so
that we correctly signal no-more-pads. Fixes #451015.
This commit is contained in:
Wim Taymans 2007-06-27 11:04:47 +00:00
parent d422a05194
commit cf20f497cc
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2007-06-27 Wim Taymans <wim@fluendo.com>
* gst/rtsp/gstrtspsrc.c: (gst_rtspsrc_create_stream),
(new_session_pad), (gst_rtspsrc_setup_streams):
* gst/rtsp/gstrtspsrc.h:
For container formats we only need to activate one of the streams so
that we correctly signal no-more-pads. Fixes #451015.
2007-06-25 Stefan Kost <ensonic@users.sf.net> 2007-06-25 Stefan Kost <ensonic@users.sf.net>
* docs/plugins/gst-plugins-good-plugins.args: * docs/plugins/gst-plugins-good-plugins.args:

6
gst/rtsp/gstrtspsrc.c
View file

@ -516,6 +516,7 @@ gst_rtspsrc_create_stream (GstRTSPSrc * src, SDPMessage * sdp, gint idx)
* the element. */ * the element. */
stream->last_ret = GST_FLOW_NOT_LINKED; stream->last_ret = GST_FLOW_NOT_LINKED;
stream->added = FALSE; stream->added = FALSE;
stream->disabled = FALSE;
stream->id = src->numstreams++; stream->id = src->numstreams++;
/* we must have a payload. No payload means we cannot create caps */ /* we must have a payload. No payload means we cannot create caps */
@ -1406,7 +1407,9 @@ new_session_pad (GstElement * session, GstPad * pad, GstRTSPSrc * src)
all_added = TRUE; all_added = TRUE;
for (lstream = src->streams; lstream; lstream = g_list_next (lstream)) { for (lstream = src->streams; lstream; lstream = g_list_next (lstream)) {
stream = (GstRTSPStream *) lstream->data; stream = (GstRTSPStream *) lstream->data;
if (!stream->added) { /* a container stream only needs one pad added. Also disabled streams don't
* count */
if (!stream->container && !stream->disabled && !stream->added) {
all_added = FALSE; all_added = FALSE;
break; break;
} }
@ -3155,6 +3158,7 @@ gst_rtspsrc_setup_streams (GstRTSPSrc * src)
if (!src->extension->configure_stream (src->extension, stream)) { if (!src->extension->configure_stream (src->extension, stream)) {
GST_DEBUG_OBJECT (src, "skipping stream %p, disabled by extension", GST_DEBUG_OBJECT (src, "skipping stream %p, disabled by extension",
stream); stream);
stream->disabled = TRUE;
continue; continue;
} }
} }

1
gst/rtsp/gstrtspsrc.h
View file

@ -88,6 +88,7 @@ struct _GstRTSPStream {
GstPad *srcpad; GstPad *srcpad;
GstFlowReturn last_ret; GstFlowReturn last_ret;
gboolean added; gboolean added;
gboolean disabled;
/* for interleaved mode */ /* for interleaved mode */
guint8 channel[2]; guint8 channel[2];