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}
This commit is contained in:
Sebastian Jansson 2019-02-08 13:34:57 +01:00 committed by Commit Bot
parent 85eab49af4
commit bdfadd666e
5 changed files with 19 additions and 4 deletions

View File

@ -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(

View File

@ -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;

View File

@ -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();
}

View File

@ -401,6 +401,10 @@ void ReceiveVideoStream::Start() {
receiver_->call_->SignalChannelNetworkState(MediaType::VIDEO, kNetworkUp);
}
void ReceiveVideoStream::Stop() {
receive_stream_->Stop();
}
VideoStreamPair::~VideoStreamPair() = default;
VideoStreamPair::VideoStreamPair(

View File

@ -71,6 +71,7 @@ class ReceiveVideoStream {
RTC_DISALLOW_COPY_AND_ASSIGN(ReceiveVideoStream);
~ReceiveVideoStream();
void Start();
void Stop();
private:
friend class Scenario;