aboutsummaryrefslogtreecommitdiff
path: root/pc
diff options
context:
space:
mode:
authorMirko Bonadei <mbonadei@webrtc.org>2020-07-08 09:42:30 +0000
committerCommit Bot <commit-bot@chromium.org>2020-07-08 09:42:41 +0000
commit9b35da880b78433bece805a10e347a8ed9986776 (patch)
tree918fa46f09906ef179d23646126ee1f1f1abf74f /pc
parent5f61282687d3ceb45e0f7f58cc534b42b51089f9 (diff)
downloadwebrtc-9b35da880b78433bece805a10e347a8ed9986776.tar.gz
Revert "Implement packets_(sent | received) for RTCTransportStats"
This reverts commit fb6f975401972635a644c0db06c135b4c0aaef4a. Reason for revert: Looks like this breaks chromium.webrtc.fyi: https://ci.chromium.org/p/chromium/builders/webrtc.fyi/WebRTC%20Chromium%20FYI%20Mac%20Tester/6000 https://ci.chromium.org/p/chromium/builders/webrtc.fyi/WebRTC%20Chromium%20FYI%20Win10%20Tester/6209 https://ci.chromium.org/p/chromium/builders/webrtc.fyi/WebRTC%20Chromium%20FYI%20Win7%20Tester/6177 https://ci.chromium.org/p/chromium/builders/webrtc.fyi/WebRTC%20Chromium%20FYI%20Win8%20Tester/6299 Original change's description: > Implement packets_(sent | received) for RTCTransportStats > > Bug: webrtc:11756 > Change-Id: Ic0caad6d4675969ef3ae886f50326e4a2e1cbfe7 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178741 > Reviewed-by: Tommi <tommi@webrtc.org> > Reviewed-by: Henrik Boström <hbos@webrtc.org> > Commit-Queue: Artem Titov <titovartem@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#31643} TBR=hbos@webrtc.org,tommi@webrtc.org,titovartem@webrtc.org Change-Id: Icbb0974ba29cbddb614f1f37f8a2de1a7c56b571 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:11756 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178868 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#31665}
Diffstat (limited to 'pc')
-rw-r--r--pc/rtc_stats_collector.cc5
-rw-r--r--pc/rtc_stats_collector_unittest.cc15
-rw-r--r--pc/rtc_stats_integrationtest.cc2
3 files changed, 0 insertions, 22 deletions
diff --git a/pc/rtc_stats_collector.cc b/pc/rtc_stats_collector.cc
index be0d90d533..07e40cba50 100644
--- a/pc/rtc_stats_collector.cc
+++ b/pc/rtc_stats_collector.cc
@@ -1744,9 +1744,7 @@ void RTCStatsCollector::ProduceTransportStats_n(
transport_name, channel_stats.component),
timestamp_us));
transport_stats->bytes_sent = 0;
- transport_stats->packets_sent = 0;
transport_stats->bytes_received = 0;
- transport_stats->packets_received = 0;
transport_stats->dtls_state =
DtlsTransportStateToRTCDtlsTransportState(channel_stats.dtls_state);
transport_stats->selected_candidate_pair_changes =
@@ -1754,10 +1752,7 @@ void RTCStatsCollector::ProduceTransportStats_n(
for (const cricket::ConnectionInfo& info :
channel_stats.ice_transport_stats.connection_infos) {
*transport_stats->bytes_sent += info.sent_total_bytes;
- *transport_stats->packets_sent +=
- info.sent_total_packets - info.sent_discarded_packets;
*transport_stats->bytes_received += info.recv_total_bytes;
- *transport_stats->packets_received += info.packets_received;
if (info.best_connection) {
transport_stats->selected_candidate_pair_id =
RTCIceCandidatePairStatsIDFromConnectionInfo(info);
diff --git a/pc/rtc_stats_collector_unittest.cc b/pc/rtc_stats_collector_unittest.cc
index 4d3d4ba629..12898e3a7c 100644
--- a/pc/rtc_stats_collector_unittest.cc
+++ b/pc/rtc_stats_collector_unittest.cc
@@ -2140,9 +2140,6 @@ TEST_F(RTCStatsCollectorTest, CollectRTCTransportStats) {
rtp_connection_info.remote_candidate = *rtp_remote_candidate.get();
rtp_connection_info.sent_total_bytes = 42;
rtp_connection_info.recv_total_bytes = 1337;
- rtp_connection_info.sent_total_packets = 3;
- rtp_connection_info.sent_discarded_packets = 2;
- rtp_connection_info.packets_received = 4;
cricket::TransportChannelStats rtp_transport_channel_stats;
rtp_transport_channel_stats.component = cricket::ICE_CANDIDATE_COMPONENT_RTP;
rtp_transport_channel_stats.ice_transport_stats.connection_infos.push_back(
@@ -2160,9 +2157,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCTransportStats) {
rtc::ToString(cricket::ICE_CANDIDATE_COMPONENT_RTP),
report->timestamp_us());
expected_rtp_transport.bytes_sent = 42;
- expected_rtp_transport.packets_sent = 1;
expected_rtp_transport.bytes_received = 1337;
- expected_rtp_transport.packets_received = 4;
expected_rtp_transport.dtls_state = RTCDtlsTransportState::kNew;
expected_rtp_transport.selected_candidate_pair_changes = 1;
@@ -2177,9 +2172,6 @@ TEST_F(RTCStatsCollectorTest, CollectRTCTransportStats) {
rtcp_connection_info.remote_candidate = *rtcp_remote_candidate.get();
rtcp_connection_info.sent_total_bytes = 1337;
rtcp_connection_info.recv_total_bytes = 42;
- rtcp_connection_info.sent_total_packets = 3;
- rtcp_connection_info.sent_discarded_packets = 2;
- rtcp_connection_info.packets_received = 4;
cricket::TransportChannelStats rtcp_transport_channel_stats;
rtcp_transport_channel_stats.component =
cricket::ICE_CANDIDATE_COMPONENT_RTCP;
@@ -2197,9 +2189,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCTransportStats) {
rtc::ToString(cricket::ICE_CANDIDATE_COMPONENT_RTCP),
report->timestamp_us());
expected_rtcp_transport.bytes_sent = 1337;
- expected_rtcp_transport.packets_sent = 1;
expected_rtcp_transport.bytes_received = 42;
- expected_rtcp_transport.packets_received = 4;
expected_rtcp_transport.dtls_state = RTCDtlsTransportState::kConnecting;
expected_rtcp_transport.selected_candidate_pair_changes = 0;
@@ -2293,9 +2283,6 @@ TEST_F(RTCStatsCollectorTest, CollectRTCTransportStatsWithCrypto) {
rtp_connection_info.remote_candidate = *rtp_remote_candidate.get();
rtp_connection_info.sent_total_bytes = 42;
rtp_connection_info.recv_total_bytes = 1337;
- rtp_connection_info.sent_total_packets = 3;
- rtp_connection_info.sent_discarded_packets = 2;
- rtp_connection_info.packets_received = 4;
cricket::TransportChannelStats rtp_transport_channel_stats;
rtp_transport_channel_stats.component = cricket::ICE_CANDIDATE_COMPONENT_RTP;
rtp_transport_channel_stats.ice_transport_stats.connection_infos.push_back(
@@ -2318,9 +2305,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCTransportStatsWithCrypto) {
rtc::ToString(cricket::ICE_CANDIDATE_COMPONENT_RTP),
report->timestamp_us());
expected_rtp_transport.bytes_sent = 42;
- expected_rtp_transport.packets_sent = 1;
expected_rtp_transport.bytes_received = 1337;
- expected_rtp_transport.packets_received = 4;
expected_rtp_transport.dtls_state = RTCDtlsTransportState::kConnected;
expected_rtp_transport.selected_candidate_pair_changes = 1;
// Crypto parameters
diff --git a/pc/rtc_stats_integrationtest.cc b/pc/rtc_stats_integrationtest.cc
index 9e8656305d..a0fd2d0253 100644
--- a/pc/rtc_stats_integrationtest.cc
+++ b/pc/rtc_stats_integrationtest.cc
@@ -1014,9 +1014,7 @@ class RTCStatsReportVerifier {
bool VerifyRTCTransportStats(const RTCTransportStats& transport) {
RTCStatsVerifier verifier(report_, &transport);
verifier.TestMemberIsNonNegative<uint64_t>(transport.bytes_sent);
- verifier.TestMemberIsNonNegative<uint64_t>(transport.packets_sent);
verifier.TestMemberIsNonNegative<uint64_t>(transport.bytes_received);
- verifier.TestMemberIsNonNegative<uint64_t>(transport.packets_received);
verifier.TestMemberIsOptionalIDReference(transport.rtcp_transport_stats_id,
RTCTransportStats::kType);
verifier.TestMemberIsDefined(transport.dtls_state);