Chromium Code Reviews| 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 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 162 void 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 if (!config.streams.empty()) { | |
|
pbos-webrtc
2016/03/17 14:34:38
Should this be added to vp8 for symmetry as well?
åsapersson
2016/03/17 16:57:34
Done.
| |
| 173 vpx_settings_.vp9.numberOfTemporalLayers = static_cast<unsigned char>( | |
| 174 config.streams.back().temporal_layer_thresholds_bps.size() + 1); | |
| 175 } | |
| 172 } else { | 176 } else { |
| 173 ADD_FAILURE() << "Unsupported encoder payload: " | 177 ADD_FAILURE() << "Unsupported encoder payload: " |
| 174 << config_.encoder_settings.payload_name; | 178 << config_.encoder_settings.payload_name; |
| 175 } | 179 } |
| 176 } | 180 } |
| 177 codec_settings_set_ = config.encoder_specific_settings != NULL; | 181 codec_settings_set_ = config.encoder_specific_settings != NULL; |
| 178 } | 182 } |
| 179 | 183 |
| 180 webrtc::VideoCaptureInput* FakeVideoSendStream::Input() { | 184 webrtc::VideoCaptureInput* FakeVideoSendStream::Input() { |
| 181 return this; | 185 return this; |
| (...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 416 } | 420 } |
| 417 | 421 |
| 418 void FakeCall::SignalNetworkState(webrtc::NetworkState state) { | 422 void FakeCall::SignalNetworkState(webrtc::NetworkState state) { |
| 419 network_state_ = state; | 423 network_state_ = state; |
| 420 } | 424 } |
| 421 | 425 |
| 422 void FakeCall::OnSentPacket(const rtc::SentPacket& sent_packet) { | 426 void FakeCall::OnSentPacket(const rtc::SentPacket& sent_packet) { |
| 423 last_sent_packet_ = sent_packet; | 427 last_sent_packet_ = sent_packet; |
| 424 } | 428 } |
| 425 } // namespace cricket | 429 } // namespace cricket |
| OLD | NEW |