From ceba6ae2a7f6e4cd25e061f9a697af8bb57fc3ed Mon Sep 17 00:00:00 2001 From: Artem Titov Date: Thu, 14 Feb 2019 11:06:34 +0100 Subject: [PATCH] Return a copy, becase GetPercentile in SamplesStatsCounter isn't const Bug: webrtc:10138 Change-Id: I2ec2ce4765e514bfd065f094f5905233e5f4f9cd Reviewed-on: https://webrtc-review.googlesource.com/c/123043 Reviewed-by: Peter Slatala Commit-Queue: Artem Titov Cr-Commit-Position: refs/heads/master@{#26697} --- .../pc/e2e/analyzer/video/default_video_quality_analyzer.cc | 6 +++--- test/pc/e2e/analyzer/video/default_video_quality_analyzer.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc b/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc index 9828540ab9..c3bf685d97 100644 --- a/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc +++ b/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc @@ -316,13 +316,13 @@ DefaultVideoQualityAnalyzer::GetPerStreamCounters() const { return stream_frame_counters_; } -const std::map& -DefaultVideoQualityAnalyzer::GetStats() const { +std::map DefaultVideoQualityAnalyzer::GetStats() + const { rtc::CritScope cri(&comparison_lock_); return stream_stats_; } -const AnalyzerStats& DefaultVideoQualityAnalyzer::GetAnalyzerStats() const { +AnalyzerStats DefaultVideoQualityAnalyzer::GetAnalyzerStats() const { rtc::CritScope crit(&comparison_lock_); return analyzer_stats_; } diff --git a/test/pc/e2e/analyzer/video/default_video_quality_analyzer.h b/test/pc/e2e/analyzer/video/default_video_quality_analyzer.h index 2e28829ddd..570253debc 100644 --- a/test/pc/e2e/analyzer/video/default_video_quality_analyzer.h +++ b/test/pc/e2e/analyzer/video/default_video_quality_analyzer.h @@ -145,8 +145,8 @@ class DefaultVideoQualityAnalyzer : public VideoQualityAnalyzerInterface { const std::map& GetPerStreamCounters() const; // Returns video quality stats per stream label. Valid stream labels can be // obtained by calling GetKnownVideoStreams() - const std::map& GetStats() const; - const AnalyzerStats& GetAnalyzerStats() const; + std::map GetStats() const; + AnalyzerStats GetAnalyzerStats() const; private: struct FrameStats {