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

Side by Side Diff: webrtc/config.cc

Issue 2351633002: Let ViEEncoder handle resolution changes. (Closed)
Patch Set: fix line ending. 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
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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 ss << ']'; 108 ss << ']';
109 109
110 ss << '}'; 110 ss << '}';
111 return ss.str(); 111 return ss.str();
112 } 112 }
113 113
114 VideoEncoderConfig::VideoEncoderConfig() 114 VideoEncoderConfig::VideoEncoderConfig()
115 : content_type(ContentType::kRealtimeVideo), 115 : content_type(ContentType::kRealtimeVideo),
116 encoder_specific_settings(NULL), 116 encoder_specific_settings(NULL),
117 min_transmit_bitrate_bps(0), 117 min_transmit_bitrate_bps(0),
118 expect_encode_from_texture(false) {} 118 max_bitrate_bps(0),
119 number_of_streams(0) {}
119 120
120 VideoEncoderConfig::~VideoEncoderConfig() = default; 121 VideoEncoderConfig::~VideoEncoderConfig() = default;
121 122
122 std::string VideoEncoderConfig::ToString() const { 123 std::string VideoEncoderConfig::ToString() const {
123 std::stringstream ss; 124 std::stringstream ss;
124 125 ss << "{content_type: ";
125 ss << "{streams: [";
126 for (size_t i = 0; i < streams.size(); ++i) {
127 ss << streams[i].ToString();
128 if (i != streams.size() - 1)
129 ss << ", ";
130 }
131 ss << ']';
132 ss << ", content_type: ";
133 switch (content_type) { 126 switch (content_type) {
134 case ContentType::kRealtimeVideo: 127 case ContentType::kRealtimeVideo:
135 ss << "kRealtimeVideo"; 128 ss << "kRealtimeVideo";
136 break; 129 break;
137 case ContentType::kScreen: 130 case ContentType::kScreen:
138 ss << "kScreenshare"; 131 ss << "kScreenshare";
139 break; 132 break;
140 } 133 }
141 ss << ", encoder_specific_settings: "; 134 ss << ", encoder_specific_settings: ";
142 ss << (encoder_specific_settings != NULL ? "(ptr)" : "NULL"); 135 ss << (encoder_specific_settings != NULL ? "(ptr)" : "NULL");
143 136
144 ss << ", min_transmit_bitrate_bps: " << min_transmit_bitrate_bps; 137 ss << ", min_transmit_bitrate_bps: " << min_transmit_bitrate_bps;
145 ss << '}'; 138 ss << '}';
146 return ss.str(); 139 return ss.str();
147 } 140 }
148 141
149 } // namespace webrtc 142 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698