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

Side by Side Diff: webrtc/video/rampup_tests.cc

Issue 1238703002: Make sure RTCP is sent in tests when receiving packets even if REMB is delayed. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 5 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 | « no previous file | no next file » | 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) 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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 rtc::CritScope lock(&crit_); 117 rtc::CritScope lock(&crit_);
118 RTPHeader header; 118 RTPHeader header;
119 EXPECT_TRUE(rtp_parser_->Parse(packet, length, &header)); 119 EXPECT_TRUE(rtp_parser_->Parse(packet, length, &header));
120 receive_stats_->IncomingPacket(header, length, false); 120 receive_stats_->IncomingPacket(header, length, false);
121 payload_registry_->SetIncomingPayloadType(header); 121 payload_registry_->SetIncomingPayloadType(header);
122 DCHECK(remote_bitrate_estimator_ != nullptr); 122 DCHECK(remote_bitrate_estimator_ != nullptr);
123 remote_bitrate_estimator_->IncomingPacket( 123 remote_bitrate_estimator_->IncomingPacket(
124 clock_->TimeInMilliseconds(), length - header.headerLength, header, true); 124 clock_->TimeInMilliseconds(), length - header.headerLength, header, true);
125 if (remote_bitrate_estimator_->TimeUntilNextProcess() <= 0) { 125 if (remote_bitrate_estimator_->TimeUntilNextProcess() <= 0) {
126 remote_bitrate_estimator_->Process(); 126 remote_bitrate_estimator_->Process();
127 rtp_rtcp_->Process();
127 } 128 }
128 total_sent_ += length; 129 total_sent_ += length;
129 padding_sent_ += header.paddingLength; 130 padding_sent_ += header.paddingLength;
130 ++total_packets_sent_; 131 ++total_packets_sent_;
131 if (header.paddingLength > 0) 132 if (header.paddingLength > 0)
132 ++padding_packets_sent_; 133 ++padding_packets_sent_;
133 // Handle RTX retransmission, but only for non-padding-only packets. 134 // Handle RTX retransmission, but only for non-padding-only packets.
134 if (rtx_media_ssrcs_.find(header.ssrc) != rtx_media_ssrcs_.end() && 135 if (rtx_media_ssrcs_.find(header.ssrc) != rtx_media_ssrcs_.end() &&
135 header.headerLength + header.paddingLength != length) { 136 header.headerLength + header.paddingLength != length) {
136 rtx_media_sent_ += length - header.headerLength - header.paddingLength; 137 rtx_media_sent_ += length - header.headerLength - header.paddingLength;
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 555
555 TEST_F(RampUpTest, AbsSendTimeSimulcastByRedWithRtx) { 556 TEST_F(RampUpTest, AbsSendTimeSimulcastByRedWithRtx) {
556 RunRampUpTest(3, 0, RtpExtension::kAbsSendTime, true, true); 557 RunRampUpTest(3, 0, RtpExtension::kAbsSendTime, true, true);
557 } 558 }
558 559
559 TEST_F(RampUpTest, AbsSendTimeSingleStreamWithHighStartBitrate) { 560 TEST_F(RampUpTest, AbsSendTimeSingleStreamWithHighStartBitrate) {
560 RunRampUpTest(1, 0.9 * kSingleStreamTargetBps, RtpExtension::kAbsSendTime, 561 RunRampUpTest(1, 0.9 * kSingleStreamTargetBps, RtpExtension::kAbsSendTime,
561 false, false); 562 false, false);
562 } 563 }
563 } // namespace webrtc 564 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698