From f4481c8f73439bf2c35003f2811c685aa72a254b Mon Sep 17 00:00:00 2001 From: Sebastian Jansson Date: Tue, 9 Apr 2019 12:48:34 +0200 Subject: [PATCH] Adds GetStats to scenario receive streams. Bug: webrtc:10365 Change-Id: Ia17213701dee7de63018aa935261c17f07a40015 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132005 Commit-Queue: Sebastian Jansson Reviewed-by: Christoffer Rodbro Cr-Commit-Position: refs/heads/master@{#27515} --- test/scenario/audio_stream.cc | 6 ++++++ test/scenario/audio_stream.h | 1 + test/scenario/video_stream.cc | 7 +++++++ test/scenario/video_stream.h | 1 + 4 files changed, 15 insertions(+) diff --git a/test/scenario/audio_stream.cc b/test/scenario/audio_stream.cc index 13921555f6..c93b949da6 100644 --- a/test/scenario/audio_stream.cc +++ b/test/scenario/audio_stream.cc @@ -209,6 +209,12 @@ void ReceiveAudioStream::Stop() { receiver_->SendTask([&] { receive_stream_->Stop(); }); } +AudioReceiveStream::Stats ReceiveAudioStream::GetStats() const { + AudioReceiveStream::Stats result; + receiver_->SendTask([&] { result = receive_stream_->GetStats(); }); + return result; +} + AudioStreamPair::~AudioStreamPair() = default; AudioStreamPair::AudioStreamPair( diff --git a/test/scenario/audio_stream.h b/test/scenario/audio_stream.h index d38dccb260..b561cb4c70 100644 --- a/test/scenario/audio_stream.h +++ b/test/scenario/audio_stream.h @@ -54,6 +54,7 @@ class ReceiveAudioStream { ~ReceiveAudioStream(); void Start(); void Stop(); + AudioReceiveStream::Stats GetStats() const; private: friend class Scenario; diff --git a/test/scenario/video_stream.cc b/test/scenario/video_stream.cc index 7d1a26c757..d1493b2bb5 100644 --- a/test/scenario/video_stream.cc +++ b/test/scenario/video_stream.cc @@ -549,6 +549,13 @@ void ReceiveVideoStream::Stop() { }); } +VideoReceiveStream::Stats ReceiveVideoStream::GetStats() const { + if (receive_streams_.empty()) + return VideoReceiveStream::Stats(); + // TODO(srte): Handle multiple receive streams. + return receive_streams_.front()->GetStats(); +} + VideoStreamPair::~VideoStreamPair() = default; VideoStreamPair::VideoStreamPair(CallClient* sender, diff --git a/test/scenario/video_stream.h b/test/scenario/video_stream.h index 1c2bc11e47..66e8e909a7 100644 --- a/test/scenario/video_stream.h +++ b/test/scenario/video_stream.h @@ -72,6 +72,7 @@ class ReceiveVideoStream { ~ReceiveVideoStream(); void Start(); void Stop(); + VideoReceiveStream::Stats GetStats() const; private: friend class Scenario;