zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert 5259 "Callback for send bitrate estimates"

Browse Source 
CL is causing flakiness in RampUpTest.WithoutPacing.

> Callback for send bitrate estimates
>
> BUG=2235
> R=mflodman@webrtc.org, pbos@webrtc.org, stefan@webrtc.org
>
> Review URL: https://webrtc-codereview.appspot.com/4459004

R=mflodman@webrtc.org, pbos@webrtc.org
TBR=mflodman

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5261 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
sprang@webrtc.org
2013-12-11 14:07:33 +00:00
parent f9bdbe3619
commit 096e8d9f94
15 changed files with 67 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
View File

@ -1559,7 +1559,7 @@ void ModuleRtpRtcpImpl::BitrateSent(uint32_t* total_rate,
return;
}
if (total_rate != NULL)
*total_rate = rtp_sender_.BitrateSent();
*total_rate = rtp_sender_.BitrateLast();
if (video_rate != NULL)
*video_rate = rtp_sender_.VideoBitrateSent();
if (fec_rate != NULL)
@ -1568,31 +1568,6 @@ void ModuleRtpRtcpImpl::BitrateSent(uint32_t* total_rate,
*nack_rate = rtp_sender_.NackOverheadRate();
}
void ModuleRtpRtcpImpl::RegisterVideoBitrateObserver(
BitrateStatisticsObserver* observer) {
{
CriticalSectionScoped cs(critical_section_module_ptrs_.get());
if (!child_modules_.empty()) {
for (std::list<ModuleRtpRtcpImpl*>::const_iterator it =
child_modules_.begin();
it != child_modules_.end();
++it) {
RtpRtcp* module = *it;
if (module)
module->RegisterVideoBitrateObserver(observer);
++it;
}
return;
}
}
rtp_sender_.RegisterBitrateObserver(observer);
}
BitrateStatisticsObserver* ModuleRtpRtcpImpl::GetVideoBitrateObserver() const {
return rtp_sender_.GetBitrateObserver();
}
// Bad state of RTP receiver request a keyframe.
void ModuleRtpRtcpImpl::OnRequestIntraFrame() {
RequestKeyFrame();