mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-03-10 22:01:29 +00:00
gst/rtsp/gstrtspsrc.*: For container formats we only need to activate one of the streams so that we correctly signal ...
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:
parent
d422a05194
commit
cf20f497cc
3 changed files with 14 additions and 1 deletions
|
@ -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>
|
||||
|
||||
* docs/plugins/gst-plugins-good-plugins.args:
|
||||
|
|
|
@ -516,6 +516,7 @@ gst_rtspsrc_create_stream (GstRTSPSrc * src, SDPMessage * sdp, gint idx)
|
|||
* the element. */
|
||||
stream->last_ret = GST_FLOW_NOT_LINKED;
|
||||
stream->added = FALSE;
|
||||
stream->disabled = FALSE;
|
||||
stream->id = src->numstreams++;
|
||||
|
||||
/* 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;
|
||||
for (lstream = src->streams; lstream; lstream = g_list_next (lstream)) {
|
||||
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;
|
||||
break;
|
||||
}
|
||||
|
@ -3155,6 +3158,7 @@ gst_rtspsrc_setup_streams (GstRTSPSrc * src)
|
|||
if (!src->extension->configure_stream (src->extension, stream)) {
|
||||
GST_DEBUG_OBJECT (src, "skipping stream %p, disabled by extension",
|
||||
stream);
|
||||
stream->disabled = TRUE;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -88,6 +88,7 @@ struct _GstRTSPStream {
|
|||
GstPad *srcpad;
|
||||
GstFlowReturn last_ret;
|
||||
gboolean added;
|
||||
gboolean disabled;
|
||||
|
||||
/* for interleaved mode */
|
||||
guint8 channel[2];
|
||||
|
|
Loading…
Reference in a new issue