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 #include "webrtc/video/video_quality_test.h" | 10 #include "webrtc/video/video_quality_test.h" |
(...skipping 1342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1353 // CreateMatchingReceiveConfigs, since VideoQualityTest is not a BaseTest. | 1353 // CreateMatchingReceiveConfigs, since VideoQualityTest is not a BaseTest. |
1354 // Set up the receive config manually instead. | 1354 // Set up the receive config manually instead. |
1355 FlexfecReceiveStream::Config flexfec_receive_config(recv_transport); | 1355 FlexfecReceiveStream::Config flexfec_receive_config(recv_transport); |
1356 flexfec_receive_config.payload_type = | 1356 flexfec_receive_config.payload_type = |
1357 video_send_config_.rtp.flexfec.payload_type; | 1357 video_send_config_.rtp.flexfec.payload_type; |
1358 flexfec_receive_config.remote_ssrc = video_send_config_.rtp.flexfec.ssrc; | 1358 flexfec_receive_config.remote_ssrc = video_send_config_.rtp.flexfec.ssrc; |
1359 flexfec_receive_config.protected_media_ssrcs = | 1359 flexfec_receive_config.protected_media_ssrcs = |
1360 video_send_config_.rtp.flexfec.protected_media_ssrcs; | 1360 video_send_config_.rtp.flexfec.protected_media_ssrcs; |
1361 flexfec_receive_config.local_ssrc = kReceiverLocalVideoSsrc; | 1361 flexfec_receive_config.local_ssrc = kReceiverLocalVideoSsrc; |
1362 flexfec_receive_config.transport_cc = params_.call.send_side_bwe; | 1362 flexfec_receive_config.transport_cc = params_.call.send_side_bwe; |
| 1363 #if 0 |
1363 if (params_.call.send_side_bwe) { | 1364 if (params_.call.send_side_bwe) { |
1364 flexfec_receive_config.rtp_header_extensions.push_back( | 1365 flexfec_receive_config.rtp_header_extensions.push_back( |
1365 RtpExtension(RtpExtension::kTransportSequenceNumberUri, | 1366 RtpExtension(RtpExtension::kTransportSequenceNumberUri, |
1366 test::kTransportSequenceNumberExtensionId)); | 1367 test::kTransportSequenceNumberExtensionId)); |
1367 } else { | 1368 } else { |
1368 flexfec_receive_config.rtp_header_extensions.push_back(RtpExtension( | 1369 flexfec_receive_config.rtp_header_extensions.push_back(RtpExtension( |
1369 RtpExtension::kAbsSendTimeUri, test::kAbsSendTimeExtensionId)); | 1370 RtpExtension::kAbsSendTimeUri, test::kAbsSendTimeExtensionId)); |
1370 } | 1371 } |
| 1372 #endif |
1371 flexfec_receive_configs_.push_back(flexfec_receive_config); | 1373 flexfec_receive_configs_.push_back(flexfec_receive_config); |
1372 } | 1374 } |
1373 | 1375 |
1374 if (params_.video.ulpfec) { | 1376 if (params_.video.ulpfec) { |
1375 video_send_config_.rtp.ulpfec.red_payload_type = kRedPayloadType; | 1377 video_send_config_.rtp.ulpfec.red_payload_type = kRedPayloadType; |
1376 video_send_config_.rtp.ulpfec.ulpfec_payload_type = kUlpfecPayloadType; | 1378 video_send_config_.rtp.ulpfec.ulpfec_payload_type = kUlpfecPayloadType; |
1377 video_send_config_.rtp.ulpfec.red_rtx_payload_type = kRtxRedPayloadType; | 1379 video_send_config_.rtp.ulpfec.red_rtx_payload_type = kRtxRedPayloadType; |
1378 | 1380 |
1379 video_receive_configs_[params_.ss.selected_stream] | 1381 video_receive_configs_[params_.ss.selected_stream] |
1380 .rtp.ulpfec.red_payload_type = | 1382 .rtp.ulpfec.red_payload_type = |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1422 thumbnail_encoder_config.max_bitrate_bps = 50000; | 1424 thumbnail_encoder_config.max_bitrate_bps = 50000; |
1423 thumbnail_encoder_config.video_stream_factory = | 1425 thumbnail_encoder_config.video_stream_factory = |
1424 new rtc::RefCountedObject<VideoStreamFactory>( | 1426 new rtc::RefCountedObject<VideoStreamFactory>( |
1425 std::vector<webrtc::VideoStream>{DefaultThumbnailStream()}); | 1427 std::vector<webrtc::VideoStream>{DefaultThumbnailStream()}); |
1426 thumbnail_encoder_config.spatial_layers = params_.ss.spatial_layers; | 1428 thumbnail_encoder_config.spatial_layers = params_.ss.spatial_layers; |
1427 | 1429 |
1428 VideoReceiveStream::Config thumbnail_receive_config(send_transport); | 1430 VideoReceiveStream::Config thumbnail_receive_config(send_transport); |
1429 thumbnail_receive_config.rtp.remb = false; | 1431 thumbnail_receive_config.rtp.remb = false; |
1430 thumbnail_receive_config.rtp.transport_cc = true; | 1432 thumbnail_receive_config.rtp.transport_cc = true; |
1431 thumbnail_receive_config.rtp.local_ssrc = kReceiverLocalVideoSsrc; | 1433 thumbnail_receive_config.rtp.local_ssrc = kReceiverLocalVideoSsrc; |
| 1434 #if 0 |
1432 for (const RtpExtension& extension : thumbnail_send_config.rtp.extensions) | 1435 for (const RtpExtension& extension : thumbnail_send_config.rtp.extensions) |
1433 thumbnail_receive_config.rtp.extensions.push_back(extension); | 1436 thumbnail_receive_config.rtp.extensions.push_back(extension); |
| 1437 #endif |
1434 thumbnail_receive_config.renderer = &fake_renderer_; | 1438 thumbnail_receive_config.renderer = &fake_renderer_; |
1435 | 1439 |
1436 VideoReceiveStream::Decoder decoder = | 1440 VideoReceiveStream::Decoder decoder = |
1437 test::CreateMatchingDecoder(thumbnail_send_config.encoder_settings); | 1441 test::CreateMatchingDecoder(thumbnail_send_config.encoder_settings); |
1438 allocated_decoders_.push_back( | 1442 allocated_decoders_.push_back( |
1439 std::unique_ptr<VideoDecoder>(decoder.decoder)); | 1443 std::unique_ptr<VideoDecoder>(decoder.decoder)); |
1440 thumbnail_receive_config.decoders.clear(); | 1444 thumbnail_receive_config.decoders.clear(); |
1441 thumbnail_receive_config.decoders.push_back(decoder); | 1445 thumbnail_receive_config.decoders.push_back(decoder); |
1442 thumbnail_receive_config.rtp.remote_ssrc = | 1446 thumbnail_receive_config.rtp.remote_ssrc = |
1443 thumbnail_send_config.rtp.ssrcs[0]; | 1447 thumbnail_send_config.rtp.ssrcs[0]; |
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1902 if (!params_.video.encoded_frame_base_path.empty()) { | 1906 if (!params_.video.encoded_frame_base_path.empty()) { |
1903 std::ostringstream str; | 1907 std::ostringstream str; |
1904 str << receive_logs_++; | 1908 str << receive_logs_++; |
1905 std::string path = | 1909 std::string path = |
1906 params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf"; | 1910 params_.video.encoded_frame_base_path + "." + str.str() + ".recv.ivf"; |
1907 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path), | 1911 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path), |
1908 10000000); | 1912 10000000); |
1909 } | 1913 } |
1910 } | 1914 } |
1911 } // namespace webrtc | 1915 } // namespace webrtc |
OLD | NEW |