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

Unified Diff: webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc

Issue 1491843004: [rtp_rtcp] RTT intermidiate calculation use ntp time instead of milliseconds. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtcp_sender.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
index d7423fa0c8304b45853aa119a7ba7dccf34eda6a..f440da489d817351f9c3b334a75a7b2ee9c5325b 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
@@ -643,34 +643,6 @@ TEST_F(RtcpSenderTest, TestNoXrRrtrSentIfNotEnabled) {
EXPECT_EQ(0, parser()->rrtr()->num_packets());
}
-TEST_F(RtcpSenderTest, TestSendTimeOfXrRrtr) {
- rtcp_sender_->SetRTCPStatus(RtcpMode::kCompound);
- RTCPSender::FeedbackState feedback_state = rtp_rtcp_impl_->GetFeedbackState();
- EXPECT_EQ(0, rtcp_sender_->SetSendingStatus(feedback_state, false));
- rtcp_sender_->SendRtcpXrReceiverReferenceTime(true);
- uint32_t ntp_sec;
- uint32_t ntp_frac;
- clock_.CurrentNtp(ntp_sec, ntp_frac);
- uint32_t initial_mid_ntp = RTCPUtility::MidNtp(ntp_sec, ntp_frac);
-
- // No packet sent.
- int64_t time_ms;
- EXPECT_FALSE(rtcp_sender_->SendTimeOfXrRrReport(initial_mid_ntp, &time_ms));
-
- // Send XR RR packets.
- for (int i = 0; i <= RTCP_NUMBER_OF_SR; ++i) {
- EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state, kRtcpReport));
- EXPECT_EQ(i + 1, test_transport_.parser_.rrtr()->num_packets());
- clock_.CurrentNtp(ntp_sec, ntp_frac);
- uint32_t mid_ntp = RTCPUtility::MidNtp(ntp_sec, ntp_frac);
- EXPECT_TRUE(rtcp_sender_->SendTimeOfXrRrReport(mid_ntp, &time_ms));
- EXPECT_EQ(clock_.CurrentNtpInMilliseconds(), time_ms);
- clock_.AdvanceTimeMilliseconds(1000);
- }
- // The first report should no longer be stored.
- EXPECT_FALSE(rtcp_sender_->SendTimeOfXrRrReport(initial_mid_ntp, &time_ms));
-}
-
TEST_F(RtcpSenderTest, TestRegisterRtcpPacketTypeObserver) {
RtcpPacketTypeCounterObserverImpl observer;
rtcp_sender_.reset(new RTCPSender(false, &clock_, receive_statistics_.get(),
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtcp_sender.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698