admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up use of WebRTC-UseStandardBytesStats trial in tests

Browse Source 
BUG=webrtc:10525

Change-Id: Ia0ec88d5b561ec98af540f849182805d49a327e6
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/337520
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@microsoft.com>
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41663}
This commit is contained in:
Philipp Hancke 2024-02-02 12:02:34 +01:00 committed by WebRTC LUCI CQ
parent 2212f86b5a
commit bda5cc63ce
5 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/pc/e2e/network_quality_metrics_reporter.cc
View File

@ -27,11 +27,6 @@ using ::webrtc::test::Unit;
constexpr TimeDelta kStatsWaitTimeout = TimeDelta::Seconds(1); constexpr TimeDelta kStatsWaitTimeout = TimeDelta::Seconds(1);
// Field trial which controls whether to report standard-compliant bytes
// sent/received per stream. If enabled, padding and headers are not included
// in bytes sent or received.
constexpr char kUseStandardBytesStats[] = "WebRTC-UseStandardBytesStats";
} // namespace } // namespace
NetworkQualityMetricsReporter::NetworkQualityMetricsReporter( NetworkQualityMetricsReporter::NetworkQualityMetricsReporter(
@ -107,11 +102,6 @@ void NetworkQualityMetricsReporter::StopAndReportResults() {
ReportStats(alice_network_label_, alice_stats, alice_packets_loss); ReportStats(alice_network_label_, alice_stats, alice_packets_loss);
ReportStats(bob_network_label_, bob_stats, bob_packets_loss); ReportStats(bob_network_label_, bob_stats, bob_packets_loss);
if (!webrtc::field_trial::IsEnabled(kUseStandardBytesStats)) {
RTC_LOG(LS_ERROR)
<< "Non-standard GetStats; \"payload\" counts include RTP headers";
}
MutexLock lock(&lock_); MutexLock lock(&lock_);
for (const auto& pair : pc_stats_) { for (const auto& pair : pc_stats_) {
ReportPCStats(pair.first, pair.second); ReportPCStats(pair.first, pair.second);

2
test/pc/e2e/network_quality_metrics_reporter.h
View File

@ -48,8 +48,6 @@ class NetworkQualityMetricsReporter
private: private:
struct PCStats { struct PCStats {
// TODO(nisse): Separate audio and video counters. Depends on standard stat
// counters, enabled by field trial "WebRTC-UseStandardBytesStats".
DataSize payload_received = DataSize::Zero(); DataSize payload_received = DataSize::Zero();
DataSize payload_sent = DataSize::Zero(); DataSize payload_sent = DataSize::Zero();
}; };

5
test/pc/e2e/peer_connection_quality_test.cc
View File

@ -73,8 +73,6 @@ constexpr TimeDelta kQuickTestModeRunDuration = TimeDelta::Millis(100);
// Field trials to enable Flex FEC advertising and receiving. // Field trials to enable Flex FEC advertising and receiving.
constexpr char kFlexFecEnabledFieldTrials[] = constexpr char kFlexFecEnabledFieldTrials[] =
"WebRTC-FlexFEC-03-Advertised/Enabled/WebRTC-FlexFEC-03/Enabled/"; "WebRTC-FlexFEC-03-Advertised/Enabled/WebRTC-FlexFEC-03/Enabled/";
constexpr char kUseStandardsBytesStats[] =
"WebRTC-UseStandardBytesStats/Enabled/";
class FixturePeerConnectionObserver : public MockPeerConnectionObserver { class FixturePeerConnectionObserver : public MockPeerConnectionObserver {
public: public:
@ -439,8 +437,7 @@ void PeerConnectionE2EQualityTest::Run(RunParams run_params) {
std::string PeerConnectionE2EQualityTest::GetFieldTrials( std::string PeerConnectionE2EQualityTest::GetFieldTrials(
const RunParams& run_params) { const RunParams& run_params) {
std::vector<absl::string_view> default_field_trials = { std::vector<absl::string_view> default_field_trials = {};
kUseStandardsBytesStats};
if (run_params.enable_flex_fec_support) { if (run_params.enable_flex_fec_support) {
default_field_trials.push_back(kFlexFecEnabledFieldTrials); default_field_trials.push_back(kFlexFecEnabledFieldTrials);
} }

10
test/pc/e2e/stats_based_network_quality_metrics_reporter.cc
View File

@ -51,11 +51,6 @@ using NetworkLayerStats =
constexpr TimeDelta kStatsWaitTimeout = TimeDelta::Seconds(1); constexpr TimeDelta kStatsWaitTimeout = TimeDelta::Seconds(1);
// Field trial which controls whether to report standard-compliant bytes
// sent/received per stream. If enabled, padding and headers are not included
// in bytes sent or received.
constexpr char kUseStandardBytesStats[] = "WebRTC-UseStandardBytesStats";
EmulatedNetworkStats PopulateStats(std::vector<EmulatedEndpoint*> endpoints, EmulatedNetworkStats PopulateStats(std::vector<EmulatedEndpoint*> endpoints,
NetworkEmulationManager* network_emulation) { NetworkEmulationManager* network_emulation) {
rtc::Event stats_loaded; rtc::Event stats_loaded;
@ -325,11 +320,6 @@ void StatsBasedNetworkQualityMetricsReporter::OnStatsReports(
void StatsBasedNetworkQualityMetricsReporter::StopAndReportResults() { void StatsBasedNetworkQualityMetricsReporter::StopAndReportResults() {
Timestamp end_time = clock_->CurrentTime(); Timestamp end_time = clock_->CurrentTime();
if (!webrtc::field_trial::IsEnabled(kUseStandardBytesStats)) {
RTC_LOG(LS_ERROR)
<< "Non-standard GetStats; \"payload\" counts include RTP headers";
}
std::map<std::string, NetworkLayerStats> stats = collector_.GetStats(); std::map<std::string, NetworkLayerStats> stats = collector_.GetStats();
for (const auto& entry : stats) { for (const auto& entry : stats) {
LogNetworkLayerStats(entry.first, entry.second); LogNetworkLayerStats(entry.first, entry.second);

3
test/pc/e2e/stats_based_network_quality_metrics_reporter.h
View File

@ -70,9 +70,6 @@ class StatsBasedNetworkQualityMetricsReporter
private: private:
struct PCStats { struct PCStats {
// TODO(bugs.webrtc.org/10525): Separate audio and video counters. Depends
// on standard stat counters, enabled by field trial
// "WebRTC-UseStandardBytesStats".
DataSize payload_received = DataSize::Zero(); DataSize payload_received = DataSize::Zero();
DataSize payload_sent = DataSize::Zero(); DataSize payload_sent = DataSize::Zero();