diff options
| author | sprang@webrtc.org <sprang@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-12-13 09:46:59 +0000 |
|---|---|---|
| committer | sprang@webrtc.org <sprang@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-12-13 09:46:59 +0000 |
| commit | b70db6dbe962f01976f2e1e9a4141c1ee37e3801 (patch) | |
| tree | 6adf1132a7a9e46689f9be7ec689b36d65959df0 /video_engine/vie_rtp_rtcp_impl.cc | |
| parent | dadfc9ef4ac1a324bf670703c2e9e3a38d64e522 (diff) | |
| download | webrtc-b70db6dbe962f01976f2e1e9a4141c1ee37e3801.tar.gz | |
Callback for send bitrate estimates - new roll
Issue https://webrtc-codereview.appspot.com/4459004/ was commited as
r5259, after which flakiness was detected and a rollback was performed
at r5261.
Patch Set 1 of this issue is the code submitted in r5259. Subsequent
patch sets fixes a race condition which caused the seen problems.
The root cause was a dead lock between a thread sending rtp packets and
and a timed module processing thread:
webrtc::RTPSender::BitrateUpdated() // Get RTPSender stats lock
webrtc::Bitrate::Process() // Get Bitrate lock
webrtc::RTPSender::ProcessBitrate()
webrtc::ModuleRtpRtcpImpl::Process()
...
webrtc::Bitrate::Update() // Get Bitrate lock
webrtc::RTPSender::UpdateRtpStats() // Get RTPSender stats lock
webrtc::RTPSender::SendToNetwork()
...
This is fixed in Bitrate::Process() by releasing the lock before
calling the callback.
BUG=2235
R=mflodman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/5619004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5281 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'video_engine/vie_rtp_rtcp_impl.cc')
| -rw-r--r-- | video_engine/vie_rtp_rtcp_impl.cc | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/video_engine/vie_rtp_rtcp_impl.cc b/video_engine/vie_rtp_rtcp_impl.cc index ce2f4344..e07ab6c1 100644 --- a/video_engine/vie_rtp_rtcp_impl.cc +++ b/video_engine/vie_rtp_rtcp_impl.cc @@ -1206,16 +1206,38 @@ int ViERTP_RTCPImpl::DeregisterReceiveChannelRtpStatisticsCallback( // TODO(sprang): Implement return -1; } + +// Called whenever the send bitrate is updated. int ViERTP_RTCPImpl::RegisterSendBitrateObserver( - int channel, BitrateStatisticsObserver* callback) { - // TODO(sprang): Implement - return -1; + const int video_channel, + BitrateStatisticsObserver* observer) { + WEBRTC_TRACE(kTraceApiCall, + kTraceVideo, + ViEId(shared_data_->instance_id(), video_channel), + "%s(channel: %d)", + __FUNCTION__, + video_channel); + ViEChannelManagerScoped cs(*(shared_data_->channel_manager())); + ViEChannel* vie_channel = cs.Channel(video_channel); + assert(vie_channel != NULL); + vie_channel->RegisterSendBitrateObserver(observer); + return 0; } int ViERTP_RTCPImpl::DeregisterSendBitrateObserver( - int channel, BitrateStatisticsObserver* callback) { - // TODO(sprang): Implement - return -1; + const int video_channel, + BitrateStatisticsObserver* observer) { + WEBRTC_TRACE(kTraceApiCall, + kTraceVideo, + ViEId(shared_data_->instance_id(), video_channel), + "%s(channel: %d)", + __FUNCTION__, + video_channel); + ViEChannelManagerScoped cs(*(shared_data_->channel_manager())); + ViEChannel* vie_channel = cs.Channel(video_channel); + assert(vie_channel != NULL); + vie_channel->RegisterSendBitrateObserver(NULL); + return 0; } int ViERTP_RTCPImpl::RegisterSendFrameCountObserver( |