Commit 42531337 authored by Olivier Crête's avatar Olivier Crête 👻 Committed by Tim-Philipp Müller

rtpsession: Remove incomplete support for RTCP FIR

Remove bits that were meant to suppport RTCP FIR

https://bugzilla.gnome.org/show_bug.cgi?id=648160
parent bdb8bbc1
......@@ -1390,38 +1390,21 @@ gst_rtp_session_request_remote_key_unit (GstRtpSession * rtpsession,
caps = gst_rtp_session_get_caps_for_pt (rtpsession, payload);
if (caps) {
gboolean fir, pli;
const GstStructure *s = gst_caps_get_structure (caps, 0);
gboolean pli;
if (!gst_structure_get_boolean (s, "rtcp-fb-nack-fir", &fir))
fir = FALSE;
if (!gst_structure_get_boolean (s, "rtcp-fb-nack-pli", &pli))
pli = FALSE;
pli = gst_structure_has_field (s, "rtcp-fb-nack-pli");
gst_caps_unref (caps);
if (!pli && !fir)
goto out;
/* When we need all headers, use FIR if possible falling back to PLI if
* it's available */
if (all_headers) {
/* 500 ms acceptable delay for urgent request is a guesstimate, it could
* be made configurable if needed
*/
/* If we don't have fir, fall back to pli */
rtp_session_request_key_unit (rtpsession->priv->session, ssrc, fir);
if (pli) {
rtp_session_request_key_unit (rtpsession->priv->session, ssrc);
rtp_session_request_early_rtcp (rtpsession->priv->session,
gst_clock_get_time (rtpsession->priv->sysclock), 500 * GST_MSECOND);
requested = TRUE;
} else if (pli) {
rtp_session_request_key_unit (rtpsession->priv->session, ssrc, FALSE);
gst_clock_get_time (rtpsession->priv->sysclock), 200 * GST_MSECOND);
requested = TRUE;
}
}
out:
return requested;
}
......
......@@ -3171,13 +3171,10 @@ dont_send:
}
void
rtp_session_request_key_unit (RTPSession * sess, guint32 ssrc, gboolean fir)
rtp_session_request_key_unit (RTPSession * sess, guint32 ssrc)
{
guint i;
if (fir)
return;
for (i = 0; i < sess->rtcp_pli_requests->len; i++)
if (ssrc == g_array_index (sess->rtcp_pli_requests, guint32, i))
return;
......
......@@ -348,7 +348,6 @@ void rtp_session_request_early_rtcp (RTPSession * sess, GstClockT
/* Notify session of a request for a new key unit */
void rtp_session_request_key_unit (RTPSession * sess,
guint32 ssrc,
gboolean fir);
guint32 ssrc);
#endif /* __RTP_SESSION_H__ */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment