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 1537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1548 | 1548 |
1549 if (decode_all_receive_streams) { | 1549 if (decode_all_receive_streams) { |
1550 for (auto it = video_receive_configs_.begin(); | 1550 for (auto it = video_receive_configs_.begin(); |
1551 it != video_receive_configs_.end(); ++it) { | 1551 it != video_receive_configs_.end(); ++it) { |
1552 it->rtp.ulpfec.red_payload_type = | 1552 it->rtp.ulpfec.red_payload_type = |
1553 video_send_config_.rtp.ulpfec.red_payload_type; | 1553 video_send_config_.rtp.ulpfec.red_payload_type; |
1554 it->rtp.ulpfec.ulpfec_payload_type = | 1554 it->rtp.ulpfec.ulpfec_payload_type = |
1555 video_send_config_.rtp.ulpfec.ulpfec_payload_type; | 1555 video_send_config_.rtp.ulpfec.ulpfec_payload_type; |
1556 it->rtp.ulpfec.red_rtx_payload_type = | 1556 it->rtp.ulpfec.red_rtx_payload_type = |
1557 video_send_config_.rtp.ulpfec.red_rtx_payload_type; | 1557 video_send_config_.rtp.ulpfec.red_rtx_payload_type; |
| 1558 it->rtp.rtx_associated_payload_types[video_send_config_.rtp.ulpfec |
| 1559 .red_rtx_payload_type] = |
| 1560 video_send_config_.rtp.ulpfec.red_payload_type; |
1558 } | 1561 } |
1559 } else { | 1562 } else { |
1560 video_receive_configs_[params_.ss.selected_stream] | 1563 video_receive_configs_[params_.ss.selected_stream] |
1561 .rtp.ulpfec.red_payload_type = | 1564 .rtp.ulpfec.red_payload_type = |
1562 video_send_config_.rtp.ulpfec.red_payload_type; | 1565 video_send_config_.rtp.ulpfec.red_payload_type; |
1563 video_receive_configs_[params_.ss.selected_stream] | 1566 video_receive_configs_[params_.ss.selected_stream] |
1564 .rtp.ulpfec.ulpfec_payload_type = | 1567 .rtp.ulpfec.ulpfec_payload_type = |
1565 video_send_config_.rtp.ulpfec.ulpfec_payload_type; | 1568 video_send_config_.rtp.ulpfec.ulpfec_payload_type; |
1566 video_receive_configs_[params_.ss.selected_stream] | 1569 video_receive_configs_[params_.ss.selected_stream] |
1567 .rtp.ulpfec.red_rtx_payload_type = | 1570 .rtp.ulpfec.red_rtx_payload_type = |
1568 video_send_config_.rtp.ulpfec.red_rtx_payload_type; | 1571 video_send_config_.rtp.ulpfec.red_rtx_payload_type; |
| 1572 video_receive_configs_[params_.ss.selected_stream] |
| 1573 .rtp.rtx_associated_payload_types[video_send_config_.rtp.ulpfec |
| 1574 .red_rtx_payload_type] = |
| 1575 video_send_config_.rtp.ulpfec.red_payload_type; |
1569 } | 1576 } |
1570 } | 1577 } |
1571 } | 1578 } |
1572 | 1579 |
1573 void VideoQualityTest::SetupThumbnails(Transport* send_transport, | 1580 void VideoQualityTest::SetupThumbnails(Transport* send_transport, |
1574 Transport* recv_transport) { | 1581 Transport* recv_transport) { |
1575 for (int i = 0; i < params_.call.num_thumbnails; ++i) { | 1582 for (int i = 0; i < params_.call.num_thumbnails; ++i) { |
1576 thumbnail_encoders_.emplace_back(VP8Encoder::Create()); | 1583 thumbnail_encoders_.emplace_back(VP8Encoder::Create()); |
1577 | 1584 |
1578 // Thumbnails will be send in the other way: from receiver_call to | 1585 // Thumbnails will be send in the other way: from receiver_call to |
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2173 if (!params_.logging.encoded_frame_base_path.empty()) { | 2180 if (!params_.logging.encoded_frame_base_path.empty()) { |
2174 std::ostringstream str; | 2181 std::ostringstream str; |
2175 str << receive_logs_++; | 2182 str << receive_logs_++; |
2176 std::string path = | 2183 std::string path = |
2177 params_.logging.encoded_frame_base_path + "." + str.str() + ".recv.ivf"; | 2184 params_.logging.encoded_frame_base_path + "." + str.str() + ".recv.ivf"; |
2178 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path), | 2185 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path), |
2179 100000000); | 2186 100000000); |
2180 } | 2187 } |
2181 } | 2188 } |
2182 } // namespace webrtc | 2189 } // namespace webrtc |
OLD | NEW |