| OLD | NEW |
| 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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 ++num_encoder_reconfigurations_; |
| 178 return true; | 179 return true; |
| 179 } | 180 } |
| 180 | 181 |
| 181 webrtc::VideoCaptureInput* FakeVideoSendStream::Input() { | 182 webrtc::VideoCaptureInput* FakeVideoSendStream::Input() { |
| 182 return this; | 183 return this; |
| 183 } | 184 } |
| 184 | 185 |
| 185 void FakeVideoSendStream::Start() { | 186 void FakeVideoSendStream::Start() { |
| 186 sending_ = true; | 187 sending_ = true; |
| 187 } | 188 } |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 417 } | 418 } |
| 418 | 419 |
| 419 void FakeCall::SignalNetworkState(webrtc::NetworkState state) { | 420 void FakeCall::SignalNetworkState(webrtc::NetworkState state) { |
| 420 network_state_ = state; | 421 network_state_ = state; |
| 421 } | 422 } |
| 422 | 423 |
| 423 void FakeCall::OnSentPacket(const rtc::SentPacket& sent_packet) { | 424 void FakeCall::OnSentPacket(const rtc::SentPacket& sent_packet) { |
| 424 last_sent_packet_ = sent_packet; | 425 last_sent_packet_ = sent_packet; |
| 425 } | 426 } |
| 426 } // namespace cricket | 427 } // namespace cricket |
| OLD | NEW |