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

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

Issue 1213603002: Remove ResetStatistics from RTP feedback. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Remove more data counter resetting. Created 5 years, 6 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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 18 matching lines...) Expand all
29 RtcpStatisticsCallback* rtcp_callback, 29 RtcpStatisticsCallback* rtcp_callback,
30 StreamDataCountersCallback* rtp_callback); 30 StreamDataCountersCallback* rtp_callback);
31 virtual ~StreamStatisticianImpl() {} 31 virtual ~StreamStatisticianImpl() {}
32 32
33 bool GetStatistics(RtcpStatistics* statistics, bool reset) override; 33 bool GetStatistics(RtcpStatistics* statistics, bool reset) override;
34 void GetDataCounters(size_t* bytes_received, 34 void GetDataCounters(size_t* bytes_received,
35 uint32_t* packets_received) const override; 35 uint32_t* packets_received) const override;
36 void GetReceiveStreamDataCounters( 36 void GetReceiveStreamDataCounters(
37 StreamDataCounters* data_counters) const override; 37 StreamDataCounters* data_counters) const override;
38 uint32_t BitrateReceived() const override; 38 uint32_t BitrateReceived() const override;
39 void ResetStatistics() override;
40 bool IsRetransmitOfOldPacket(const RTPHeader& header, 39 bool IsRetransmitOfOldPacket(const RTPHeader& header,
41 int64_t min_rtt) const override; 40 int64_t min_rtt) const override;
42 bool IsPacketInOrder(uint16_t sequence_number) const override; 41 bool IsPacketInOrder(uint16_t sequence_number) const override;
43 42
44 void IncomingPacket(const RTPHeader& rtp_header, 43 void IncomingPacket(const RTPHeader& rtp_header,
45 size_t packet_length, 44 size_t packet_length,
46 bool retransmitted); 45 bool retransmitted);
47 void FecPacketReceived(const RTPHeader& header, size_t packet_length); 46 void FecPacketReceived(const RTPHeader& header, size_t packet_length);
48 void SetMaxReorderingThreshold(int max_reordering_threshold); 47 void SetMaxReorderingThreshold(int max_reordering_threshold);
49 void ProcessBitrate(); 48 void ProcessBitrate();
(...skipping 28 matching lines...) Expand all
78 uint32_t last_received_timestamp_; 77 uint32_t last_received_timestamp_;
79 int32_t last_received_transmission_time_offset_; 78 int32_t last_received_transmission_time_offset_;
80 uint16_t received_seq_first_; 79 uint16_t received_seq_first_;
81 uint16_t received_seq_max_; 80 uint16_t received_seq_max_;
82 uint16_t received_seq_wraps_; 81 uint16_t received_seq_wraps_;
83 82
84 // Current counter values. 83 // Current counter values.
85 size_t received_packet_overhead_; 84 size_t received_packet_overhead_;
86 StreamDataCounters receive_counters_; 85 StreamDataCounters receive_counters_;
87 86
88 // Stored counter values. Includes sum of reset counter values for the stream.
89 StreamDataCounters stored_sum_receive_counters_;
90
91 // Counter values when we sent the last report. 87 // Counter values when we sent the last report.
92 uint32_t last_report_inorder_packets_; 88 uint32_t last_report_inorder_packets_;
93 uint32_t last_report_old_packets_; 89 uint32_t last_report_old_packets_;
94 uint16_t last_report_seq_max_; 90 uint16_t last_report_seq_max_;
95 RtcpStatistics last_reported_statistics_; 91 RtcpStatistics last_reported_statistics_;
96 92
97 RtcpStatisticsCallback* const rtcp_callback_; 93 RtcpStatisticsCallback* const rtcp_callback_;
98 StreamDataCountersCallback* const rtp_callback_; 94 StreamDataCountersCallback* const rtp_callback_;
99 }; 95 };
100 96
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 Clock* clock_; 134 Clock* clock_;
139 rtc::scoped_ptr<CriticalSectionWrapper> receive_statistics_lock_; 135 rtc::scoped_ptr<CriticalSectionWrapper> receive_statistics_lock_;
140 int64_t last_rate_update_ms_; 136 int64_t last_rate_update_ms_;
141 StatisticianImplMap statisticians_; 137 StatisticianImplMap statisticians_;
142 138
143 RtcpStatisticsCallback* rtcp_stats_callback_; 139 RtcpStatisticsCallback* rtcp_stats_callback_;
144 StreamDataCountersCallback* rtp_stats_callback_; 140 StreamDataCountersCallback* rtp_stats_callback_;
145 }; 141 };
146 } // namespace webrtc 142 } // namespace webrtc
147 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RECEIVE_STATISTICS_IMPL_H_ 143 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RECEIVE_STATISTICS_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698