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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc

Issue 2368983002: Replace RtcpReceiveTimeInfo with rtcp::ReceiveTimeInfo (Closed)
Patch Set: Rebase Created 4 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
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h ('k') | 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) 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 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 state.packets_sent = rtp_stats.transmitted.packets + 317 state.packets_sent = rtp_stats.transmitted.packets +
318 rtx_stats.transmitted.packets; 318 rtx_stats.transmitted.packets;
319 state.media_bytes_sent = rtp_stats.transmitted.payload_bytes + 319 state.media_bytes_sent = rtp_stats.transmitted.payload_bytes +
320 rtx_stats.transmitted.payload_bytes; 320 rtx_stats.transmitted.payload_bytes;
321 state.module = this; 321 state.module = this;
322 322
323 LastReceivedNTP(&state.last_rr_ntp_secs, 323 LastReceivedNTP(&state.last_rr_ntp_secs,
324 &state.last_rr_ntp_frac, 324 &state.last_rr_ntp_frac,
325 &state.remote_sr); 325 &state.remote_sr);
326 326
327 state.has_last_xr_rr = LastReceivedXrReferenceTimeInfo(&state.last_xr_rr); 327 state.has_last_xr_rr =
328 rtcp_receiver_.LastReceivedXrReferenceTimeInfo(&state.last_xr_rr);
328 329
329 uint32_t tmp; 330 uint32_t tmp;
330 BitrateSent(&state.send_bitrate, &tmp, &tmp, &tmp); 331 BitrateSent(&state.send_bitrate, &tmp, &tmp, &tmp);
331 return state; 332 return state;
332 } 333 }
333 334
334 int ModuleRtpRtcpImpl::CurrentSendFrequencyHz() const { 335 int ModuleRtpRtcpImpl::CurrentSendFrequencyHz() const {
335 return rtp_sender_.SendPayloadFrequency(); 336 return rtp_sender_.SendPayloadFrequency();
336 } 337 }
337 338
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
891 rtcp_arrival_time_secs, 892 rtcp_arrival_time_secs,
892 rtcp_arrival_time_frac, 893 rtcp_arrival_time_frac,
893 NULL)) { 894 NULL)) {
894 return false; 895 return false;
895 } 896 }
896 *remote_sr = 897 *remote_sr =
897 ((ntp_secs & 0x0000ffff) << 16) + ((ntp_frac & 0xffff0000) >> 16); 898 ((ntp_secs & 0x0000ffff) << 16) + ((ntp_frac & 0xffff0000) >> 16);
898 return true; 899 return true;
899 } 900 }
900 901
901 bool ModuleRtpRtcpImpl::LastReceivedXrReferenceTimeInfo(
902 RtcpReceiveTimeInfo* info) const {
903 return rtcp_receiver_.LastReceivedXrReferenceTimeInfo(info);
904 }
905
906 bool ModuleRtpRtcpImpl::UpdateRTCPReceiveInformationTimers() { 902 bool ModuleRtpRtcpImpl::UpdateRTCPReceiveInformationTimers() {
907 // If this returns true this channel has timed out. 903 // If this returns true this channel has timed out.
908 // Periodically check if this is true and if so call UpdateTMMBR. 904 // Periodically check if this is true and if so call UpdateTMMBR.
909 return rtcp_receiver_.UpdateRTCPReceiveInformationTimers(); 905 return rtcp_receiver_.UpdateRTCPReceiveInformationTimers();
910 } 906 }
911 907
912 // Called from RTCPsender. 908 // Called from RTCPsender.
913 std::vector<rtcp::TmmbItem> ModuleRtpRtcpImpl::BoundingSet(bool* tmmbr_owner) { 909 std::vector<rtcp::TmmbItem> ModuleRtpRtcpImpl::BoundingSet(bool* tmmbr_owner) {
914 return rtcp_receiver_.BoundingSet(tmmbr_owner); 910 return rtcp_receiver_.BoundingSet(tmmbr_owner);
915 } 911 }
(...skipping 26 matching lines...) Expand all
942 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback( 938 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback(
943 StreamDataCountersCallback* callback) { 939 StreamDataCountersCallback* callback) {
944 rtp_sender_.RegisterRtpStatisticsCallback(callback); 940 rtp_sender_.RegisterRtpStatisticsCallback(callback);
945 } 941 }
946 942
947 StreamDataCountersCallback* 943 StreamDataCountersCallback*
948 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { 944 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const {
949 return rtp_sender_.GetRtpStatisticsCallback(); 945 return rtp_sender_.GetRtpStatisticsCallback();
950 } 946 }
951 } // namespace webrtc 947 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698