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

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

Issue 1373903003: Unify newapi::RtcpMode and RTCPMethod. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: ehm, compile the code Created 5 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
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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 &fake_clock, NULL, receiver, rtp_feedback2_.get(), 116 &fake_clock, NULL, receiver, rtp_feedback2_.get(),
117 rtp_payload_registry2_.get())); 117 rtp_payload_registry2_.get()));
118 118
119 transport1->SetSendModule(module2, rtp_payload_registry2_.get(), 119 transport1->SetSendModule(module2, rtp_payload_registry2_.get(),
120 rtp_receiver2_.get(), receive_statistics2_.get()); 120 rtp_receiver2_.get(), receive_statistics2_.get());
121 transport2->SetSendModule(module1, rtp_payload_registry1_.get(), 121 transport2->SetSendModule(module1, rtp_payload_registry1_.get(),
122 rtp_receiver1_.get(), receive_statistics1_.get()); 122 rtp_receiver1_.get(), receive_statistics1_.get());
123 myRTCPFeedback1->SetModule(module1); 123 myRTCPFeedback1->SetModule(module1);
124 myRTCPFeedback2->SetModule(module2); 124 myRTCPFeedback2->SetModule(module2);
125 125
126 module1->SetRTCPStatus(kRtcpCompound); 126 module1->SetRTCPStatus(RtcpMode::kCompound);
127 module2->SetRTCPStatus(kRtcpCompound); 127 module2->SetRTCPStatus(RtcpMode::kCompound);
128 128
129 module2->SetSSRC(test_ssrc + 1); 129 module2->SetSSRC(test_ssrc + 1);
130 module1->SetSSRC(test_ssrc); 130 module1->SetSSRC(test_ssrc);
131 module1->SetSequenceNumber(test_sequence_number); 131 module1->SetSequenceNumber(test_sequence_number);
132 module1->SetStartTimestamp(test_timestamp); 132 module1->SetStartTimestamp(test_timestamp);
133 133
134 module1->SetCsrcs(test_csrcs); 134 module1->SetCsrcs(test_csrcs);
135 EXPECT_EQ(0, module1->SetCNAME("john.doe@test.test")); 135 EXPECT_EQ(0, module1->SetCNAME("john.doe@test.test"));
136 136
137 EXPECT_EQ(0, module1->SetSendingStatus(true)); 137 EXPECT_EQ(0, module1->SetSendingStatus(true));
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 259
260 // |test_ssrc+1| is the SSRC of module2 that send the report. 260 // |test_ssrc+1| is the SSRC of module2 that send the report.
261 EXPECT_EQ(test_ssrc+1, report_blocks[0].remoteSSRC); 261 EXPECT_EQ(test_ssrc+1, report_blocks[0].remoteSSRC);
262 EXPECT_EQ(test_ssrc, report_blocks[0].sourceSSRC); 262 EXPECT_EQ(test_ssrc, report_blocks[0].sourceSSRC);
263 263
264 EXPECT_EQ(0u, report_blocks[0].cumulativeLost); 264 EXPECT_EQ(0u, report_blocks[0].cumulativeLost);
265 EXPECT_LT(0u, report_blocks[0].delaySinceLastSR); 265 EXPECT_LT(0u, report_blocks[0].delaySinceLastSR);
266 EXPECT_EQ(test_sequence_number, report_blocks[0].extendedHighSeqNum); 266 EXPECT_EQ(test_sequence_number, report_blocks[0].extendedHighSeqNum);
267 EXPECT_EQ(0u, report_blocks[0].fractionLost); 267 EXPECT_EQ(0u, report_blocks[0].fractionLost);
268 } 268 }
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/test/testAPI/test_api.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