rtpsource: get clock-rate from pt if needed to generate SR

https://bugzilla.gnome.org/show_bug.cgi?id=780105

diff --git a/gst/rtpmanager/rtpsource.c b/gst/rtpmanager/rtpsource.c
index 172449de9cfc29ec6a2ea308581545475d390441..876437fa22d0aaa14392540f5be4e0eaef58a48d 100644 (file)
--- a/gst/rtpmanager/rtpsource.c
+++ b/gst/rtpmanager/rtpsource.c
@@ -304,6 +304,8 @@ rtp_source_init (RTPSource * src)
   src->last_keyframe_request = GST_CLOCK_TIME_NONE;
 
   rtp_source_reset (src);
+
+  src->pt_set = FALSE;
 }
 
 void
@@ -1277,6 +1279,13 @@ rtp_source_send_rtp (RTPSource * src, RTPPacketInfo * pinfo)
   if (!update_receiver_stats (src, pinfo, FALSE))
     return GST_FLOW_OK;
 
+  if (src->pt_set && src->pt != pinfo->pt) {
+    GST_WARNING ("Changing pt to %u for SSRC %u", src->ssrc, pinfo->pt);
+  }
+
+  src->pt = pinfo->pt;
+  src->pt_set = TRUE;
+
   /* update stats for the SR */
   src->stats.packets_sent += pinfo->packets;
   src->stats.octets_sent += pinfo->payload_len;
@@ -1482,6 +1491,12 @@ rtp_source_get_new_sr (RTPSource * src, guint64 ntpnstime,
   GST_DEBUG ("last_rtime %" GST_TIME_FORMAT ", last_rtptime %"
       G_GUINT64_FORMAT, GST_TIME_ARGS (src->last_rtime), t_rtp);
 
+  if (src->clock_rate == -1 && src->pt_set) {
+    GST_INFO ("no clock-rate, getting for pt %u and SSRC %u", src->pt,
+        src->ssrc);
+    get_clock_rate (src, src->pt);
+  }
+
   if (src->clock_rate != -1) {
     /* get the diff between the clock running_time and the buffer running_time.
      * This is the elapsed time, as measured against the pipeline clock, between

diff --git a/gst/rtpmanager/rtpsource.h b/gst/rtpmanager/rtpsource.h
index f5f093a71ea08ffbeecad1678b2bc3f9fdba4b98..282267eda6734055ac90badeb82426b31cfefa15 100644 (file)
--- a/gst/rtpmanager/rtpsource.h
+++ b/gst/rtpmanager/rtpsource.h
@@ -199,6 +199,8 @@ struct _RTPSource {
   gboolean     send_nack;
   GArray      *nacks;
 
+  gboolean      pt_set;
+  guint8        pt;
 };
 
 struct _RTPSourceClass {