Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(420)

Side by Side Diff: video/video_quality_test.cc

Issue 2826263004: Move responsibility for RTP header extensions on video receive. (Closed)
Patch Set: Crude rebase. Created 3 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « video/rtp_video_stream_receiver.cc ('k') | video/video_send_stream_tests.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "video/video_quality_test.h" 10 #include "video/video_quality_test.h"
(...skipping 1512 matching lines...) Expand 10 before | Expand all | Expand 10 after
1523 // CreateMatchingReceiveConfigs, since VideoQualityTest is not a BaseTest. 1523 // CreateMatchingReceiveConfigs, since VideoQualityTest is not a BaseTest.
1524 // Set up the receive config manually instead. 1524 // Set up the receive config manually instead.
1525 FlexfecReceiveStream::Config flexfec_receive_config(recv_transport); 1525 FlexfecReceiveStream::Config flexfec_receive_config(recv_transport);
1526 flexfec_receive_config.payload_type = 1526 flexfec_receive_config.payload_type =
1527 video_send_config_.rtp.flexfec.payload_type; 1527 video_send_config_.rtp.flexfec.payload_type;
1528 flexfec_receive_config.remote_ssrc = video_send_config_.rtp.flexfec.ssrc; 1528 flexfec_receive_config.remote_ssrc = video_send_config_.rtp.flexfec.ssrc;
1529 flexfec_receive_config.protected_media_ssrcs = 1529 flexfec_receive_config.protected_media_ssrcs =
1530 video_send_config_.rtp.flexfec.protected_media_ssrcs; 1530 video_send_config_.rtp.flexfec.protected_media_ssrcs;
1531 flexfec_receive_config.local_ssrc = kReceiverLocalVideoSsrc; 1531 flexfec_receive_config.local_ssrc = kReceiverLocalVideoSsrc;
1532 flexfec_receive_config.transport_cc = params_.call.send_side_bwe; 1532 flexfec_receive_config.transport_cc = params_.call.send_side_bwe;
1533 #if 0
1533 if (params_.call.send_side_bwe) { 1534 if (params_.call.send_side_bwe) {
1534 flexfec_receive_config.rtp_header_extensions.push_back( 1535 flexfec_receive_config.rtp_header_extensions.push_back(
1535 RtpExtension(RtpExtension::kTransportSequenceNumberUri, 1536 RtpExtension(RtpExtension::kTransportSequenceNumberUri,
1536 test::kTransportSequenceNumberExtensionId)); 1537 test::kTransportSequenceNumberExtensionId));
1537 } else { 1538 } else {
1538 flexfec_receive_config.rtp_header_extensions.push_back(RtpExtension( 1539 flexfec_receive_config.rtp_header_extensions.push_back(RtpExtension(
1539 RtpExtension::kAbsSendTimeUri, test::kAbsSendTimeExtensionId)); 1540 RtpExtension::kAbsSendTimeUri, test::kAbsSendTimeExtensionId));
1540 } 1541 }
1542 #endif
1541 flexfec_receive_configs_.push_back(flexfec_receive_config); 1543 flexfec_receive_configs_.push_back(flexfec_receive_config);
1542 if (num_video_streams > 0) { 1544 if (num_video_streams > 0) {
1543 video_receive_configs_[0].rtp.protected_by_flexfec = true; 1545 video_receive_configs_[0].rtp.protected_by_flexfec = true;
1544 } 1546 }
1545 } 1547 }
1546 1548
1547 if (params_.video.ulpfec) { 1549 if (params_.video.ulpfec) {
1548 video_send_config_.rtp.ulpfec.red_payload_type = kRedPayloadType; 1550 video_send_config_.rtp.ulpfec.red_payload_type = kRedPayloadType;
1549 video_send_config_.rtp.ulpfec.ulpfec_payload_type = kUlpfecPayloadType; 1551 video_send_config_.rtp.ulpfec.ulpfec_payload_type = kUlpfecPayloadType;
1550 video_send_config_.rtp.ulpfec.red_rtx_payload_type = kRtxRedPayloadType; 1552 video_send_config_.rtp.ulpfec.red_rtx_payload_type = kRtxRedPayloadType;
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
1614 new rtc::RefCountedObject<cricket::EncoderStreamFactory>( 1616 new rtc::RefCountedObject<cricket::EncoderStreamFactory>(
1615 params_.video.codec, params_.ss.streams[0].max_qp, 1617 params_.video.codec, params_.ss.streams[0].max_qp,
1616 params_.video.fps, params_.screenshare.enabled, true); 1618 params_.video.fps, params_.screenshare.enabled, true);
1617 } 1619 }
1618 thumbnail_encoder_config.spatial_layers = params_.ss.spatial_layers; 1620 thumbnail_encoder_config.spatial_layers = params_.ss.spatial_layers;
1619 1621
1620 VideoReceiveStream::Config thumbnail_receive_config(send_transport); 1622 VideoReceiveStream::Config thumbnail_receive_config(send_transport);
1621 thumbnail_receive_config.rtp.remb = false; 1623 thumbnail_receive_config.rtp.remb = false;
1622 thumbnail_receive_config.rtp.transport_cc = true; 1624 thumbnail_receive_config.rtp.transport_cc = true;
1623 thumbnail_receive_config.rtp.local_ssrc = kReceiverLocalVideoSsrc; 1625 thumbnail_receive_config.rtp.local_ssrc = kReceiverLocalVideoSsrc;
1626 #if 0
1624 for (const RtpExtension& extension : thumbnail_send_config.rtp.extensions) 1627 for (const RtpExtension& extension : thumbnail_send_config.rtp.extensions)
1625 thumbnail_receive_config.rtp.extensions.push_back(extension); 1628 thumbnail_receive_config.rtp.extensions.push_back(extension);
1629 #endif
1626 thumbnail_receive_config.renderer = &fake_renderer_; 1630 thumbnail_receive_config.renderer = &fake_renderer_;
1627 1631
1628 VideoReceiveStream::Decoder decoder = 1632 VideoReceiveStream::Decoder decoder =
1629 test::CreateMatchingDecoder(thumbnail_send_config.encoder_settings); 1633 test::CreateMatchingDecoder(thumbnail_send_config.encoder_settings);
1630 allocated_decoders_.push_back( 1634 allocated_decoders_.push_back(
1631 std::unique_ptr<VideoDecoder>(decoder.decoder)); 1635 std::unique_ptr<VideoDecoder>(decoder.decoder));
1632 thumbnail_receive_config.decoders.clear(); 1636 thumbnail_receive_config.decoders.clear();
1633 thumbnail_receive_config.decoders.push_back(decoder); 1637 thumbnail_receive_config.decoders.push_back(decoder);
1634 thumbnail_receive_config.rtp.remote_ssrc = 1638 thumbnail_receive_config.rtp.remote_ssrc =
1635 thumbnail_send_config.rtp.ssrcs[0]; 1639 thumbnail_send_config.rtp.ssrcs[0];
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
2177 if (!params_.logging.encoded_frame_base_path.empty()) { 2181 if (!params_.logging.encoded_frame_base_path.empty()) {
2178 std::ostringstream str; 2182 std::ostringstream str;
2179 str << receive_logs_++; 2183 str << receive_logs_++;
2180 std::string path = 2184 std::string path =
2181 params_.logging.encoded_frame_base_path + "." + str.str() + ".recv.ivf"; 2185 params_.logging.encoded_frame_base_path + "." + str.str() + ".recv.ivf";
2182 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path), 2186 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path),
2183 100000000); 2187 100000000);
2184 } 2188 }
2185 } 2189 }
2186 } // namespace webrtc 2190 } // namespace webrtc
OLDNEW
« no previous file with comments | « video/rtp_video_stream_receiver.cc ('k') | video/video_send_stream_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698