rtpsession: Small cleanups

Make the property description prettier.
Actually multiple the bandwidth with the fraction.
This commit is contained in:
Wim Taymans 2010-09-13 15:44:52 +02:00
parent 1f17b334ff
commit d541f5e24d
2 changed files with 9 additions and 8 deletions

View file

@ -542,7 +542,8 @@ gst_rtp_session_class_init (GstRtpSessionClass * klass)
g_object_class_install_property (gobject_class, PROP_RTCP_FRACTION,
g_param_spec_double ("rtcp-fraction", "RTCP Fraction",
"The RTCP bandwidth of the session in bytes per second (or as a real fraction of the RTP bandwidth if < 1)",
"The RTCP bandwidth of the session in bytes per second "
"(or as a real fraction of the RTP bandwidth if < 1.0)",
0.0, G_MAXDOUBLE, DEFAULT_RTCP_FRACTION, G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, PROP_RTCP_RR_BANDWIDTH,

View file

@ -58,22 +58,22 @@ rtp_stats_set_bandwidths (RTPSessionStats * stats, guint rtp_bw,
rtcp_bw = rs + rr;
/* If rtcp_bw is between 0 and 1, it is a fraction of rtp_bw */
if (rtcp_bw > 0 && rtcp_bw < 1) {
if (rtp_bw > 0)
if (rtcp_bw > 0.0 && rtcp_bw < 1.0) {
if (rtp_bw > 0.0)
rtcp_bw = rtp_bw * rtcp_bw;
else
rtcp_bw = -1;
rtcp_bw = -1.0;
}
/* RTCP is 5% of the RTP bandwidth */
if (rtp_bw == -1 && rtcp_bw > 0)
if (rtp_bw == -1 && rtcp_bw > 1.0)
rtp_bw = rtcp_bw * 20;
else if (rtp_bw != -1 && rtcp_bw < 0)
else if (rtp_bw != -1 && rtcp_bw < 0.0)
rtcp_bw = rtp_bw / 20;
else if (rtp_bw == -1 && rtcp_bw < 0) {
else if (rtp_bw == -1 && rtcp_bw < 0.0) {
/* nothing given, take defaults */
rtp_bw = RTP_STATS_BANDWIDTH;
rtcp_bw = rtp_bw = RTP_STATS_RTCP_FRACTION;
rtcp_bw = rtp_bw * RTP_STATS_RTCP_FRACTION;
}
stats->bandwidth = rtp_bw;