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

Side by Side Diff: webrtc/config.cc

Issue 2351633002: Let ViEEncoder handle resolution changes. (Closed)
Patch Set: rebased Created 4 years, 2 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/config.h ('k') | webrtc/media/base/fakevideocapturer.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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 #include "webrtc/config.h" 10 #include "webrtc/config.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 ss << ']'; 110 ss << ']';
111 111
112 ss << '}'; 112 ss << '}';
113 return ss.str(); 113 return ss.str();
114 } 114 }
115 115
116 VideoEncoderConfig::VideoEncoderConfig() 116 VideoEncoderConfig::VideoEncoderConfig()
117 : content_type(ContentType::kRealtimeVideo), 117 : content_type(ContentType::kRealtimeVideo),
118 encoder_specific_settings(nullptr), 118 encoder_specific_settings(nullptr),
119 min_transmit_bitrate_bps(0), 119 min_transmit_bitrate_bps(0),
120 expect_encode_from_texture(false) {} 120 max_bitrate_bps(0),
121 number_of_streams(0) {}
121 122
122 VideoEncoderConfig::~VideoEncoderConfig() = default; 123 VideoEncoderConfig::~VideoEncoderConfig() = default;
123 124
124 std::string VideoEncoderConfig::ToString() const { 125 std::string VideoEncoderConfig::ToString() const {
125 std::stringstream ss; 126 std::stringstream ss;
126 127 ss << "{content_type: ";
127 ss << "{streams: [";
128 for (size_t i = 0; i < streams.size(); ++i) {
129 ss << streams[i].ToString();
130 if (i != streams.size() - 1)
131 ss << ", ";
132 }
133 ss << ']';
134 ss << ", content_type: ";
135 switch (content_type) { 128 switch (content_type) {
136 case ContentType::kRealtimeVideo: 129 case ContentType::kRealtimeVideo:
137 ss << "kRealtimeVideo"; 130 ss << "kRealtimeVideo";
138 break; 131 break;
139 case ContentType::kScreen: 132 case ContentType::kScreen:
140 ss << "kScreenshare"; 133 ss << "kScreenshare";
141 break; 134 break;
142 } 135 }
143 ss << ", encoder_specific_settings: "; 136 ss << ", encoder_specific_settings: ";
144 ss << (encoder_specific_settings != NULL ? "(ptr)" : "NULL"); 137 ss << (encoder_specific_settings != NULL ? "(ptr)" : "NULL");
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 VideoEncoderConfig::Vp9EncoderSpecificSettings::Vp9EncoderSpecificSettings( 190 VideoEncoderConfig::Vp9EncoderSpecificSettings::Vp9EncoderSpecificSettings(
198 const VideoCodecVP9& specifics) 191 const VideoCodecVP9& specifics)
199 : specifics_(specifics) {} 192 : specifics_(specifics) {}
200 193
201 void VideoEncoderConfig::Vp9EncoderSpecificSettings::FillVideoCodecVp9( 194 void VideoEncoderConfig::Vp9EncoderSpecificSettings::FillVideoCodecVp9(
202 VideoCodecVP9* vp9_settings) const { 195 VideoCodecVP9* vp9_settings) const {
203 *vp9_settings = specifics_; 196 *vp9_settings = specifics_;
204 } 197 }
205 198
206 } // namespace webrtc 199 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/config.h ('k') | webrtc/media/base/fakevideocapturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698