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

pc: flush getStats cache in addIceCandidate

Browse Source 
BUG=webrtc:14190

Change-Id: I6faf35af7b124f4d5258204f7813cedcf3275f42
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/265878
Commit-Queue: Philipp Hancke <philipp.hancke@googlemail.com>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37297}
This commit is contained in:
Philipp Hancke 2022-06-22 07:41:22 +02:00 committed by WebRTC LUCI CQ
parent d90b552712
commit a09b921dd4
2 changed files with 53 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pc/peer_connection.cc
View File

@ -1614,6 +1614,7 @@ RTCError PeerConnection::SetConfiguration(
bool PeerConnection::AddIceCandidate( bool PeerConnection::AddIceCandidate(
const IceCandidateInterface* ice_candidate) { const IceCandidateInterface* ice_candidate) {
RTC_DCHECK_RUN_ON(signaling_thread()); RTC_DCHECK_RUN_ON(signaling_thread());
ClearStatsCache();
return sdp_handler_->AddIceCandidate(ice_candidate); return sdp_handler_->AddIceCandidate(ice_candidate);
} }
@ -1621,7 +1622,11 @@ void PeerConnection::AddIceCandidate(
std::unique_ptr<IceCandidateInterface> candidate, std::unique_ptr<IceCandidateInterface> candidate,
std::function<void(RTCError)> callback) { std::function<void(RTCError)> callback) {
RTC_DCHECK_RUN_ON(signaling_thread()); RTC_DCHECK_RUN_ON(signaling_thread());
sdp_handler_->AddIceCandidate(std::move(candidate), callback); sdp_handler_->AddIceCandidate(std::move(candidate),
[this, callback](webrtc::RTCError result) {
ClearStatsCache();
callback(result);
});
} }
bool PeerConnection::RemoveIceCandidates( bool PeerConnection::RemoveIceCandidates(

51
pc/peer_connection_integrationtest.cc
View File

@ -25,6 +25,7 @@
#include <vector> #include <vector>
#include "absl/algorithm/container.h" #include "absl/algorithm/container.h"
#include "absl/memory/memory.h"
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "absl/types/optional.h" #include "absl/types/optional.h"
#include "api/async_resolver_factory.h" #include "api/async_resolver_factory.h"
@ -2432,11 +2433,9 @@ TEST_P(PeerConnectionIntegrationTestWithFakeClock,
first_report->GetStatsOfType<webrtc::RTCLocalIceCandidateStats>(); first_report->GetStatsOfType<webrtc::RTCLocalIceCandidateStats>();
ASSERT_EQ(first_candidate_stats.size(), 0u); ASSERT_EQ(first_candidate_stats.size(), 0u);
// Start candidate gathering and wait for it to complete. // Create an offer at the caller and set it as remote description on the
// callee.
caller()->CreateAndSetAndSignalOffer(); caller()->CreateAndSetAndSignalOffer();
ASSERT_TRUE_SIMULATED_WAIT(caller()->IceGatheringStateComplete(),
kDefaultTimeout, FakeClock());
// Call getStats again, assert there are candidates now. // Call getStats again, assert there are candidates now.
rtc::scoped_refptr<const webrtc::RTCStatsReport> second_report = rtc::scoped_refptr<const webrtc::RTCStatsReport> second_report =
caller()->NewGetStats(); caller()->NewGetStats();
@ -2450,6 +2449,50 @@ TEST_P(PeerConnectionIntegrationTestWithFakeClock,
EXPECT_EQ(first_report->timestamp_us(), second_report->timestamp_us()); EXPECT_EQ(first_report->timestamp_us(), second_report->timestamp_us());
} }
TEST_P(PeerConnectionIntegrationTestWithFakeClock,
AddIceCandidateFlushesGetStatsCache) {
ASSERT_TRUE(CreatePeerConnectionWrappers());
ConnectFakeSignalingForSdpOnly();
caller()->AddAudioTrack();
// Start candidate gathering and wait for it to complete. Candidates are not
// signalled.
caller()->CreateAndSetAndSignalOffer();
ASSERT_TRUE_SIMULATED_WAIT(caller()->IceGatheringStateComplete(),
kDefaultTimeout, FakeClock());
// Call getStats, assert there are no candidates.
rtc::scoped_refptr<const webrtc::RTCStatsReport> first_report =
caller()->NewGetStats();
ASSERT_TRUE(first_report);
auto first_candidate_stats =
first_report->GetStatsOfType<webrtc::RTCRemoteIceCandidateStats>();
ASSERT_EQ(first_candidate_stats.size(), 0u);
// Add a "fake" candidate.
absl::optional<RTCError> result;
caller()->pc()->AddIceCandidate(
absl::WrapUnique(webrtc::CreateIceCandidate(
"", 0,
"candidate:2214029314 1 udp 2122260223 127.0.0.1 49152 typ host",
nullptr)),
[&result](RTCError r) { result = r; });
ASSERT_TRUE_WAIT(result.has_value(), kDefaultTimeout);
ASSERT_TRUE(result.value().ok());
// Call getStats again, assert there is a remote candidate now.
rtc::scoped_refptr<const webrtc::RTCStatsReport> second_report =
caller()->NewGetStats();
ASSERT_TRUE(second_report);
auto second_candidate_stats =
second_report->GetStatsOfType<webrtc::RTCRemoteIceCandidateStats>();
ASSERT_EQ(second_candidate_stats.size(), 1u);
// The fake clock ensures that no time has passed so the cache must have been
// explicitly invalidated.
EXPECT_EQ(first_report->timestamp_us(), second_report->timestamp_us());
}
#endif // !defined(THREAD_SANITIZER) #endif // !defined(THREAD_SANITIZER)
// Verify that a TurnCustomizer passed in through RTCConfiguration // Verify that a TurnCustomizer passed in through RTCConfiguration