gst/rtsp/gstrtspsrc.*: For container formats we only need to activate one of the...

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.

diff --git a/ChangeLog b/ChangeLog
index b0cd6001d5d17e60428d9a5d08be68856c398b2e..4fee3c160e86efee4f77f29cfd90caa20d47915c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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:

diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index 078c8d866187aa11763381b8df0c095151e7ba8e..54bd15b885c5b24be85ae763159c35b04009c33b 100644 (file)
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -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;
       }
     }

diff --git a/gst/rtsp/gstrtspsrc.h b/gst/rtsp/gstrtspsrc.h
index caf9efe98018ae84945134717ba3d6467791f5f6..d51e99cf498376a0d94793c07bc825847f6b72f6 100644 (file)
--- a/gst/rtsp/gstrtspsrc.h
+++ b/gst/rtsp/gstrtspsrc.h
@@ -88,6 +88,7 @@ struct _GstRTSPStream {
   GstPad       *srcpad;
   GstFlowReturn last_ret;
   gboolean      added;
+  gboolean      disabled;
 
   /* for interleaved mode */
   guint8        channel[2];