wtay gst-plugins-bad: gst-plugins-bad/ gst-plugins-bad/gst/rtpmanager/

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-bad
Changes by:     wtay
Date:           Mon Dec 29 2008  14:22:02 UTC

Log message:
* gst/rtpmanager/rtpsource.c: (rtp_source_init),
(rtp_source_update_caps), (get_clock_rate):
* gst/rtpmanager/rtpsource.h:
When no payload was specified on the caps but there was a clock-rate,
assume the clock-rate corresponds to the first payload type found in the
RTP packets. Fixes #565509.

Modified files:
    .               : ChangeLog
    gst/rtpmanager  : rtpsource.c rtpsource.h

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.3833&r2=1.3834
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/rtpmanager/rtpsource.c.diff?r1=1.32&r2=1.33
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/gst/rtpmanager/rtpsource.h.diff?r1=1.13&r2=1.14

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v
retrieving revision 1.3833
retrieving revision 1.3834
diff -u -d -r1.3833 -r1.3834
--- ChangeLog	23 Dec 2008 16:32:04 -0000	1.3833
+++ ChangeLog	29 Dec 2008 14:21:45 -0000	1.3834
@@ -1,3 +1,12 @@
+2008-12-29  Wim Taymans  <[email protected]>
+
+	* gst/rtpmanager/rtpsource.c: (rtp_source_init),
+	(rtp_source_update_caps), (get_clock_rate):
+	* gst/rtpmanager/rtpsource.h:
+	When no payload was specified on the caps but there was a clock-rate,
+	assume the clock-rate corresponds to the first payload type found in the
+	RTP packets. Fixes #565509.
 2008-12-23  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
 	* sys/dvb/gstdvbsrc.c:
Index: rtpsource.c
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/rtpmanager/rtpsource.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- rtpsource.c	22 Nov 2008 15:24:47 -0000	1.32
+++ rtpsource.c	29 Dec 2008 14:21:47 -0000	1.33
@@ -156,7 +156,7 @@
   src->internal = FALSE;
   src->probation = RTP_DEFAULT_PROBATION;
-  src->payload = 0;
+  src->payload = -1;
   src->clock_rate = -1;
   src->packets = g_queue_new ();
   src->seqnum_base = -1;
@@ -575,13 +575,22 @@
   if (gst_structure_get_int (s, "payload", &ival))
     src->payload = ival;
+  else
+    src->payload = -1;
   GST_DEBUG ("got payload %d", src->payload);
-  gst_structure_get_int (s, "clock-rate", &src->clock_rate);
+  if (gst_structure_get_int (s, "clock-rate", &ival))
+    src->clock_rate = ival;
+    src->clock_rate = -1;
   GST_DEBUG ("got clock-rate %d", src->clock_rate);
   if (gst_structure_get_uint (s, "seqnum-base", &val))
     src->seqnum_base = val;
+    src->seqnum_base = -1;
   GST_DEBUG ("got seqnum-base %" G_GINT32_FORMAT, src->seqnum_base);
   gst_caps_replace (&src->caps, caps);
@@ -776,7 +785,12 @@
 static gint
 get_clock_rate (RTPSource * src, guint8 payload)
 {
-  if (payload != src->payload) {
+  if (src->payload == -1) {
+    /* first payload received, nothing was in the caps, lock on to this payload */
+    src->payload = payload;
+    GST_DEBUG ("first payload %d", payload);
+  } else if (payload != src->payload) {
+    /* we have a different payload than before, reset the clock-rate */
     GST_DEBUG ("new payload %d", payload);
     src->payload = payload;
     src->clock_rate = -1;
Index: rtpsource.h
RCS file: /cvs/gstreamer/gst-plugins-bad/gst/rtpmanager/rtpsource.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- rtpsource.h	20 Nov 2008 18:41:34 -0000	1.13
+++ rtpsource.h	29 Dec 2008 14:21:47 -0000	1.14
@@ -128,7 +128,7 @@
   gboolean      have_rtcp_from;
   GstNetAddress rtcp_from;
-  guint8        payload;
+  gint          payload;
   GstCaps      *caps;
   gint          clock_rate;
   gint32        seqnum_base;

------------------------------------------------------------------------------