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

Rename video streams' start/stop methods.

Browse Source 
{Start,Stop}{Send,Receive}() -> {Start,Stop}{Sending,Receiving}().

BUG=
R=mflodman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/3609005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5136 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2013-11-20 11:36:47 +00:00
parent 5a63655ab0
commit 53c8573525
11 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/call_tests.cc
View File

@ -102,8 +102,8 @@ class CallTest : public ::testing::Test {
}
void StartSending() {
receive_stream_->StartReceive();
send_stream_->StartSend();
receive_stream_->StartReceiving();
send_stream_->StartSending();
if (frame_generator_capturer_.get() != NULL)
frame_generator_capturer_->Start();
}
@ -112,9 +112,9 @@ class CallTest : public ::testing::Test {
if (frame_generator_capturer_.get() != NULL)
frame_generator_capturer_->Stop();
if (send_stream_ != NULL)
send_stream_->StopSend();
send_stream_->StopSending();
if (receive_stream_ != NULL)
receive_stream_->StopReceive();
receive_stream_->StopReceiving();
}
void DestroyStreams() {
@ -789,14 +789,14 @@ TEST_F(CallTest, SendsAndReceivesMultipleStreams) {
receive_config.rtp.ssrc = ssrc;
receive_streams[i] =
receiver_call->CreateVideoReceiveStream(receive_config);
receive_streams[i]->StartReceive();
receive_streams[i]->StartReceiving();
VideoSendStream::Config send_config = sender_call->GetDefaultSendConfig();
send_config.rtp.ssrcs.push_back(ssrc);
send_config.codec.width = width;
send_config.codec.height = height;
send_streams[i] = sender_call->CreateVideoSendStream(send_config);
send_streams[i]->StartSend();
send_streams[i]->StartSending();
frame_generators[i] = test::FrameGeneratorCapturer::Create(
send_streams[i]->Input(), width, height, 30, Clock::GetRealTimeClock());

8
webrtc/loopback.cc
View File

@ -81,15 +81,15 @@ TEST_F(LoopbackTest, Test) {
VideoReceiveStream* receive_stream =
call->CreateVideoReceiveStream(receive_config);
receive_stream->StartReceive();
send_stream->StartSend();
receive_stream->StartReceiving();
send_stream->StartSending();
camera->Start();
test::PressEnterToContinue();
camera->Stop();
send_stream->StopSend();
receive_stream->StopReceive();
send_stream->StopSending();
receive_stream->StopReceiving();
call->DestroyReceiveStream(receive_stream);
call->DestroySendStream(send_stream);

8
webrtc/video/full_stack.cc
View File

@ -424,16 +424,16 @@ TEST_P(FullStackTest, NoPacketLoss) {
VideoReceiveStream* receive_stream =
call->CreateVideoReceiveStream(receive_config);
receive_stream->StartReceive();
send_stream->StartSend();
receive_stream->StartReceiving();
send_stream->StartSending();
file_capturer->Start();
analyzer.Wait();
file_capturer->Stop();
send_stream->StopSend();
receive_stream->StopReceive();
send_stream->StopSending();
receive_stream->StopReceiving();
call->DestroyReceiveStream(receive_stream);
call->DestroySendStream(send_stream);

8
webrtc/video/rampup_tests.cc
View File

@ -174,15 +174,15 @@ TEST_P(RampUpTest, RampUpWithPadding) {
30,
Clock::GetRealTimeClock()));
receive_stream->StartReceive();
send_stream->StartSend();
receive_stream->StartReceiving();
send_stream->StartSending();
frame_generator_capturer->Start();
EXPECT_EQ(kEventSignaled, stream_observer.Wait());
frame_generator_capturer->Stop();
send_stream->StopSend();
receive_stream->StopReceive();
send_stream->StopSending();
receive_stream->StopReceiving();
call->DestroyReceiveStream(receive_stream);
call->DestroySendStream(send_stream);

4
webrtc/video/video_receive_stream.cc
View File

@ -124,7 +124,7 @@ VideoReceiveStream::~VideoReceiveStream() {
rtp_rtcp_->Release();
}
void VideoReceiveStream::StartReceive() {
void VideoReceiveStream::StartReceiving() {
if (render_->StartRender(channel_)) {
abort();
}
@ -133,7 +133,7 @@ void VideoReceiveStream::StartReceive() {
}
}
void VideoReceiveStream::StopReceive() {
void VideoReceiveStream::StopReceiving() {
if (render_->StopRender(channel_)) {
abort();
}

4
webrtc/video/video_receive_stream.h
View File

@ -42,8 +42,8 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
webrtc::VoiceEngine* voice_engine);
virtual ~VideoReceiveStream();
virtual void StartReceive() OVERRIDE;
virtual void StopReceive() OVERRIDE;
virtual void StartReceiving() OVERRIDE;
virtual void StopReceiving() OVERRIDE;
virtual void GetCurrentReceiveCodec(VideoCodec* receive_codec) OVERRIDE;

4
webrtc/video/video_send_stream.cc
View File

@ -257,14 +257,14 @@ void VideoSendStream::PutFrame(const I420VideoFrame& frame,
VideoSendStreamInput* VideoSendStream::Input() { return this; }
void VideoSendStream::StartSend() {
void VideoSendStream::StartSending() {
if (video_engine_base_->StartSend(channel_) != 0)
abort();
if (video_engine_base_->StartReceive(channel_) != 0)
abort();
}
void VideoSendStream::StopSend() {
void VideoSendStream::StopSending() {
if (video_engine_base_->StopSend(channel_) != 0)
abort();
if (video_engine_base_->StopReceive(channel_) != 0)

4
webrtc/video/video_send_stream.h
View File

@ -50,9 +50,9 @@ class VideoSendStream : public webrtc::VideoSendStream,
virtual VideoSendStreamInput* Input() OVERRIDE;
virtual void StartSend() OVERRIDE;
virtual void StartSending() OVERRIDE;
virtual void StopSend() OVERRIDE;
virtual void StopSending() OVERRIDE;
virtual bool SetCodec(const VideoCodec& codec) OVERRIDE;
virtual VideoCodec GetCodec() OVERRIDE;

4
webrtc/video/video_send_stream_tests.cc
View File

@ -44,14 +44,14 @@ class VideoSendStreamTest : public ::testing::Test {
scoped_ptr<test::FrameGeneratorCapturer> frame_generator_capturer(
test::FrameGeneratorCapturer::Create(
send_stream_->Input(), 320, 240, 30, Clock::GetRealTimeClock()));
send_stream_->StartSend();
send_stream_->StartSending();
frame_generator_capturer->Start();
EXPECT_EQ(kEventSignaled, observer->Wait());
observer->StopSending();
frame_generator_capturer->Stop();
send_stream_->StopSend();
send_stream_->StopSending();
call->DestroySendStream(send_stream_);
}

4
webrtc/video_receive_stream.h
View File

@ -164,8 +164,8 @@ class VideoReceiveStream {
StatsCallback* stats_callback;
};
virtual void StartReceive() = 0;
virtual void StopReceive() = 0;
virtual void StartReceiving() = 0;
virtual void StopReceiving() = 0;
// TODO(mflodman) Replace this with callback.
virtual void GetCurrentReceiveCodec(VideoCodec* receive_codec) = 0;

4
webrtc/video_send_stream.h
View File

@ -152,8 +152,8 @@ class VideoSendStream {
// VideoSendStream is valid.
virtual VideoSendStreamInput* Input() = 0;
virtual void StartSend() = 0;
virtual void StopSend() = 0;
virtual void StartSending() = 0;
virtual void StopSending() = 0;
virtual bool SetCodec(const VideoCodec& codec) = 0;
virtual VideoCodec GetCodec() = 0;