generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename DestroyStream methods to include Video.

Browse Source 
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
This commit is contained in:
pbos@webrtc.org 2013-11-21 13:49:43 +00:00
parent 6f6ba6edee
commit 2c46f8d854
7 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
webrtc/call.cc
View File

@ -41,14 +41,15 @@ class Call : public webrtc::Call, public PacketReceiver {
virtual VideoSendStream* CreateVideoSendStream( virtual VideoSendStream* CreateVideoSendStream(
const VideoSendStream::Config& config) OVERRIDE; 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::Config GetDefaultReceiveConfig() OVERRIDE;
virtual VideoReceiveStream* CreateVideoReceiveStream( virtual VideoReceiveStream* CreateVideoReceiveStream(
const VideoReceiveStream::Config& config) OVERRIDE; const VideoReceiveStream::Config& config) OVERRIDE;
virtual void DestroyReceiveStream( virtual void DestroyVideoReceiveStream(
webrtc::VideoReceiveStream* receive_stream) OVERRIDE; webrtc::VideoReceiveStream* receive_stream) OVERRIDE;
virtual uint32_t SendBitrateEstimate() OVERRIDE; virtual uint32_t SendBitrateEstimate() OVERRIDE;
@ -228,7 +229,7 @@ VideoSendStream* Call::CreateVideoSendStream(
return send_stream; return send_stream;
} }
void Call::DestroySendStream(webrtc::VideoSendStream* send_stream) { void Call::DestroyVideoSendStream(webrtc::VideoSendStream* send_stream) {
assert(send_stream != NULL); assert(send_stream != NULL);
VideoSendStream* send_stream_impl = NULL; VideoSendStream* send_stream_impl = NULL;
@ -265,7 +266,8 @@ VideoReceiveStream* Call::CreateVideoReceiveStream(
return receive_stream; return receive_stream;
} }
void Call::DestroyReceiveStream(webrtc::VideoReceiveStream* receive_stream) { void Call::DestroyVideoReceiveStream(
webrtc::VideoReceiveStream* receive_stream) {
assert(receive_stream != NULL); assert(receive_stream != NULL);
VideoReceiveStream* receive_stream_impl = NULL; VideoReceiveStream* receive_stream_impl = NULL;

5
webrtc/call.h
View File

@ -66,13 +66,14 @@ class Call {
// Returns the internal state of the send stream, for resume sending with a // Returns the internal state of the send stream, for resume sending with a
// new stream with different settings. // new stream with different settings.
// Note: Only the last returned send-stream state is valid. // 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::Config GetDefaultReceiveConfig() = 0;
virtual VideoReceiveStream* CreateVideoReceiveStream( virtual VideoReceiveStream* CreateVideoReceiveStream(
const VideoReceiveStream::Config& config) = 0; 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 // All received RTP and RTCP packets for the call should be inserted to this
// PacketReceiver. The PacketReceiver pointer is valid as long as the // PacketReceiver. The PacketReceiver pointer is valid as long as the

10
webrtc/call_tests.cc
View File

@ -119,9 +119,9 @@ class CallTest : public ::testing::Test {
void DestroyStreams() { void DestroyStreams() {
if (send_stream_ != NULL) if (send_stream_ != NULL)
sender_call_->DestroySendStream(send_stream_); sender_call_->DestroyVideoSendStream(send_stream_);
if (receive_stream_ != NULL) if (receive_stream_ != NULL)
receiver_call_->DestroyReceiveStream(receive_stream_); receiver_call_->DestroyVideoReceiveStream(receive_stream_);
send_stream_ = NULL; send_stream_ = NULL;
receive_stream_ = NULL; receive_stream_ = NULL;
} }
@ -623,7 +623,7 @@ TEST_F(CallTest, SurvivesIncomingRtpPacketsToDestroyedReceiveStream) {
CreateFrameGenerator(); CreateFrameGenerator();
StartSending(); StartSending();
receiver_call_->DestroyReceiveStream(receive_stream_); receiver_call_->DestroyVideoReceiveStream(receive_stream_);
receive_stream_ = NULL; receive_stream_ = NULL;
// Wait() waits for a received packet. // Wait() waits for a received packet.
@ -810,8 +810,8 @@ TEST_F(CallTest, SendsAndReceivesMultipleStreams) {
for (size_t i = 0; i < kNumStreams; ++i) { for (size_t i = 0; i < kNumStreams; ++i) {
frame_generators[i]->Stop(); frame_generators[i]->Stop();
delete frame_generators[i]; delete frame_generators[i];
sender_call->DestroySendStream(send_streams[i]); sender_call->DestroyVideoSendStream(send_streams[i]);
receiver_call->DestroyReceiveStream(receive_streams[i]); receiver_call->DestroyVideoReceiveStream(receive_streams[i]);
delete observers[i]; delete observers[i];
} }

4
webrtc/loopback.cc
View File

@ -91,8 +91,8 @@ TEST_F(LoopbackTest, Test) {
send_stream->StopSending(); send_stream->StopSending();
receive_stream->StopReceiving(); receive_stream->StopReceiving();
call->DestroyReceiveStream(receive_stream); call->DestroyVideoReceiveStream(receive_stream);
call->DestroySendStream(send_stream); call->DestroyVideoSendStream(send_stream);
transport.StopSending(); transport.StopSending();
} }

4
webrtc/video/full_stack.cc
View File

@ -435,8 +435,8 @@ TEST_P(FullStackTest, NoPacketLoss) {
send_stream->StopSending(); send_stream->StopSending();
receive_stream->StopReceiving(); receive_stream->StopReceiving();
call->DestroyReceiveStream(receive_stream); call->DestroyVideoReceiveStream(receive_stream);
call->DestroySendStream(send_stream); call->DestroyVideoSendStream(send_stream);
transport.StopSending(); transport.StopSending();
} }

4
webrtc/video/rampup_tests.cc
View File

@ -162,8 +162,8 @@ TEST_P(RampUpTest, RampUpWithPadding) {
send_stream->StopSending(); send_stream->StopSending();
receive_stream->StopReceiving(); receive_stream->StopReceiving();
call->DestroyReceiveStream(receive_stream); call->DestroyVideoReceiveStream(receive_stream);
call->DestroySendStream(send_stream); call->DestroyVideoSendStream(send_stream);
} }
INSTANTIATE_TEST_CASE_P(RampUpTest, RampUpTest, ::testing::Bool()); INSTANTIATE_TEST_CASE_P(RampUpTest, RampUpTest, ::testing::Bool());

2
webrtc/video/video_send_stream_tests.cc
View File

@ -52,7 +52,7 @@ class VideoSendStreamTest : public ::testing::Test {
observer->StopSending(); observer->StopSending();
frame_generator_capturer->Stop(); frame_generator_capturer->Stop();
send_stream_->StopSending(); send_stream_->StopSending();
call->DestroySendStream(send_stream_); call->DestroyVideoSendStream(send_stream_);
} }
VideoSendStream::Config GetSendTestConfig(Call* call) { VideoSendStream::Config GetSendTestConfig(Call* call) {