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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.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 & reduced RtpRtcpImplUnittest to more reasanable expectations 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 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 883 matching lines...) Expand 10 before | Expand all | Expand 10 after
894 void ModuleRtpRtcpImpl::OnRequestSendReport() { 894 void ModuleRtpRtcpImpl::OnRequestSendReport() {
895 SendRTCP(kRtcpSr); 895 SendRTCP(kRtcpSr);
896 } 896 }
897 897
898 int32_t ModuleRtpRtcpImpl::SendRTCPReferencePictureSelection( 898 int32_t ModuleRtpRtcpImpl::SendRTCPReferencePictureSelection(
899 const uint64_t picture_id) { 899 const uint64_t picture_id) {
900 return rtcp_sender_.SendRTCP( 900 return rtcp_sender_.SendRTCP(
901 GetFeedbackState(), kRtcpRpsi, 0, 0, false, picture_id); 901 GetFeedbackState(), kRtcpRpsi, 0, 0, false, picture_id);
902 } 902 }
903 903
904 int64_t ModuleRtpRtcpImpl::SendTimeOfSendReport(
905 const uint32_t send_report) {
906 return rtcp_sender_.SendTimeOfSendReport(send_report);
907 }
908
909 bool ModuleRtpRtcpImpl::SendTimeOfXrRrReport(
910 uint32_t mid_ntp, int64_t* time_ms) const {
911 return rtcp_sender_.SendTimeOfXrRrReport(mid_ntp, time_ms);
912 }
913
914 void ModuleRtpRtcpImpl::OnReceivedNACK( 904 void ModuleRtpRtcpImpl::OnReceivedNACK(
915 const std::list<uint16_t>& nack_sequence_numbers) { 905 const std::list<uint16_t>& nack_sequence_numbers) {
916 for (uint16_t nack_sequence_number : nack_sequence_numbers) { 906 for (uint16_t nack_sequence_number : nack_sequence_numbers) {
917 send_loss_stats_.AddLostPacket(nack_sequence_number); 907 send_loss_stats_.AddLostPacket(nack_sequence_number);
918 } 908 }
919 if (!rtp_sender_.StorePackets() || 909 if (!rtp_sender_.StorePackets() ||
920 nack_sequence_numbers.size() == 0) { 910 nack_sequence_numbers.size() == 0) {
921 return; 911 return;
922 } 912 }
923 // Use RTT from RtcpRttStats class if provided. 913 // Use RTT from RtcpRttStats class if provided.
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
993 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback( 983 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback(
994 StreamDataCountersCallback* callback) { 984 StreamDataCountersCallback* callback) {
995 rtp_sender_.RegisterRtpStatisticsCallback(callback); 985 rtp_sender_.RegisterRtpStatisticsCallback(callback);
996 } 986 }
997 987
998 StreamDataCountersCallback* 988 StreamDataCountersCallback*
999 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { 989 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const {
1000 return rtp_sender_.GetRtpStatisticsCallback(); 990 return rtp_sender_.GetRtpStatisticsCallback();
1001 } 991 }
1002 } // namespace webrtc 992 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698