Chromium Code Reviews Chromium Code Reviews
Issue 1253473004:
BWE Simulation Framework: Standard plot logging (Closed)
Base URL: https://chromium.googlesource.com/external/webrtc.git@master| Index: webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc |
| diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc |
| index e051ccb6571cfd671a686b5b7cbbbaf10d1fce4a..ae41a2bf4cfb24934b5ecd34a502da9131e5a060 100644 |
| --- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc |
| +++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc |
| @@ -312,8 +312,7 @@ void BweTest::RunFairnessTest(BandwidthEstimatorType bwe_type, |
| std::vector<RateCounterFilter*> rate_counters; |
| for (int flow : all_flow_ids) { |
| - rate_counters.push_back( |
| - new RateCounterFilter(&uplink_, flow, "receiver_input")); |
| + rate_counters.push_back(new RateCounterFilter(&uplink_, flow, "Receiver")); |
| } |
| RateCounterFilter total_utilization(&uplink_, all_flow_ids, |
| @@ -493,14 +492,12 @@ void BweTest::RunVariableCapacity2MultipleFlows(BandwidthEstimatorType bwe_type, |
| RateCounterFilter total_utilization(&uplink_, flow_ids, "Total_utilization"); |
| - // Delays is being plotted only for the first flow. |
| - // To plot all of them, replace "i == 0" with "true" on new PacketReceiver(). |
| for (size_t i = 0; i < num_flows; ++i) { |
| metric_recorders.push_back(new MetricRecorder( |
| bwe_names[bwe_type], static_cast<int>(i), senders[i], &link_share)); |
| receivers.push_back(new PacketReceiver(&uplink_, static_cast<int>(i), |
| - bwe_type, i == 0, false, |
| + bwe_type, false, false, |
|
stefan-webrtc
2015/07/24 09:30:42
Who is responsible for plotting delays in this tes
magalhaesc
2015/07/24 11:46:40
The delay is being plotted by the metric_recorder.
|
| metric_recorders[i])); |
| metric_recorders[i]->set_plot_available_capacity( |
| i == 0 && plot_total_available_capacity_); |
| @@ -568,7 +565,7 @@ void BweTest::RunBidirectionalFlow(BandwidthEstimatorType bwe_type) { |
| metric_recorders[kForward].reset(new MetricRecorder( |
| bwe_names[bwe_type], kForward, senders[kForward].get(), &up_link_share)); |
| receivers[kForward].reset( |
| - new PacketReceiver(&uplink_, kForward, bwe_type, true, false, |
| + new PacketReceiver(&uplink_, kForward, bwe_type, false, false, |
| metric_recorders[kForward].get())); |
| metric_recorders[kForward].get()->set_plot_available_capacity( |
| @@ -581,7 +578,7 @@ void BweTest::RunBidirectionalFlow(BandwidthEstimatorType bwe_type) { |
| new MetricRecorder(bwe_names[bwe_type], kBackward, |
| senders[kBackward].get(), &down_link_share)); |
| receivers[kBackward].reset( |
| - new PacketReceiver(&downlink_, kBackward, bwe_type, true, false, |
| + new PacketReceiver(&downlink_, kBackward, bwe_type, false, false, |
| metric_recorders[kBackward].get())); |
| metric_recorders[kBackward].get()->set_plot_available_capacity( |
| @@ -684,8 +681,6 @@ void BweTest::RunRoundTripTimeFairness(BandwidthEstimatorType bwe_type) { |
| RateCounterFilter total_utilization( |
| &uplink_, CreateFlowIds(kAllFlowIds, kNumFlows), "Total_utilization"); |
| - // Delays is being plotted only for the first flow. |
| - // To plot all of them, replace "i == 0" with "true" on new PacketReceiver(). |
| rtc::scoped_ptr<PacketReceiver> receivers[kNumFlows]; |
| for (size_t i = 0; i < kNumFlows; ++i) { |
| metric_recorders[i].reset( |
| @@ -693,7 +688,7 @@ void BweTest::RunRoundTripTimeFairness(BandwidthEstimatorType bwe_type) { |
| senders[i].get(), &link_share)); |
| receivers[i].reset(new PacketReceiver(&uplink_, kAllFlowIds[i], bwe_type, |
| - i == 0, false, |
| + false, false, |
| metric_recorders[i].get())); |
| metric_recorders[i].get()->set_start_computing_metrics_ms(kStartingApartMs * |
| (kNumFlows - 1)); |
| @@ -799,14 +794,12 @@ void BweTest::RunMultipleShortTcpFairness( |
| RateCounterFilter total_utilization(&uplink_, flow_ids, "Total_utilization"); |
| - // Delays is being plotted only for the first flow. |
| - // To plot all of them, replace "i == 0" with "true" on new PacketReceiver(). |
| for (size_t id : kAllRmcatFlowIds) { |
| metric_recorders[id].reset( |
| new MetricRecorder(bwe_names[bwe_type], static_cast<int>(id), |
| senders[id].get(), &link_share)); |
| receivers[id].reset(new PacketReceiver(&uplink_, static_cast<int>(id), |
| - bwe_type, id == 0, false, |
| + bwe_type, false, false, |
| metric_recorders[id].get())); |
| metric_recorders[id].get()->set_start_computing_metrics_ms( |
| kRmcatStartingTimeMs); |
| @@ -814,8 +807,6 @@ void BweTest::RunMultipleShortTcpFairness( |
| id == 0 && plot_total_available_capacity_); |
| } |
| - // Delays is not being plotted only for TCP flows. To plot all of them, |
| - // replace first "false" occurence with "true" on new PacketReceiver(). |
| for (size_t id : kAllTcpFlowIds) { |
| metric_recorders[id].reset( |
| new MetricRecorder(bwe_names[kTcpEstimator], static_cast<int>(id), |
| @@ -886,14 +877,12 @@ void BweTest::RunPauseResumeFlows(BandwidthEstimatorType bwe_type) { |
| RateCounterFilter total_utilization( |
| &uplink_, CreateFlowIds(kAllFlowIds, kNumFlows), "Total_utilization"); |
| - // Delays is being plotted only for the first flow. |
| - // To plot all of them, replace "i == 0" with "true" on new PacketReceiver(). |
| for (size_t i = 0; i < kNumFlows; ++i) { |
| metric_recorders[i].reset( |
| new MetricRecorder(bwe_names[bwe_type], static_cast<int>(i), |
| senders[i].get(), &link_share)); |
| receivers[i].reset(new PacketReceiver(&uplink_, kAllFlowIds[i], bwe_type, |
| - i == 0, false, |
| + false, false, |
| metric_recorders[i].get())); |
| metric_recorders[i].get()->set_start_computing_metrics_ms(kStartingApartMs * |
| (kNumFlows - 1)); |
