Make sure channels in the same call are in the same channel group.
Tested manually. I'll make a follow CL with a proper test once review.webrtc.org/5619004 has been committed.
R=pbos@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/5509004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5280 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/video/video_send_stream.cc b/video/video_send_stream.cc
index 2b83a48..df03b13 100644
--- a/video/video_send_stream.cc
+++ b/video/video_send_stream.cc
@@ -81,14 +81,16 @@
VideoSendStream::VideoSendStream(newapi::Transport* transport,
bool overuse_detection,
webrtc::VideoEngine* video_engine,
- const VideoSendStream::Config& config)
+ const VideoSendStream::Config& config,
+ int base_channel)
: transport_adapter_(transport),
encoded_frame_proxy_(config.post_encode_callback),
codec_lock_(CriticalSectionWrapper::CreateCriticalSection()),
config_(config),
- external_codec_(NULL) {
+ external_codec_(NULL),
+ channel_(-1) {
video_engine_base_ = ViEBase::GetInterface(video_engine);
- video_engine_base_->CreateChannel(channel_);
+ video_engine_base_->CreateChannel(channel_, base_channel);
assert(channel_ != -1);
rtp_rtcp_ = ViERTP_RTCP::GetInterface(video_engine);