|
 |
31ecc2 |
From a98341397d3522fdc7470c4220775035a2d1d790 Mon Sep 17 00:00:00 2001
|
|
|
31ecc2 |
From: Youness Alaoui <kakaroto@kakaroto.homelinux.net>
|
|
|
31ecc2 |
Date: Thu, 7 Aug 2014 21:58:14 -0400
|
|
|
31ecc2 |
Subject: [PATCH] jitterbuffer: Allow rtp caps without clock-rate
|
|
|
31ecc2 |
|
|
|
31ecc2 |
The jitterbuffer shouldn't force clock-rate on its sink pad, this will cause a negotiation issue since rtpssrcdemux doesn't have the clock-rate and doesn't add it to the caps. The documentation states that the clock-rate can either be specified through the caps or through the request-pt-map signal, so we must remove clock-rate from the pad templates and we must accept the GST_EVENT_CAPS if the caps don't have the clock-rate.
|
|
|
31ecc2 |
|
|
|
31ecc2 |
https://bugzilla.gnome.org/show_bug.cgi?id=734322
|
|
|
31ecc2 |
---
|
|
|
31ecc2 |
gst/rtpmanager/gstrtpjitterbuffer.c | 16 ++++------------
|
|
|
31ecc2 |
1 file changed, 4 insertions(+), 12 deletions(-)
|
|
|
31ecc2 |
|
|
|
31ecc2 |
diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c
|
|
|
31ecc2 |
index c8c512e..0eccd1a 100644
|
|
|
31ecc2 |
--- a/gst/rtpmanager/gstrtpjitterbuffer.c
|
|
|
31ecc2 |
+++ b/gst/rtpmanager/gstrtpjitterbuffer.c
|
|
|
31ecc2 |
@@ -342,9 +342,9 @@ static GstStaticPadTemplate gst_rtp_jitter_buffer_sink_template =
|
|
|
31ecc2 |
GST_STATIC_PAD_TEMPLATE ("sink",
|
|
|
31ecc2 |
GST_PAD_SINK,
|
|
|
31ecc2 |
GST_PAD_ALWAYS,
|
|
|
31ecc2 |
- GST_STATIC_CAPS ("application/x-rtp, "
|
|
|
31ecc2 |
- "clock-rate = (int) [ 1, 2147483647 ]"
|
|
|
31ecc2 |
- /* "payload = (int) , "
|
|
|
31ecc2 |
+ GST_STATIC_CAPS ("application/x-rtp"
|
|
|
31ecc2 |
+ /* "clock-rate = (int) [ 1, 2147483647 ], "
|
|
|
31ecc2 |
+ * "payload = (int) , "
|
|
|
31ecc2 |
* "encoding-name = (string) "
|
|
|
31ecc2 |
*/ )
|
|
|
31ecc2 |
);
|
|
|
31ecc2 |
@@ -1364,9 +1364,7 @@ queue_event (GstRtpJitterBuffer * jitterbuffer, GstEvent * event)
|
|
|
31ecc2 |
GstCaps *caps;
|
|
|
31ecc2 |
|
|
|
31ecc2 |
gst_event_parse_caps (event, &caps);
|
|
|
31ecc2 |
- if (!gst_jitter_buffer_sink_parse_caps (jitterbuffer, caps))
|
|
|
31ecc2 |
- goto wrong_caps;
|
|
|
31ecc2 |
-
|
|
|
31ecc2 |
+ gst_jitter_buffer_sink_parse_caps (jitterbuffer, caps);
|
|
|
31ecc2 |
break;
|
|
|
31ecc2 |
}
|
|
|
31ecc2 |
case GST_EVENT_SEGMENT:
|
|
|
31ecc2 |
@@ -1397,12 +1395,6 @@ queue_event (GstRtpJitterBuffer * jitterbuffer, GstEvent * event)
|
|
|
31ecc2 |
return TRUE;
|
|
|
31ecc2 |
|
|
|
31ecc2 |
/* ERRORS */
|
|
|
31ecc2 |
-wrong_caps:
|
|
|
31ecc2 |
- {
|
|
|
31ecc2 |
- GST_DEBUG_OBJECT (jitterbuffer, "received invalid caps");
|
|
|
31ecc2 |
- gst_event_unref (event);
|
|
|
31ecc2 |
- return FALSE;
|
|
|
31ecc2 |
- }
|
|
|
31ecc2 |
newseg_wrong_format:
|
|
|
31ecc2 |
{
|
|
|
31ecc2 |
GST_DEBUG_OBJECT (jitterbuffer, "received non TIME newsegment");
|
|
|
31ecc2 |
--
|
|
|
31ecc2 |
2.1.0
|
|
|
31ecc2 |
|