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

Side by Side Diff: webrtc/media/engine/fakewebrtccall.cc

Issue 1754283002: Make ReconfigureVideoEncoder void. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 152
153 void FakeVideoSendStream::SetStats( 153 void FakeVideoSendStream::SetStats(
154 const webrtc::VideoSendStream::Stats& stats) { 154 const webrtc::VideoSendStream::Stats& stats) {
155 stats_ = stats; 155 stats_ = stats;
156 } 156 }
157 157
158 webrtc::VideoSendStream::Stats FakeVideoSendStream::GetStats() { 158 webrtc::VideoSendStream::Stats FakeVideoSendStream::GetStats() {
159 return stats_; 159 return stats_;
160 } 160 }
161 161
162 bool FakeVideoSendStream::ReconfigureVideoEncoder( 162 void FakeVideoSendStream::ReconfigureVideoEncoder(
163 const webrtc::VideoEncoderConfig& config) { 163 const webrtc::VideoEncoderConfig& config) {
164 encoder_config_ = config; 164 encoder_config_ = config;
165 if (config.encoder_specific_settings != NULL) { 165 if (config.encoder_specific_settings != NULL) {
166 if (config_.encoder_settings.payload_name == "VP8") { 166 if (config_.encoder_settings.payload_name == "VP8") {
167 vpx_settings_.vp8 = *reinterpret_cast<const webrtc::VideoCodecVP8*>( 167 vpx_settings_.vp8 = *reinterpret_cast<const webrtc::VideoCodecVP8*>(
168 config.encoder_specific_settings); 168 config.encoder_specific_settings);
169 } else if (config_.encoder_settings.payload_name == "VP9") { 169 } else if (config_.encoder_settings.payload_name == "VP9") {
170 vpx_settings_.vp9 = *reinterpret_cast<const webrtc::VideoCodecVP9*>( 170 vpx_settings_.vp9 = *reinterpret_cast<const webrtc::VideoCodecVP9*>(
171 config.encoder_specific_settings); 171 config.encoder_specific_settings);
172 } else { 172 } else {
173 ADD_FAILURE() << "Unsupported encoder payload: " 173 ADD_FAILURE() << "Unsupported encoder payload: "
174 << config_.encoder_settings.payload_name; 174 << config_.encoder_settings.payload_name;
175 } 175 }
176 } 176 }
177 codec_settings_set_ = config.encoder_specific_settings != NULL; 177 codec_settings_set_ = config.encoder_specific_settings != NULL;
178 return true;
179 } 178 }
180 179
181 webrtc::VideoCaptureInput* FakeVideoSendStream::Input() { 180 webrtc::VideoCaptureInput* FakeVideoSendStream::Input() {
182 return this; 181 return this;
183 } 182 }
184 183
185 void FakeVideoSendStream::Start() { 184 void FakeVideoSendStream::Start() {
186 sending_ = true; 185 sending_ = true;
187 } 186 }
188 187
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 } 416 }
418 417
419 void FakeCall::SignalNetworkState(webrtc::NetworkState state) { 418 void FakeCall::SignalNetworkState(webrtc::NetworkState state) {
420 network_state_ = state; 419 network_state_ = state;
421 } 420 }
422 421
423 void FakeCall::OnSentPacket(const rtc::SentPacket& sent_packet) { 422 void FakeCall::OnSentPacket(const rtc::SentPacket& sent_packet) {
424 last_sent_packet_ = sent_packet; 423 last_sent_packet_ = sent_packet;
425 } 424 }
426 } // namespace cricket 425 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698