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

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

Issue 1241123002: Remove UpdateSsrcs from EncoderStateFeedback. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: empty SSRC vector handling Created 5 years, 5 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 | « no previous file | webrtc/video/video_send_stream.cc » ('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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 if (config.bitrate_config.max_bitrate_bps != -1) { 173 if (config.bitrate_config.max_bitrate_bps != -1) {
174 DCHECK_GE(config.bitrate_config.max_bitrate_bps, 174 DCHECK_GE(config.bitrate_config.max_bitrate_bps,
175 config.bitrate_config.start_bitrate_bps); 175 config.bitrate_config.start_bitrate_bps);
176 } 176 }
177 177
178 Trace::CreateTrace(); 178 Trace::CreateTrace();
179 module_process_thread_->Start(); 179 module_process_thread_->Start();
180 180
181 // TODO(pbos): Remove base channel when CreateReceiveChannel no longer 181 // TODO(pbos): Remove base channel when CreateReceiveChannel no longer
182 // requires one. 182 // requires one.
183 CHECK(channel_group_->CreateSendChannel( 183 CHECK(channel_group_->CreateSendChannel(base_channel_id_, 0,
184 base_channel_id_, 0, &transport_adapter_, num_cpu_cores_, 1, true)); 184 &transport_adapter_, num_cpu_cores_,
185 std::vector<uint32_t>(), true));
185 186
186 if (config.overuse_callback) { 187 if (config.overuse_callback) {
187 overuse_observer_proxy_.reset( 188 overuse_observer_proxy_.reset(
188 new CpuOveruseObserverProxy(config.overuse_callback)); 189 new CpuOveruseObserverProxy(config.overuse_callback));
189 } 190 }
190 191
191 SetBitrateControllerConfig(config_.bitrate_config); 192 SetBitrateControllerConfig(config_.bitrate_config);
192 } 193 }
193 194
194 Call::~Call() { 195 Call::~Call() {
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 const uint8_t* packet, 549 const uint8_t* packet,
549 size_t length) { 550 size_t length) {
550 if (RtpHeaderParser::IsRtcp(packet, length)) 551 if (RtpHeaderParser::IsRtcp(packet, length))
551 return DeliverRtcp(media_type, packet, length); 552 return DeliverRtcp(media_type, packet, length);
552 553
553 return DeliverRtp(media_type, packet, length); 554 return DeliverRtp(media_type, packet, length);
554 } 555 }
555 556
556 } // namespace internal 557 } // namespace internal
557 } // namespace webrtc 558 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/video/video_send_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698