generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not register bandwidth observer for receive only channels.

Browse Source 
An incoming rtcp report block is inserted to both send and receive channels in Call::DeliverRtcp. The report block may also be accepted by each receive channel (in addition to the send channel) but fails to calculate the rtt (=0).
Remove registration of bandwidth observer for receive channels. Prevents multiple callbacks to the bitrate controller (and with incorrect rtt) for an incoming report block.

BUG=4546
R=mflodman@webrtc.org, pbos@webrtc.org, stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/45209004

Cr-Commit-Position: refs/heads/master@{#9055}
This commit is contained in:
Åsa Persson
2015-04-22 14:57:50 +02:00
parent 393347ff98
commit 96d1d89c3e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/video_engine/vie_channel.cc
View File

@@ -1853,7 +1853,6 @@ RtpRtcp::Configuration ViEChannel::CreateRtpRtcpConfiguration() {
configuration.audio = false;
configuration.outgoing_transport = &vie_sender_;
configuration.intra_frame_callback = intra_frame_observer_;
configuration.bandwidth_callback = bandwidth_observer_.get();
configuration.rtt_stats = rtt_stats_;
configuration.rtcp_packet_type_counter_observer =
&rtcp_packet_type_counter_observer_;
@@ -1861,6 +1860,8 @@ RtpRtcp::Configuration ViEChannel::CreateRtpRtcpConfiguration() {
configuration.send_bitrate_observer = &send_bitrate_observer_;
configuration.send_frame_count_observer = &send_frame_count_observer_;
configuration.send_side_delay_observer = &send_side_delay_observer_;
if (sender_)
configuration.bandwidth_callback = bandwidth_observer_.get();
return configuration;
}