Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Side by Side Diff: webrtc/video/video_receive_stream.cc

Issue 1273363005: Add send transports to individual webrtc::Call streams. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase+comment Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/video/video_receive_stream.h ('k') | webrtc/video/video_send_stream.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 Call::Config::kDefaultStartBitrateBps / 1000; 121 Call::Config::kDefaultStartBitrateBps / 1000;
122 122
123 return codec; 123 return codec;
124 } 124 }
125 } // namespace 125 } // namespace
126 126
127 VideoReceiveStream::VideoReceiveStream(int num_cpu_cores, 127 VideoReceiveStream::VideoReceiveStream(int num_cpu_cores,
128 ChannelGroup* channel_group, 128 ChannelGroup* channel_group,
129 int channel_id, 129 int channel_id,
130 const VideoReceiveStream::Config& config, 130 const VideoReceiveStream::Config& config,
131 newapi::Transport* transport,
132 webrtc::VoiceEngine* voice_engine) 131 webrtc::VoiceEngine* voice_engine)
133 : transport_adapter_(transport), 132 : transport_adapter_(config.rtcp_send_transport),
134 encoded_frame_proxy_(config.pre_decode_callback), 133 encoded_frame_proxy_(config.pre_decode_callback),
135 config_(config), 134 config_(config),
136 clock_(Clock::GetRealTimeClock()), 135 clock_(Clock::GetRealTimeClock()),
137 channel_group_(channel_group), 136 channel_group_(channel_group),
138 channel_id_(channel_id) { 137 channel_id_(channel_id) {
139 CHECK(channel_group_->CreateReceiveChannel( 138 CHECK(channel_group_->CreateReceiveChannel(
140 channel_id_, 0, &transport_adapter_, num_cpu_cores)); 139 channel_id_, 0, &transport_adapter_, num_cpu_cores));
141 140
142 vie_channel_ = channel_group_->GetChannel(channel_id_); 141 vie_channel_ = channel_group_->GetChannel(channel_id_);
143 142
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 case newapi::kRtcpCompound: 334 case newapi::kRtcpCompound:
336 vie_channel_->SetRTCPMode(kRtcpCompound); 335 vie_channel_->SetRTCPMode(kRtcpCompound);
337 break; 336 break;
338 case newapi::kRtcpReducedSize: 337 case newapi::kRtcpReducedSize:
339 vie_channel_->SetRTCPMode(kRtcpNonCompound); 338 vie_channel_->SetRTCPMode(kRtcpNonCompound);
340 break; 339 break;
341 } 340 }
342 } 341 }
343 } // namespace internal 342 } // namespace internal
344 } // namespace webrtc 343 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/video_receive_stream.h ('k') | webrtc/video/video_send_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698