Skip to content

Commit

Permalink
jitterbuffer: Allow rtp caps without clock-rate
Browse files Browse the repository at this point in the history
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
  • Loading branch information
kakaroto authored and ocrete committed Aug 21, 2014
1 parent fa103ca commit a983413
Showing 1 changed file with 4 additions and 12 deletions.
16 changes: 4 additions & 12 deletions gst/rtpmanager/gstrtpjitterbuffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) "
*/ )
);
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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");
Expand Down

0 comments on commit a983413

Please sign in to comment.