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

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

Issue 2469293003: Fix circular dependency between call and video receive stream. (Closed)
Patch Set: . Created 4 years, 1 month 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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 if (codec.codecType == kVideoCodecVP8) { 162 if (codec.codecType == kVideoCodecVP8) {
163 *(codec.VP8()) = VideoEncoder::GetDefaultVp8Settings(); 163 *(codec.VP8()) = VideoEncoder::GetDefaultVp8Settings();
164 } else if (codec.codecType == kVideoCodecVP9) { 164 } else if (codec.codecType == kVideoCodecVP9) {
165 *(codec.VP9()) = VideoEncoder::GetDefaultVp9Settings(); 165 *(codec.VP9()) = VideoEncoder::GetDefaultVp9Settings();
166 } else if (codec.codecType == kVideoCodecH264) { 166 } else if (codec.codecType == kVideoCodecH264) {
167 *(codec.H264()) = VideoEncoder::GetDefaultH264Settings(); 167 *(codec.H264()) = VideoEncoder::GetDefaultH264Settings();
168 } 168 }
169 169
170 codec.width = 320; 170 codec.width = 320;
171 codec.height = 180; 171 codec.height = 180;
172 const int kDefaultStartBitrate = 300;
172 codec.startBitrate = codec.minBitrate = codec.maxBitrate = 173 codec.startBitrate = codec.minBitrate = codec.maxBitrate =
173 Call::Config::kDefaultStartBitrateBps / 1000; 174 kDefaultStartBitrate;
174 175
175 return codec; 176 return codec;
176 } 177 }
177 } // namespace 178 } // namespace
178 179
179 namespace internal { 180 namespace internal {
180 181
181 VideoReceiveStream::VideoReceiveStream( 182 VideoReceiveStream::VideoReceiveStream(
182 int num_cpu_cores, 183 int num_cpu_cores,
183 CongestionController* congestion_controller, 184 CongestionController* congestion_controller,
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 RequestKeyFrame(); 420 RequestKeyFrame();
420 } 421 }
421 } 422 }
422 423
423 void VideoReceiveStream::RequestKeyFrame() { 424 void VideoReceiveStream::RequestKeyFrame() {
424 rtp_stream_receiver_.RequestKeyFrame(); 425 rtp_stream_receiver_.RequestKeyFrame();
425 } 426 }
426 427
427 } // namespace internal 428 } // namespace internal
428 } // namespace webrtc 429 } // 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