From e6b7b6678cd4891660c16f0cd6c2c0d1a28dd853 Mon Sep 17 00:00:00 2001 From: Tommi Date: Tue, 6 Aug 2019 12:44:35 +0200 Subject: [PATCH] Fix CallClient so that it calls Call::GetStats() on the right thread. Bug: webrtc:10847 Change-Id: Id23a389b4d5bad8f2211b5ec87b37aefc81a9292 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/148065 Commit-Queue: Tommi Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#28772} --- test/scenario/call_client.cc | 5 ++++- test/scenario/stats_collection_unittest.cc | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test/scenario/call_client.cc b/test/scenario/call_client.cc index aac70c8cb3..e5e1726813 100644 --- a/test/scenario/call_client.cc +++ b/test/scenario/call_client.cc @@ -241,7 +241,10 @@ ColumnPrinter CallClient::StatsPrinter() { } Call::Stats CallClient::GetStats() { - return call_->GetStats(); + // This call needs to be made on the thread that |call_| was constructed on. + Call::Stats stats; + SendTask([this, &stats] { stats = call_->GetStats(); }); + return stats; } DataRate CallClient::target_rate() const { diff --git a/test/scenario/stats_collection_unittest.cc b/test/scenario/stats_collection_unittest.cc index 716691b74c..602da18157 100644 --- a/test/scenario/stats_collection_unittest.cc +++ b/test/scenario/stats_collection_unittest.cc @@ -78,7 +78,7 @@ TEST(ScenarioAnalyzerTest, PsnrIsLowWhenNetworkIsBad) { EXPECT_NEAR(stats.call.stats().target_rate.Mean().kbps(), 75, 50); EXPECT_NEAR(stats.video_send.stats().media_bitrate.Mean().kbps(), 100, 50); EXPECT_NEAR(stats.video_receive.stats().resolution.Mean(), 180, 10); - EXPECT_NEAR(stats.audio_receive.stats().jitter_buffer.Mean().ms(), 45, 20); + EXPECT_NEAR(stats.audio_receive.stats().jitter_buffer.Mean().ms(), 45, 25); } TEST(ScenarioAnalyzerTest, CountsCapturedButNotRendered) {