OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
264 break; | 264 break; |
265 case VideoEncoderConfig::ContentType::kScreen: | 265 case VideoEncoderConfig::ContentType::kScreen: |
266 video_codec.mode = kScreensharing; | 266 video_codec.mode = kScreensharing; |
267 if (config.streams.size() == 1 && | 267 if (config.streams.size() == 1 && |
268 config.streams[0].temporal_layer_thresholds_bps.size() == 1) { | 268 config.streams[0].temporal_layer_thresholds_bps.size() == 1) { |
269 video_codec.targetBitrate = | 269 video_codec.targetBitrate = |
270 config.streams[0].temporal_layer_thresholds_bps[0] / 1000; | 270 config.streams[0].temporal_layer_thresholds_bps[0] / 1000; |
271 } | 271 } |
272 break; | 272 break; |
273 } | 273 } |
| 274 video_codec.forceDisableWrapperFrameDropper = |
| 275 config.test.force_disable_wrapper_frame_dropper; |
274 | 276 |
275 if (video_codec.codecType == kVideoCodecVP8) { | 277 if (video_codec.codecType == kVideoCodecVP8) { |
276 video_codec.codecSpecific.VP8 = VideoEncoder::GetDefaultVp8Settings(); | 278 video_codec.codecSpecific.VP8 = VideoEncoder::GetDefaultVp8Settings(); |
277 } else if (video_codec.codecType == kVideoCodecVP9) { | 279 } else if (video_codec.codecType == kVideoCodecVP9) { |
278 video_codec.codecSpecific.VP9 = VideoEncoder::GetDefaultVp9Settings(); | 280 video_codec.codecSpecific.VP9 = VideoEncoder::GetDefaultVp9Settings(); |
279 } else if (video_codec.codecType == kVideoCodecH264) { | 281 } else if (video_codec.codecType == kVideoCodecH264) { |
280 video_codec.codecSpecific.H264 = VideoEncoder::GetDefaultH264Settings(); | 282 video_codec.codecSpecific.H264 = VideoEncoder::GetDefaultH264Settings(); |
281 } | 283 } |
282 | 284 |
283 if (video_codec.codecType == kVideoCodecVP8) { | 285 if (video_codec.codecType == kVideoCodecVP8) { |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
502 vie_channel_->IsSendingFecEnabled()); | 504 vie_channel_->IsSendingFecEnabled()); |
503 | 505 |
504 // Restart the media flow | 506 // Restart the media flow |
505 vie_encoder_->Restart(); | 507 vie_encoder_->Restart(); |
506 | 508 |
507 return true; | 509 return true; |
508 } | 510 } |
509 | 511 |
510 } // namespace internal | 512 } // namespace internal |
511 } // namespace webrtc | 513 } // namespace webrtc |
OLD | NEW |