From bdfadd666ee530cd0084818d39f132ce6f1e3778 Mon Sep 17 00:00:00 2001
From: Sebastian Jansson <srte@webrtc.org>
Date: Fri, 8 Feb 2019 13:34:57 +0100
Subject: [PATCH] Adds Stop methods to media streams in scenario framework.

Bug: webrtc:9510
Change-Id: If011e701496850dd67394052edd5a6d14a3998be
Reviewed-on: https://webrtc-review.googlesource.com/c/121951
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Christoffer Rodbro <crodbro@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26609}
---
 test/scenario/audio_stream.cc | 8 ++++++++
 test/scenario/audio_stream.h  | 2 ++
 test/scenario/scenario.cc     | 8 ++++----
 test/scenario/video_stream.cc | 4 ++++
 test/scenario/video_stream.h  | 1 +
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/test/scenario/audio_stream.cc b/test/scenario/audio_stream.cc
index 20606aad55..55b17f7609 100644
--- a/test/scenario/audio_stream.cc
+++ b/test/scenario/audio_stream.cc
@@ -142,6 +142,10 @@ void SendAudioStream::Start() {
   sender_->call_->SignalChannelNetworkState(MediaType::AUDIO, kNetworkUp);
 }
 
+void SendAudioStream::Stop() {
+  send_stream_->Stop();
+}
+
 void SendAudioStream::SetMuted(bool mute) {
   send_stream_->SetMuted(mute);
 }
@@ -189,6 +193,10 @@ void ReceiveAudioStream::Start() {
   receiver_->call_->SignalChannelNetworkState(MediaType::AUDIO, kNetworkUp);
 }
 
+void ReceiveAudioStream::Stop() {
+  receive_stream_->Stop();
+}
+
 AudioStreamPair::~AudioStreamPair() = default;
 
 AudioStreamPair::AudioStreamPair(
diff --git a/test/scenario/audio_stream.h b/test/scenario/audio_stream.h
index 2fc1fb7a34..d38dccb260 100644
--- a/test/scenario/audio_stream.h
+++ b/test/scenario/audio_stream.h
@@ -29,6 +29,7 @@ class SendAudioStream {
   RTC_DISALLOW_COPY_AND_ASSIGN(SendAudioStream);
   ~SendAudioStream();
   void Start();
+  void Stop();
   void SetMuted(bool mute);
   ColumnPrinter StatsPrinter();
 
@@ -52,6 +53,7 @@ class ReceiveAudioStream {
   RTC_DISALLOW_COPY_AND_ASSIGN(ReceiveAudioStream);
   ~ReceiveAudioStream();
   void Start();
+  void Stop();
 
  private:
   friend class Scenario;
diff --git a/test/scenario/scenario.cc b/test/scenario/scenario.cc
index 5291dc8a3e..42203dc748 100644
--- a/test/scenario/scenario.cc
+++ b/test/scenario/scenario.cc
@@ -408,14 +408,14 @@ void Scenario::Start() {
 void Scenario::Stop() {
   RTC_DCHECK(start_time_.IsFinite());
   for (auto& stream_pair : video_streams_) {
-    stream_pair->send()->send_stream_->Stop();
+    stream_pair->send()->Stop();
   }
   for (auto& stream_pair : audio_streams_)
-    stream_pair->send()->send_stream_->Stop();
+    stream_pair->send()->Stop();
   for (auto& stream_pair : video_streams_)
-    stream_pair->receive()->receive_stream_->Stop();
+    stream_pair->receive()->Stop();
   for (auto& stream_pair : audio_streams_)
-    stream_pair->receive()->receive_stream_->Stop();
+    stream_pair->receive()->Stop();
   start_time_ = Timestamp::PlusInfinity();
 }
 
diff --git a/test/scenario/video_stream.cc b/test/scenario/video_stream.cc
index a3c6d3c052..0e39a0e39f 100644
--- a/test/scenario/video_stream.cc
+++ b/test/scenario/video_stream.cc
@@ -401,6 +401,10 @@ void ReceiveVideoStream::Start() {
   receiver_->call_->SignalChannelNetworkState(MediaType::VIDEO, kNetworkUp);
 }
 
+void ReceiveVideoStream::Stop() {
+  receive_stream_->Stop();
+}
+
 VideoStreamPair::~VideoStreamPair() = default;
 
 VideoStreamPair::VideoStreamPair(
diff --git a/test/scenario/video_stream.h b/test/scenario/video_stream.h
index 45180e52e1..aeb1e989b4 100644
--- a/test/scenario/video_stream.h
+++ b/test/scenario/video_stream.h
@@ -71,6 +71,7 @@ class ReceiveVideoStream {
   RTC_DISALLOW_COPY_AND_ASSIGN(ReceiveVideoStream);
   ~ReceiveVideoStream();
   void Start();
+  void Stop();
 
  private:
   friend class Scenario;