From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 5 Mar 2014 15:19:19 +0000 (+0100)
Subject: rtspsrc: just use the SDP index as the stream id
X-Git-Tag: 1.19.3~509^2~4768
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=27d883fe64d9b452abfcec51b8fadc79a6b1eb8d;p=platform%2Fupstream%2Fgstreamer.git

rtspsrc: just use the SDP index as the stream id

Use the index of the media stream in the SDP as the stream id instead of
keeping a separate counter.
---

diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
index 5127785..3e227f9 100644
--- a/gst/rtsp/gstrtspsrc.c
+++ b/gst/rtsp/gstrtspsrc.c
@@ -1429,7 +1429,7 @@ gst_rtspsrc_create_stream (GstRTSPSrc * src, GstSDPMessage * sdp, gint idx)
   stream->last_ret = GST_FLOW_NOT_LINKED;
   stream->added = FALSE;
   stream->disabled = FALSE;
-  stream->id = src->numstreams++;
+  stream->id = idx;
   stream->eos = FALSE;
   stream->discont = TRUE;
   stream->seqbase = -1;
@@ -1579,7 +1579,6 @@ gst_rtspsrc_cleanup (GstRTSPSrc * src)
     gst_bin_remove (GST_BIN_CAST (src), src->manager);
     src->manager = NULL;
   }
-  src->numstreams = 0;
   if (src->props)
     gst_structure_free (src->props);
   src->props = NULL;
diff --git a/gst/rtsp/gstrtspsrc.h b/gst/rtsp/gstrtspsrc.h
index 1751b30..0ee0888 100644
--- a/gst/rtsp/gstrtspsrc.h
+++ b/gst/rtsp/gstrtspsrc.h
@@ -193,7 +193,6 @@ struct _GstRTSPSrc {
 
   GstSDPMessage   *sdp;
   gboolean         from_sdp;
-  gint             numstreams;
   GList           *streams;
   GstStructure    *props;
   gboolean         need_activate;