diff options
| author | Youness Alaoui <kakaroto@kakaroto.homelinux.net> | 2014-08-07 21:58:14 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2014-08-21 18:32:58 -0400 |
| commit | a98341397d3522fdc7470c4220775035a2d1d790 (patch) | |
| tree | 317fd05b8f2b5ceae5c606bc3777cc36d7ac9a38 | |
| parent | fa103ca5ad5b17e4a6162c3e166134bd7d89c254 (diff) | |
jitterbuffer: Allow rtp caps without clock-rate
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.
https://bugzilla.gnome.org/show_bug.cgi?id=734322
| -rw-r--r-- | gst/rtpmanager/gstrtpjitterbuffer.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c index c8c512e1c..0eccd1a28 100644 --- a/gst/rtpmanager/gstrtpjitterbuffer.c +++ b/gst/rtpmanager/gstrtpjitterbuffer.c @@ -342,9 +342,9 @@ static GstStaticPadTemplate gst_rtp_jitter_buffer_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS ("application/x-rtp, " - "clock-rate = (int) [ 1, 2147483647 ]" - /* "payload = (int) , " + GST_STATIC_CAPS ("application/x-rtp" + /* "clock-rate = (int) [ 1, 2147483647 ], " + * "payload = (int) , " * "encoding-name = (string) " */ ) ); @@ -1364,9 +1364,7 @@ queue_event (GstRtpJitterBuffer * jitterbuffer, GstEvent * event) GstCaps *caps; gst_event_parse_caps (event, &caps); - if (!gst_jitter_buffer_sink_parse_caps (jitterbuffer, caps)) - goto wrong_caps; - + gst_jitter_buffer_sink_parse_caps (jitterbuffer, caps); break; } case GST_EVENT_SEGMENT: @@ -1397,12 +1395,6 @@ queue_event (GstRtpJitterBuffer * jitterbuffer, GstEvent * event) return TRUE; /* ERRORS */ -wrong_caps: - { - GST_DEBUG_OBJECT (jitterbuffer, "received invalid caps"); - gst_event_unref (event); - return FALSE; - } newseg_wrong_format: { GST_DEBUG_OBJECT (jitterbuffer, "received non TIME newsegment"); |