mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpsession: Handle RTCP-SR-REQ (RFC6051) RTCP feedback message

Browse source 
This causes an RTCP SR to be sent at the earliest possible time.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2132>
This commit is contained in:
Sebastian Dröge 2022-04-11 19:14:43 +03:00 committed by GStreamer Marge Bot
parent 0c819d2f31
commit ce38614e1a
2 changed files with 40 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
subprojects/gst-plugins-good/gst/rtpmanager/rtpsession.c
View file

@ -2891,6 +2891,34 @@ rtp_session_process_nack (RTPSession * sess, guint32 sender_ssrc,
} }
} }
static void
rtp_session_process_sr_req (RTPSession * sess, guint32 sender_ssrc,
guint32 media_ssrc)
{
RTPSource *src;
/* Request a new SR in feedback profiles ASAP */
if (sess->rtp_profile != GST_RTP_PROFILE_AVPF
&& sess->rtp_profile != GST_RTP_PROFILE_SAVPF)
return;
src = find_source (sess, sender_ssrc);
/* Our own RTCP packet */
if (src && src->internal)
return;
src = find_source (sess, media_ssrc);
/* Not an SSRC we're producing */
if (!src || !src->internal)
return;
GST_DEBUG_OBJECT (sess, "Handling RTCP-SR-REQ");
/* FIXME: 5s max_delay hard-coded here as we have to give some
* high enough value */
sess->sr_req_pending = TRUE;
rtp_session_send_rtcp (sess, 5 * GST_SECOND);
}
static void static void
rtp_session_process_twcc (RTPSession * sess, guint32 sender_ssrc, rtp_session_process_twcc (RTPSession * sess, guint32 sender_ssrc,
guint32 media_ssrc, guint8 * fci_data, guint fci_length) guint32 media_ssrc, guint8 * fci_data, guint fci_length)
@ -3011,6 +3039,9 @@ rtp_session_process_feedback (RTPSession * sess, GstRTCPPacket * packet,
rtp_session_process_nack (sess, sender_ssrc, media_ssrc, rtp_session_process_nack (sess, sender_ssrc, media_ssrc,
fci_data, fci_length, current_time); fci_data, fci_length, current_time);
break; break;
case GST_RTCP_RTPFB_TYPE_RTCP_SR_REQ:
rtp_session_process_sr_req (sess, sender_ssrc, media_ssrc);
break;
case GST_RTCP_RTPFB_TYPE_TWCC: case GST_RTCP_RTPFB_TYPE_TWCC:
rtp_session_process_twcc (sess, sender_ssrc, media_ssrc, rtp_session_process_twcc (sess, sender_ssrc, media_ssrc,
fci_data, fci_length); fci_data, fci_length);
@ -3760,14 +3791,14 @@ session_start_rtcp (RTPSession * sess, ReportData * data)
gst_rtcp_buffer_map (data->rtcp, GST_MAP_READWRITE, rtcp); gst_rtcp_buffer_map (data->rtcp, GST_MAP_READWRITE, rtcp);
if (data->is_early && sess->reduced_size_rtcp) if (RTP_SOURCE_IS_SENDER (own) && (!data->is_early || !sess->reduced_size_rtcp
return; || sess->sr_req_pending)) {
if (RTP_SOURCE_IS_SENDER (own)) {
guint64 ntptime; guint64 ntptime;
guint32 rtptime; guint32 rtptime;
guint32 packet_count, octet_count; guint32 packet_count, octet_count;
sess->sr_req_pending = FALSE;
/* we are a sender, create SR */ /* we are a sender, create SR */
GST_DEBUG ("create SR for SSRC %08x", own->ssrc); GST_DEBUG ("create SR for SSRC %08x", own->ssrc);
gst_rtcp_buffer_add_packet (rtcp, GST_RTCP_TYPE_SR, packet); gst_rtcp_buffer_add_packet (rtcp, GST_RTCP_TYPE_SR, packet);
@ -3784,7 +3815,7 @@ session_start_rtcp (RTPSession * sess, ReportData * data)
sess->timestamp_sender_reports ? ntptime : 0, sess->timestamp_sender_reports ? ntptime : 0,
sess->timestamp_sender_reports ? rtptime : 0, sess->timestamp_sender_reports ? rtptime : 0,
packet_count, octet_count); packet_count, octet_count);
} else { } else if (!data->is_early || !sess->reduced_size_rtcp) {
/* we are only receiver, create RR */ /* we are only receiver, create RR */
GST_DEBUG ("create RR for SSRC %08x", own->ssrc); GST_DEBUG ("create RR for SSRC %08x", own->ssrc);
gst_rtcp_buffer_add_packet (rtcp, GST_RTCP_TYPE_RR, packet); gst_rtcp_buffer_add_packet (rtcp, GST_RTCP_TYPE_RR, packet);
@ -4452,6 +4483,7 @@ generate_rtcp (const gchar * key, RTPSource * source, ReportData * data)
RTPSession *sess = data->sess; RTPSession *sess = data->sess;
gboolean is_bye = FALSE; gboolean is_bye = FALSE;
ReportOutput *output; ReportOutput *output;
gboolean sr_req_pending = sess->sr_req_pending;
/* only generate RTCP for active internal sources */ /* only generate RTCP for active internal sources */
if (!source->internal || source->sent_bye) if (!source->internal || source->sent_bye)
@ -4482,7 +4514,8 @@ generate_rtcp (const gchar * key, RTPSource * source, ReportData * data)
g_hash_table_foreach (sess->ssrcs[sess->mask_idx], g_hash_table_foreach (sess->ssrcs[sess->mask_idx],
(GHFunc) session_report_blocks, data); (GHFunc) session_report_blocks, data);
} }
if (!data->has_sdes && (!data->is_early || !sess->reduced_size_rtcp)) if (!data->has_sdes && (!data->is_early || !sess->reduced_size_rtcp
|| sr_req_pending))
session_sdes (sess, data); session_sdes (sess, data);
if (data->have_fir) if (data->have_fir)

1
subprojects/gst-plugins-good/gst/rtpmanager/rtpsession.h
View file

@ -280,6 +280,7 @@ struct _RTPSession {
GstClockTime next_early_rtcp_time; GstClockTime next_early_rtcp_time;
gboolean sr_req_pending;
gboolean scheduled_bye; gboolean scheduled_bye;
RTPSessionCallbacks callbacks; RTPSessionCallbacks callbacks;