mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 09:55:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpsession: Always send application requested feedback in immediate mode

Browse source 
Send as many application requested feedback messages in immediate mode, even if they
have already been sent.

https://bugzilla.gnome.org/show_bug.cgi?id=654583
This commit is contained in:
Olivier Crête 2011-06-08 15:57:37 -04:00 committed by Mark Nauwelaerts
parent 354faabda0
commit 6095d2a3f0
2 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gst/rtpmanager/rtpsession.c
View file

@ -60,6 +60,7 @@ enum
#define DEFAULT_SOURCES NULL #define DEFAULT_SOURCES NULL
#define DEFAULT_RTCP_MIN_INTERVAL (RTP_STATS_MIN_INTERVAL * GST_SECOND) #define DEFAULT_RTCP_MIN_INTERVAL (RTP_STATS_MIN_INTERVAL * GST_SECOND)
#define DEFAULT_RTCP_FEEDBACK_RETENTION_WINDOW (2 * GST_SECOND) #define DEFAULT_RTCP_FEEDBACK_RETENTION_WINDOW (2 * GST_SECOND)
#define DEFAULT_RTCP_IMMEDIATE_FEEDBACK_THRESHOLD (3)
enum enum
{ {
@ -78,6 +79,7 @@ enum
PROP_FAVOR_NEW, PROP_FAVOR_NEW,
PROP_RTCP_MIN_INTERVAL, PROP_RTCP_MIN_INTERVAL,
PROP_RTCP_FEEDBACK_RETENTION_WINDOW, PROP_RTCP_FEEDBACK_RETENTION_WINDOW,
PROP_RTCP_IMMEDIATE_FEEDBACK_THRESHOLD,
PROP_LAST PROP_LAST
}; };
@ -492,6 +494,14 @@ rtp_session_class_init (RTPSessionClass * klass)
0, G_MAXUINT64, DEFAULT_RTCP_FEEDBACK_RETENTION_WINDOW, 0, G_MAXUINT64, DEFAULT_RTCP_FEEDBACK_RETENTION_WINDOW,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
PROP_RTCP_IMMEDIATE_FEEDBACK_THRESHOLD,
g_param_spec_uint ("rtcp-immediate-feedback-threshold",
"RTCP Immediate Feedback threshold",
"The maximum number of members of a RTP session for which immediate"
" feedback is used",
0, G_MAXUINT, DEFAULT_RTCP_IMMEDIATE_FEEDBACK_THRESHOLD,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
klass->get_source_by_ssrc = klass->get_source_by_ssrc =
GST_DEBUG_FUNCPTR (rtp_session_get_source_by_ssrc); GST_DEBUG_FUNCPTR (rtp_session_get_source_by_ssrc);
@ -550,6 +560,8 @@ rtp_session_init (RTPSession * sess)
sess->first_rtcp = TRUE; sess->first_rtcp = TRUE;
sess->allow_early = TRUE; sess->allow_early = TRUE;
sess->rtcp_feedback_retention_window = DEFAULT_RTCP_FEEDBACK_RETENTION_WINDOW; sess->rtcp_feedback_retention_window = DEFAULT_RTCP_FEEDBACK_RETENTION_WINDOW;
sess->rtcp_immediate_feedback_threshold =
DEFAULT_RTCP_IMMEDIATE_FEEDBACK_THRESHOLD;
sess->rtcp_pli_requests = g_array_new (FALSE, FALSE, sizeof (guint32)); sess->rtcp_pli_requests = g_array_new (FALSE, FALSE, sizeof (guint32));
@ -649,6 +661,9 @@ rtp_session_set_property (GObject * object, guint prop_id,
rtp_stats_set_min_interval (&sess->stats, rtp_stats_set_min_interval (&sess->stats,
(gdouble) g_value_get_uint64 (value) / GST_SECOND); (gdouble) g_value_get_uint64 (value) / GST_SECOND);
break; break;
case PROP_RTCP_IMMEDIATE_FEEDBACK_THRESHOLD:
sess->rtcp_immediate_feedback_threshold = g_value_get_uint (value);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -703,6 +718,9 @@ rtp_session_get_property (GObject * object, guint prop_id,
case PROP_RTCP_MIN_INTERVAL: case PROP_RTCP_MIN_INTERVAL:
g_value_set_uint64 (value, sess->stats.min_interval * GST_SECOND); g_value_set_uint64 (value, sess->stats.min_interval * GST_SECOND);
break; break;
case PROP_RTCP_IMMEDIATE_FEEDBACK_THRESHOLD:
g_value_set_uint (value, sess->rtcp_immediate_feedback_threshold);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -3143,8 +3161,13 @@ rtp_session_request_early_rtcp (RTPSession * sess, GstClockTime current_time,
if (current_time + T_dither_max > sess->next_rtcp_check_time) if (current_time + T_dither_max > sess->next_rtcp_check_time)
goto dont_send; goto dont_send;
/* RFC 4585 section 3.5.2 step 4 */ /* RFC 4585 section 3.5.2 step 4
if (sess->allow_early == FALSE) * Don't send if allow_early is FALSE, but not if we are in
* immediate mode, meaning we are part of a group of at most the
* application-specific threshold.
*/
if (sess->total_sources > sess->rtcp_immediate_feedback_threshold &&
sess->allow_early == FALSE)
goto dont_send; goto dont_send;
if (T_dither_max) { if (T_dither_max) {

1
gst/rtpmanager/rtpsession.h
View file

@ -232,6 +232,7 @@ struct _RTPSession {
gboolean change_ssrc; gboolean change_ssrc;
gboolean favor_new; gboolean favor_new;
GstClockTime rtcp_feedback_retention_window; GstClockTime rtcp_feedback_retention_window;
guint rtcp_immediate_feedback_threshold;
GArray *rtcp_pli_requests; GArray *rtcp_pli_requests;
GstClockTime last_keyframe_request; GstClockTime last_keyframe_request;