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

Side by Side Diff: webrtc/modules/video_coding/video_codec_initializer.cc

Issue 2654033006: Minor style fix to please internal style tool. (Closed)
Patch Set: Created 3 years, 11 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 | no next file » | 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) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 memset(&video_codec, 0, sizeof(video_codec)); 96 memset(&video_codec, 0, sizeof(video_codec));
97 video_codec.codecType = PayloadNameToCodecType(payload_name) 97 video_codec.codecType = PayloadNameToCodecType(payload_name)
98 .value_or(VideoCodecType::kVideoCodecGeneric); 98 .value_or(VideoCodecType::kVideoCodecGeneric);
99 99
100 switch (config.content_type) { 100 switch (config.content_type) {
101 case VideoEncoderConfig::ContentType::kRealtimeVideo: 101 case VideoEncoderConfig::ContentType::kRealtimeVideo:
102 video_codec.mode = kRealtimeVideo; 102 video_codec.mode = kRealtimeVideo;
103 break; 103 break;
104 case VideoEncoderConfig::ContentType::kScreen: 104 case VideoEncoderConfig::ContentType::kScreen:
105 video_codec.mode = kScreensharing; 105 video_codec.mode = kScreensharing;
106 if (streams.size() >= 1 && 106 if (!streams.empty() &&
107 streams[0].temporal_layer_thresholds_bps.size() == 1) { 107 streams[0].temporal_layer_thresholds_bps.size() == 1) {
108 video_codec.targetBitrate = 108 video_codec.targetBitrate =
109 streams[0].temporal_layer_thresholds_bps[0] / 1000; 109 streams[0].temporal_layer_thresholds_bps[0] / 1000;
110 } 110 }
111 break; 111 break;
112 } 112 }
113 113
114 if (config.encoder_specific_settings) 114 if (config.encoder_specific_settings)
115 config.encoder_specific_settings->FillEncoderSpecificSettings(&video_codec); 115 config.encoder_specific_settings->FillEncoderSpecificSettings(&video_codec);
116 116
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 } 221 }
222 if (video_codec.maxBitrate < kEncoderMinBitrateKbps) 222 if (video_codec.maxBitrate < kEncoderMinBitrateKbps)
223 video_codec.maxBitrate = kEncoderMinBitrateKbps; 223 video_codec.maxBitrate = kEncoderMinBitrateKbps;
224 224
225 RTC_DCHECK_GT(streams[0].max_framerate, 0); 225 RTC_DCHECK_GT(streams[0].max_framerate, 0);
226 video_codec.maxFramerate = streams[0].max_framerate; 226 video_codec.maxFramerate = streams[0].max_framerate;
227 return video_codec; 227 return video_codec;
228 } 228 }
229 229
230 } // namespace webrtc 230 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698