Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Unified Diff: webrtc/modules/remote_bitrate_estimator/test/estimators/remb.cc

Issue 2996883002: In bwe test Collect receive statistic using GetReportBlocks collector (Closed)
Patch Set: . Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/remote_bitrate_estimator/test/estimators/remb.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.cc b/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.cc
index 1daf14e51e6012b7822e2b6320eacb1799f6813b..c3f1dc98e4af0da0540defdc4f3b04eebd8fd000 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/remb.cc
@@ -110,10 +110,14 @@ FeedbackPacket* RembReceiver::GetFeedback(int64_t now_ms) {
uint32_t estimated_bps = 0;
RembFeedback* feedback = NULL;
if (LatestEstimate(&estimated_bps)) {
- StatisticianMap statisticians = recv_stats_->GetActiveStatisticians();
- RTCPReportBlock report_block;
- if (!statisticians.empty()) {
- latest_report_block_ = BuildReportBlock(statisticians.begin()->second);
+ auto report_blocks = recv_stats_->RtcpReportBlocks(1);
+ if (!report_blocks.empty()) {
+ const rtcp::ReportBlock& stat = report_blocks.front();
+ latest_report_block_.fraction_lost = stat.fraction_lost();
+ latest_report_block_.packets_lost = stat.cumulative_lost();
+ latest_report_block_.extended_highest_sequence_number =
+ stat.extended_high_seq_num();
+ latest_report_block_.jitter = stat.jitter();
}
feedback = new RembFeedback(flow_id_, now_ms * 1000, last_feedback_ms_,
@@ -133,19 +137,6 @@ FeedbackPacket* RembReceiver::GetFeedback(int64_t now_ms) {
void RembReceiver::OnReceiveBitrateChanged(const std::vector<uint32_t>& ssrcs,
uint32_t bitrate) {}
-RTCPReportBlock RembReceiver::BuildReportBlock(
- StreamStatistician* statistician) {
- RTCPReportBlock report_block;
- RtcpStatistics stats;
- RTC_DCHECK(statistician->GetStatistics(&stats, true));
- report_block.fraction_lost = stats.fraction_lost;
- report_block.packets_lost = stats.packets_lost;
- report_block.extended_highest_sequence_number =
- stats.extended_highest_sequence_number;
- report_block.jitter = stats.jitter;
- return report_block;
-}
-
bool RembReceiver::LatestEstimate(uint32_t* estimate_bps) {
if (latest_estimate_bps_ < 0) {
std::vector<uint32_t> ssrcs;
« no previous file with comments | « webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698