From 2c46f8d854c1fc3e10f8151ee5109923287aee8b Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Thu, 21 Nov 2013 13:49:43 +0000 Subject: [PATCH] Rename DestroyStream methods to include Video. Matches r5135 which renames CreateSendStream->CreateVideoSendStream for instance. BUG= R=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/4109005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5151 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/call.cc | 10 ++++++---- webrtc/call.h | 5 +++-- webrtc/call_tests.cc | 10 +++++----- webrtc/loopback.cc | 4 ++-- webrtc/video/full_stack.cc | 4 ++-- webrtc/video/rampup_tests.cc | 4 ++-- webrtc/video/video_send_stream_tests.cc | 2 +- 7 files changed, 21 insertions(+), 18 deletions(-) diff --git a/webrtc/call.cc b/webrtc/call.cc index 68d4843767..2ba1692778 100644 --- a/webrtc/call.cc +++ b/webrtc/call.cc @@ -41,14 +41,15 @@ class Call : public webrtc::Call, public PacketReceiver { virtual VideoSendStream* CreateVideoSendStream( const VideoSendStream::Config& config) OVERRIDE; - virtual void DestroySendStream(webrtc::VideoSendStream* send_stream) OVERRIDE; + virtual void DestroyVideoSendStream(webrtc::VideoSendStream* send_stream) + OVERRIDE; virtual VideoReceiveStream::Config GetDefaultReceiveConfig() OVERRIDE; virtual VideoReceiveStream* CreateVideoReceiveStream( const VideoReceiveStream::Config& config) OVERRIDE; - virtual void DestroyReceiveStream( + virtual void DestroyVideoReceiveStream( webrtc::VideoReceiveStream* receive_stream) OVERRIDE; virtual uint32_t SendBitrateEstimate() OVERRIDE; @@ -228,7 +229,7 @@ VideoSendStream* Call::CreateVideoSendStream( return send_stream; } -void Call::DestroySendStream(webrtc::VideoSendStream* send_stream) { +void Call::DestroyVideoSendStream(webrtc::VideoSendStream* send_stream) { assert(send_stream != NULL); VideoSendStream* send_stream_impl = NULL; @@ -265,7 +266,8 @@ VideoReceiveStream* Call::CreateVideoReceiveStream( return receive_stream; } -void Call::DestroyReceiveStream(webrtc::VideoReceiveStream* receive_stream) { +void Call::DestroyVideoReceiveStream( + webrtc::VideoReceiveStream* receive_stream) { assert(receive_stream != NULL); VideoReceiveStream* receive_stream_impl = NULL; diff --git a/webrtc/call.h b/webrtc/call.h index 7b3de93f15..186672d5c1 100644 --- a/webrtc/call.h +++ b/webrtc/call.h @@ -66,13 +66,14 @@ class Call { // Returns the internal state of the send stream, for resume sending with a // new stream with different settings. // Note: Only the last returned send-stream state is valid. - virtual void DestroySendStream(VideoSendStream* send_stream) = 0; + virtual void DestroyVideoSendStream(VideoSendStream* send_stream) = 0; virtual VideoReceiveStream::Config GetDefaultReceiveConfig() = 0; virtual VideoReceiveStream* CreateVideoReceiveStream( const VideoReceiveStream::Config& config) = 0; - virtual void DestroyReceiveStream(VideoReceiveStream* receive_stream) = 0; + virtual void DestroyVideoReceiveStream( + VideoReceiveStream* receive_stream) = 0; // All received RTP and RTCP packets for the call should be inserted to this // PacketReceiver. The PacketReceiver pointer is valid as long as the diff --git a/webrtc/call_tests.cc b/webrtc/call_tests.cc index 1789ebc703..773886d77e 100644 --- a/webrtc/call_tests.cc +++ b/webrtc/call_tests.cc @@ -119,9 +119,9 @@ class CallTest : public ::testing::Test { void DestroyStreams() { if (send_stream_ != NULL) - sender_call_->DestroySendStream(send_stream_); + sender_call_->DestroyVideoSendStream(send_stream_); if (receive_stream_ != NULL) - receiver_call_->DestroyReceiveStream(receive_stream_); + receiver_call_->DestroyVideoReceiveStream(receive_stream_); send_stream_ = NULL; receive_stream_ = NULL; } @@ -623,7 +623,7 @@ TEST_F(CallTest, SurvivesIncomingRtpPacketsToDestroyedReceiveStream) { CreateFrameGenerator(); StartSending(); - receiver_call_->DestroyReceiveStream(receive_stream_); + receiver_call_->DestroyVideoReceiveStream(receive_stream_); receive_stream_ = NULL; // Wait() waits for a received packet. @@ -810,8 +810,8 @@ TEST_F(CallTest, SendsAndReceivesMultipleStreams) { for (size_t i = 0; i < kNumStreams; ++i) { frame_generators[i]->Stop(); delete frame_generators[i]; - sender_call->DestroySendStream(send_streams[i]); - receiver_call->DestroyReceiveStream(receive_streams[i]); + sender_call->DestroyVideoSendStream(send_streams[i]); + receiver_call->DestroyVideoReceiveStream(receive_streams[i]); delete observers[i]; } diff --git a/webrtc/loopback.cc b/webrtc/loopback.cc index 4e72735758..e07138a9a2 100644 --- a/webrtc/loopback.cc +++ b/webrtc/loopback.cc @@ -91,8 +91,8 @@ TEST_F(LoopbackTest, Test) { send_stream->StopSending(); receive_stream->StopReceiving(); - call->DestroyReceiveStream(receive_stream); - call->DestroySendStream(send_stream); + call->DestroyVideoReceiveStream(receive_stream); + call->DestroyVideoSendStream(send_stream); transport.StopSending(); } diff --git a/webrtc/video/full_stack.cc b/webrtc/video/full_stack.cc index 30d63a4903..17e7686095 100644 --- a/webrtc/video/full_stack.cc +++ b/webrtc/video/full_stack.cc @@ -435,8 +435,8 @@ TEST_P(FullStackTest, NoPacketLoss) { send_stream->StopSending(); receive_stream->StopReceiving(); - call->DestroyReceiveStream(receive_stream); - call->DestroySendStream(send_stream); + call->DestroyVideoReceiveStream(receive_stream); + call->DestroyVideoSendStream(send_stream); transport.StopSending(); } diff --git a/webrtc/video/rampup_tests.cc b/webrtc/video/rampup_tests.cc index 346c1892db..b294c70bf8 100644 --- a/webrtc/video/rampup_tests.cc +++ b/webrtc/video/rampup_tests.cc @@ -162,8 +162,8 @@ TEST_P(RampUpTest, RampUpWithPadding) { send_stream->StopSending(); receive_stream->StopReceiving(); - call->DestroyReceiveStream(receive_stream); - call->DestroySendStream(send_stream); + call->DestroyVideoReceiveStream(receive_stream); + call->DestroyVideoSendStream(send_stream); } INSTANTIATE_TEST_CASE_P(RampUpTest, RampUpTest, ::testing::Bool()); diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc index 0affdbd1e6..67555ec7a5 100644 --- a/webrtc/video/video_send_stream_tests.cc +++ b/webrtc/video/video_send_stream_tests.cc @@ -52,7 +52,7 @@ class VideoSendStreamTest : public ::testing::Test { observer->StopSending(); frame_generator_capturer->Stop(); send_stream_->StopSending(); - call->DestroySendStream(send_stream_); + call->DestroyVideoSendStream(send_stream_); } VideoSendStream::Config GetSendTestConfig(Call* call) {