From d82f5125b7cc00ddd16430b0d4e1f8cfde51ac17 Mon Sep 17 00:00:00 2001 From: hbos Date: Fri, 9 Dec 2016 04:12:39 -0800 Subject: [PATCH] RTCIceCandidatePairStats.requestsReceived defined by RTCStatsCollector. Spec: https://w3c.github.io/webrtc-stats/#dom-rtcicecandidatepairstats-requestsreceived BUG=chromium:633550 Review-Url: https://codereview.webrtc.org/2565463002 Cr-Commit-Position: refs/heads/master@{#15506} --- webrtc/api/rtcstats_integrationtest.cc | 2 +- webrtc/api/rtcstatscollector.cc | 2 ++ webrtc/api/rtcstatscollector_unittest.cc | 2 ++ webrtc/api/stats/rtcstats_objects.h | 1 - 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/webrtc/api/rtcstats_integrationtest.cc b/webrtc/api/rtcstats_integrationtest.cc index a20f5b4aeb..6648eb2ccd 100644 --- a/webrtc/api/rtcstats_integrationtest.cc +++ b/webrtc/api/rtcstats_integrationtest.cc @@ -338,7 +338,7 @@ class RTCStatsReportVerifier { verifier.TestMemberIsDefined(candidate_pair.current_rtt); verifier.TestMemberIsUndefined(candidate_pair.available_outgoing_bitrate); verifier.TestMemberIsUndefined(candidate_pair.available_incoming_bitrate); - verifier.TestMemberIsUndefined(candidate_pair.requests_received); + verifier.TestMemberIsDefined(candidate_pair.requests_received); verifier.TestMemberIsDefined(candidate_pair.requests_sent); verifier.TestMemberIsDefined(candidate_pair.responses_received); verifier.TestMemberIsDefined(candidate_pair.responses_sent); diff --git a/webrtc/api/rtcstatscollector.cc b/webrtc/api/rtcstatscollector.cc index ec7cbe0bb3..9f08aa9aa0 100644 --- a/webrtc/api/rtcstatscollector.cc +++ b/webrtc/api/rtcstatscollector.cc @@ -634,6 +634,8 @@ void RTCStatsCollector::ProduceIceCandidateAndPairStats_s( // https://w3c.github.io/webrtc-stats/#dom-rtcicecandidatepairstats-currentrtt candidate_pair_stats->current_rtt = static_cast(info.rtt) / rtc::kNumMillisecsPerSec; + candidate_pair_stats->requests_received = + static_cast(info.recv_ping_requests); candidate_pair_stats->requests_sent = static_cast(info.sent_ping_requests_total); candidate_pair_stats->responses_received = diff --git a/webrtc/api/rtcstatscollector_unittest.cc b/webrtc/api/rtcstatscollector_unittest.cc index 37356e0042..4f63c16282 100644 --- a/webrtc/api/rtcstatscollector_unittest.cc +++ b/webrtc/api/rtcstatscollector_unittest.cc @@ -1005,6 +1005,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCIceCandidatePairStats) { connection_info.sent_total_bytes = 42; connection_info.recv_total_bytes = 1234; connection_info.rtt = 1337; + connection_info.recv_ping_requests = 2020; connection_info.sent_ping_requests_total = 1010; connection_info.recv_ping_responses = 4321; connection_info.sent_ping_responses = 1000; @@ -1039,6 +1040,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCIceCandidatePairStats) { expected_pair.bytes_sent = 42; expected_pair.bytes_received = 1234; expected_pair.current_rtt = 1.337; + expected_pair.requests_received = 2020; expected_pair.requests_sent = 1010; expected_pair.responses_received = 4321; expected_pair.responses_sent = 1000; diff --git a/webrtc/api/stats/rtcstats_objects.h b/webrtc/api/stats/rtcstats_objects.h index 8f5e038fc9..e1b695bc23 100644 --- a/webrtc/api/stats/rtcstats_objects.h +++ b/webrtc/api/stats/rtcstats_objects.h @@ -142,7 +142,6 @@ class RTCIceCandidatePairStats final : public RTCStats { RTCStatsMember available_outgoing_bitrate; // TODO(hbos): Not collected by |RTCStatsCollector|. crbug.com/633550 RTCStatsMember available_incoming_bitrate; - // TODO(hbos): Not collected by |RTCStatsCollector|. crbug.com/633550 RTCStatsMember requests_received; RTCStatsMember requests_sent; RTCStatsMember responses_received;