Rename Call::Create{Receive,Send}Stream().
Renaming the methods to include Video. Long-term there will hopefully be
AudioSendStream/AudioReceiveStreams as well.
BUG=
R=mflodman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/3439004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5135 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/call.cc b/call.cc
index dff913b..68d4843 100644
--- a/call.cc
+++ b/call.cc
@@ -38,14 +38,14 @@
virtual VideoSendStream::Config GetDefaultSendConfig() OVERRIDE;
- virtual VideoSendStream* CreateSendStream(
+ virtual VideoSendStream* CreateVideoSendStream(
const VideoSendStream::Config& config) OVERRIDE;
virtual void DestroySendStream(webrtc::VideoSendStream* send_stream) OVERRIDE;
virtual VideoReceiveStream::Config GetDefaultReceiveConfig() OVERRIDE;
- virtual VideoReceiveStream* CreateReceiveStream(
+ virtual VideoReceiveStream* CreateVideoReceiveStream(
const VideoReceiveStream::Config& config) OVERRIDE;
virtual void DestroyReceiveStream(
@@ -211,7 +211,8 @@
return config;
}
-VideoSendStream* Call::CreateSendStream(const VideoSendStream::Config& config) {
+VideoSendStream* Call::CreateVideoSendStream(
+ const VideoSendStream::Config& config) {
assert(config.rtp.ssrcs.size() > 0);
assert(config.codec.numberOfSimulcastStreams == 0 ||
config.codec.numberOfSimulcastStreams == config.rtp.ssrcs.size());
@@ -253,7 +254,7 @@
return VideoReceiveStream::Config();
}
-VideoReceiveStream* Call::CreateReceiveStream(
+VideoReceiveStream* Call::CreateVideoReceiveStream(
const VideoReceiveStream::Config& config) {
VideoReceiveStream* receive_stream = new VideoReceiveStream(
video_engine_, config, config_.send_transport, config_.voice_engine);
diff --git a/call.h b/call.h
index 5f4c7b6..7b3de93 100644
--- a/call.h
+++ b/call.h
@@ -60,7 +60,7 @@
virtual VideoSendStream::Config GetDefaultSendConfig() = 0;
- virtual VideoSendStream* CreateSendStream(
+ virtual VideoSendStream* CreateVideoSendStream(
const VideoSendStream::Config& config) = 0;
// Returns the internal state of the send stream, for resume sending with a
@@ -70,7 +70,7 @@
virtual VideoReceiveStream::Config GetDefaultReceiveConfig() = 0;
- virtual VideoReceiveStream* CreateReceiveStream(
+ virtual VideoReceiveStream* CreateVideoReceiveStream(
const VideoReceiveStream::Config& config) = 0;
virtual void DestroyReceiveStream(VideoReceiveStream* receive_stream) = 0;
diff --git a/call_tests.cc b/call_tests.cc
index 3c8d78e..e8637bc 100644
--- a/call_tests.cc
+++ b/call_tests.cc
@@ -88,8 +88,8 @@
assert(send_stream_ == NULL);
assert(receive_stream_ == NULL);
- send_stream_ = sender_call_->CreateSendStream(send_config_);
- receive_stream_ = receiver_call_->CreateReceiveStream(receive_config_);
+ send_stream_ = sender_call_->CreateVideoSendStream(send_config_);
+ receive_stream_ = receiver_call_->CreateVideoReceiveStream(receive_config_);
}
void CreateFrameGenerator() {
@@ -787,14 +787,15 @@
receiver_call->GetDefaultReceiveConfig();
receive_config.renderer = observers[i];
receive_config.rtp.ssrc = ssrc;
- receive_streams[i] = receiver_call->CreateReceiveStream(receive_config);
+ receive_streams[i] =
+ receiver_call->CreateVideoReceiveStream(receive_config);
receive_streams[i]->StartReceive();
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->CreateSendStream(send_config);
+ send_streams[i] = sender_call->CreateVideoSendStream(send_config);
send_streams[i]->StartSend();
frame_generators[i] = test::FrameGeneratorCapturer::Create(
diff --git a/loopback.cc b/loopback.cc
index 5c5dbce..52cdcaa 100644
--- a/loopback.cc
+++ b/loopback.cc
@@ -63,7 +63,7 @@
send_config.codec.maxBitrate =
static_cast<unsigned int>(test::flags::MaxBitrate());
- VideoSendStream* send_stream = call->CreateSendStream(send_config);
+ VideoSendStream* send_stream = call->CreateVideoSendStream(send_config);
Clock* test_clock = Clock::GetRealTimeClock();
@@ -79,7 +79,7 @@
receive_config.renderer = loopback_video.get();
VideoReceiveStream* receive_stream =
- call->CreateReceiveStream(receive_config);
+ call->CreateVideoReceiveStream(receive_config);
receive_stream->StartReceive();
send_stream->StartSend();
diff --git a/video/full_stack.cc b/video/full_stack.cc
index b154df3..317f126 100644
--- a/video/full_stack.cc
+++ b/video/full_stack.cc
@@ -402,7 +402,7 @@
send_config.codec.startBitrate = params.bitrate;
send_config.codec.maxBitrate = params.bitrate;
- VideoSendStream* send_stream = call->CreateSendStream(send_config);
+ VideoSendStream* send_stream = call->CreateVideoSendStream(send_config);
analyzer.input_ = send_stream->Input();
scoped_ptr<test::FrameGeneratorCapturer> file_capturer(
@@ -422,7 +422,7 @@
receive_config.renderer = &analyzer;
VideoReceiveStream* receive_stream =
- call->CreateReceiveStream(receive_config);
+ call->CreateVideoReceiveStream(receive_config);
receive_stream->StartReceive();
send_stream->StartSend();
diff --git a/video/rampup_tests.cc b/video/rampup_tests.cc
index aa164b5..dababaf 100644
--- a/video/rampup_tests.cc
+++ b/video/rampup_tests.cc
@@ -159,13 +159,13 @@
test::GenerateRandomSsrcs(&send_config, &reserved_ssrcs_);
- VideoSendStream* send_stream = call->CreateSendStream(send_config);
+ VideoSendStream* send_stream = call->CreateVideoSendStream(send_config);
VideoReceiveStream::Config receive_config;
receive_config.rtp.ssrc = send_config.rtp.ssrcs[0];
receive_config.rtp.nack.rtp_history_ms = send_config.rtp.nack.rtp_history_ms;
VideoReceiveStream* receive_stream =
- call->CreateReceiveStream(receive_config);
+ call->CreateVideoReceiveStream(receive_config);
scoped_ptr<test::FrameGeneratorCapturer> frame_generator_capturer(
test::FrameGeneratorCapturer::Create(send_stream->Input(),
diff --git a/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc
index 7e12713..dd9bc55 100644
--- a/video/video_send_stream_tests.cc
+++ b/video/video_send_stream_tests.cc
@@ -40,7 +40,7 @@
void RunSendTest(Call* call,
const VideoSendStream::Config& config,
test::RtpRtcpObserver* observer) {
- send_stream_ = call->CreateSendStream(config);
+ send_stream_ = call->CreateVideoSendStream(config);
scoped_ptr<test::FrameGeneratorCapturer> frame_generator_capturer(
test::FrameGeneratorCapturer::Create(
send_stream_->Input(), 320, 240, 30, Clock::GetRealTimeClock()));