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

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

Issue 1251163002: Remove base channel for video receivers. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: fix data race 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
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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 encoded_frame_proxy_(config.post_encode_callback), 113 encoded_frame_proxy_(config.post_encode_callback),
114 config_(config), 114 config_(config),
115 suspended_ssrcs_(suspended_ssrcs), 115 suspended_ssrcs_(suspended_ssrcs),
116 module_process_thread_(module_process_thread), 116 module_process_thread_(module_process_thread),
117 channel_group_(channel_group), 117 channel_group_(channel_group),
118 channel_id_(channel_id), 118 channel_id_(channel_id),
119 use_config_bitrate_(true), 119 use_config_bitrate_(true),
120 stats_proxy_(Clock::GetRealTimeClock(), config) { 120 stats_proxy_(Clock::GetRealTimeClock(), config) {
121 DCHECK(!config_.rtp.ssrcs.empty()); 121 DCHECK(!config_.rtp.ssrcs.empty());
122 CHECK(channel_group->CreateSendChannel(channel_id_, 0, &transport_adapter_, 122 CHECK(channel_group->CreateSendChannel(channel_id_, 0, &transport_adapter_,
123 num_cpu_cores, config_.rtp.ssrcs, 123 num_cpu_cores, config_.rtp.ssrcs));
124 true));
125 vie_channel_ = channel_group_->GetChannel(channel_id_); 124 vie_channel_ = channel_group_->GetChannel(channel_id_);
126 vie_encoder_ = channel_group_->GetEncoder(channel_id_); 125 vie_encoder_ = channel_group_->GetEncoder(channel_id_);
127 126
128 for (size_t i = 0; i < config_.rtp.extensions.size(); ++i) { 127 for (size_t i = 0; i < config_.rtp.extensions.size(); ++i) {
129 const std::string& extension = config_.rtp.extensions[i].name; 128 const std::string& extension = config_.rtp.extensions[i].name;
130 int id = config_.rtp.extensions[i].id; 129 int id = config_.rtp.extensions[i].id;
131 // One-byte-extension local identifiers are in the range 1-14 inclusive. 130 // One-byte-extension local identifiers are in the range 1-14 inclusive.
132 DCHECK_GE(id, 1); 131 DCHECK_GE(id, 1);
133 DCHECK_LE(id, 14); 132 DCHECK_LE(id, 14);
134 if (extension == RtpExtension::kTOffset) { 133 if (extension == RtpExtension::kTOffset) {
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 vie_channel_->IsSendingFecEnabled()); 499 vie_channel_->IsSendingFecEnabled());
501 500
502 // Restart the media flow 501 // Restart the media flow
503 vie_encoder_->Restart(); 502 vie_encoder_->Restart();
504 503
505 return true; 504 return true;
506 } 505 }
507 506
508 } // namespace internal 507 } // namespace internal
509 } // namespace webrtc 508 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698