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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtcp_receiver.h

Issue 2389703007: Use NtpTime in RtcpReceiver instead of pair of uints (Closed)
Patch Set: 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 | « no previous file | webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc » ('j') | 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
11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_
13 13
14 #include <map> 14 #include <map>
15 #include <set> 15 #include <set>
16 #include <string> 16 #include <string>
17 #include <vector> 17 #include <vector>
18 18
19 #include "webrtc/base/criticalsection.h" 19 #include "webrtc/base/criticalsection.h"
20 #include "webrtc/base/thread_annotations.h" 20 #include "webrtc/base/thread_annotations.h"
21 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 21 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
22 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h" 22 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h"
23 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h" 23 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
24 #include "webrtc/system_wrappers/include/ntp_time.h"
24 #include "webrtc/typedefs.h" 25 #include "webrtc/typedefs.h"
25 26
26 namespace webrtc { 27 namespace webrtc {
27 namespace rtcp { 28 namespace rtcp {
28 class CommonHeader; 29 class CommonHeader;
29 class ReportBlock; 30 class ReportBlock;
30 class Rrtr; 31 class Rrtr;
31 class TmmbItem; 32 class TmmbItem;
32 } // namespace rtcp 33 } // namespace rtcp
33 34
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 RtcpIntraFrameObserver* const _cbRtcpIntraFrameObserver; 215 RtcpIntraFrameObserver* const _cbRtcpIntraFrameObserver;
215 TransportFeedbackObserver* const _cbTransportFeedbackObserver; 216 TransportFeedbackObserver* const _cbTransportFeedbackObserver;
216 217
217 rtc::CriticalSection _criticalSectionRTCPReceiver; 218 rtc::CriticalSection _criticalSectionRTCPReceiver;
218 uint32_t main_ssrc_ GUARDED_BY(_criticalSectionRTCPReceiver); 219 uint32_t main_ssrc_ GUARDED_BY(_criticalSectionRTCPReceiver);
219 uint32_t _remoteSSRC GUARDED_BY(_criticalSectionRTCPReceiver); 220 uint32_t _remoteSSRC GUARDED_BY(_criticalSectionRTCPReceiver);
220 std::set<uint32_t> registered_ssrcs_ GUARDED_BY(_criticalSectionRTCPReceiver); 221 std::set<uint32_t> registered_ssrcs_ GUARDED_BY(_criticalSectionRTCPReceiver);
221 222
222 // Received send report 223 // Received send report
223 RTCPSenderInfo _remoteSenderInfo; 224 RTCPSenderInfo _remoteSenderInfo;
224 // when did we receive the last send report 225 // When did we receive the last send report.
225 uint32_t _lastReceivedSRNTPsecs; 226 NtpTime last_received_sr_ntp_;
226 uint32_t _lastReceivedSRNTPfrac;
227 227
228 // Received XR receive time report. 228 // Received XR receive time report.
229 rtcp::ReceiveTimeInfo remote_time_info_; 229 rtcp::ReceiveTimeInfo remote_time_info_;
230 // Time when the report was received. 230 // Time when the report was received.
231 uint32_t _lastReceivedXRNTPsecs; 231 NtpTime last_received_xr_ntp_;
232 uint32_t _lastReceivedXRNTPfrac;
233 // Estimated rtt, zero when there is no valid estimate. 232 // Estimated rtt, zero when there is no valid estimate.
234 bool xr_rrtr_status_ GUARDED_BY(_criticalSectionRTCPReceiver); 233 bool xr_rrtr_status_ GUARDED_BY(_criticalSectionRTCPReceiver);
235 int64_t xr_rr_rtt_ms_; 234 int64_t xr_rr_rtt_ms_;
236 235
237 // Received report blocks. 236 // Received report blocks.
238 ReportBlockMap received_report_blocks_ 237 ReportBlockMap received_report_blocks_
239 GUARDED_BY(_criticalSectionRTCPReceiver); 238 GUARDED_BY(_criticalSectionRTCPReceiver);
240 ReceivedInfoMap received_infos_ GUARDED_BY(_criticalSectionRTCPReceiver); 239 ReceivedInfoMap received_infos_ GUARDED_BY(_criticalSectionRTCPReceiver);
241 std::map<uint32_t, std::string> received_cnames_ 240 std::map<uint32_t, std::string> received_cnames_
242 GUARDED_BY(_criticalSectionRTCPReceiver); 241 GUARDED_BY(_criticalSectionRTCPReceiver);
(...skipping 10 matching lines...) Expand all
253 RtcpPacketTypeCounterObserver* const packet_type_counter_observer_; 252 RtcpPacketTypeCounterObserver* const packet_type_counter_observer_;
254 RtcpPacketTypeCounter packet_type_counter_; 253 RtcpPacketTypeCounter packet_type_counter_;
255 254
256 RTCPUtility::NackStats nack_stats_; 255 RTCPUtility::NackStats nack_stats_;
257 256
258 size_t num_skipped_packets_; 257 size_t num_skipped_packets_;
259 int64_t last_skipped_packets_warning_; 258 int64_t last_skipped_packets_warning_;
260 }; 259 };
261 } // namespace webrtc 260 } // namespace webrtc
262 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_ 261 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698