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

Side by Side Diff: webrtc/modules/rtp_rtcp/test/testAPI/test_api.cc

Issue 1946183002: Removing some old code which looked like it had to do with NACK handling but in reality did nothing. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 module_->SetRTCPStatus(RtcpMode::kCompound); 145 module_->SetRTCPStatus(RtcpMode::kCompound);
146 EXPECT_EQ(RtcpMode::kCompound, module_->RTCP()); 146 EXPECT_EQ(RtcpMode::kCompound, module_->RTCP());
147 147
148 EXPECT_EQ(0, module_->SetCNAME("john.doe@test.test")); 148 EXPECT_EQ(0, module_->SetCNAME("john.doe@test.test"));
149 149
150 EXPECT_FALSE(module_->TMMBR()); 150 EXPECT_FALSE(module_->TMMBR());
151 module_->SetTMMBRStatus(true); 151 module_->SetTMMBRStatus(true);
152 EXPECT_TRUE(module_->TMMBR()); 152 EXPECT_TRUE(module_->TMMBR());
153 module_->SetTMMBRStatus(false); 153 module_->SetTMMBRStatus(false);
154 EXPECT_FALSE(module_->TMMBR()); 154 EXPECT_FALSE(module_->TMMBR());
155
156 EXPECT_EQ(kNackOff, rtp_receiver_->NACK());
157 rtp_receiver_->SetNACKStatus(kNackRtcp);
158 EXPECT_EQ(kNackRtcp, rtp_receiver_->NACK());
159 } 155 }
160 156
161 TEST_F(RtpRtcpAPITest, RtxSender) { 157 TEST_F(RtpRtcpAPITest, RtxSender) {
162 module_->SetRtxSendStatus(kRtxRetransmitted); 158 module_->SetRtxSendStatus(kRtxRetransmitted);
163 EXPECT_EQ(kRtxRetransmitted, module_->RtxSendStatus()); 159 EXPECT_EQ(kRtxRetransmitted, module_->RtxSendStatus());
164 160
165 module_->SetRtxSendStatus(kRtxOff); 161 module_->SetRtxSendStatus(kRtxOff);
166 EXPECT_EQ(kRtxOff, module_->RtxSendStatus()); 162 EXPECT_EQ(kRtxOff, module_->RtxSendStatus());
167 163
168 module_->SetRtxSendStatus(kRtxRetransmitted); 164 module_->SetRtxSendStatus(kRtxRetransmitted);
(...skipping 13 matching lines...) Expand all
182 rtx_header.payloadType = kRtxPayloadType; 178 rtx_header.payloadType = kRtxPayloadType;
183 EXPECT_TRUE(rtp_payload_registry_->IsRtx(rtx_header)); 179 EXPECT_TRUE(rtp_payload_registry_->IsRtx(rtx_header));
184 rtx_header.ssrc = 0; 180 rtx_header.ssrc = 0;
185 EXPECT_FALSE(rtp_payload_registry_->IsRtx(rtx_header)); 181 EXPECT_FALSE(rtp_payload_registry_->IsRtx(rtx_header));
186 rtx_header.ssrc = kRtxSsrc; 182 rtx_header.ssrc = kRtxSsrc;
187 rtx_header.payloadType = 0; 183 rtx_header.payloadType = 0;
188 EXPECT_TRUE(rtp_payload_registry_->IsRtx(rtx_header)); 184 EXPECT_TRUE(rtp_payload_registry_->IsRtx(rtx_header));
189 } 185 }
190 186
191 } // namespace webrtc 187 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc ('k') | webrtc/modules/rtp_rtcp/test/testAPI/test_api_video.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698