OLD | NEW |
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 |
11 #ifndef WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_ | 11 #ifndef WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_ |
12 #define WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_ | 12 #define WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_ |
13 | 13 |
14 #include <map> | 14 #include <map> |
15 #include <string> | 15 #include <string> |
16 | 16 |
17 #include "webrtc/call/video_receive_stream.h" | 17 #include "webrtc/call/video_receive_stream.h" |
18 #include "webrtc/common_types.h" | 18 #include "webrtc/common_types.h" |
19 #include "webrtc/common_video/include/frame_callback.h" | 19 #include "webrtc/common_video/include/frame_callback.h" |
20 #include "webrtc/modules/video_coding/include/video_coding_defines.h" | 20 #include "webrtc/modules/video_coding/include/video_coding_defines.h" |
21 #include "webrtc/rtc_base/criticalsection.h" | 21 #include "webrtc/rtc_base/criticalsection.h" |
| 22 #include "webrtc/rtc_base/optional.h" |
22 #include "webrtc/rtc_base/rate_statistics.h" | 23 #include "webrtc/rtc_base/rate_statistics.h" |
23 #include "webrtc/rtc_base/ratetracker.h" | 24 #include "webrtc/rtc_base/ratetracker.h" |
24 #include "webrtc/rtc_base/thread_annotations.h" | 25 #include "webrtc/rtc_base/thread_annotations.h" |
25 #include "webrtc/video/quality_threshold.h" | 26 #include "webrtc/video/quality_threshold.h" |
26 #include "webrtc/video/report_block_stats.h" | 27 #include "webrtc/video/report_block_stats.h" |
27 #include "webrtc/video/stats_counter.h" | 28 #include "webrtc/video/stats_counter.h" |
28 #include "webrtc/video/video_stream_decoder.h" | 29 #include "webrtc/video/video_stream_decoder.h" |
29 | 30 |
30 namespace webrtc { | 31 namespace webrtc { |
31 | 32 |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 uint32_t ssrc) override; | 91 uint32_t ssrc) override; |
91 | 92 |
92 // Implements CallStatsObserver. | 93 // Implements CallStatsObserver. |
93 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override; | 94 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override; |
94 | 95 |
95 private: | 96 private: |
96 struct SampleCounter { | 97 struct SampleCounter { |
97 SampleCounter() : sum(0), num_samples(0) {} | 98 SampleCounter() : sum(0), num_samples(0) {} |
98 void Add(int sample); | 99 void Add(int sample); |
99 int Avg(int64_t min_required_samples) const; | 100 int Avg(int64_t min_required_samples) const; |
| 101 int Max() const; |
100 void Reset(); | 102 void Reset(); |
101 | 103 |
102 private: | 104 private: |
103 int64_t sum; | 105 int64_t sum; |
104 int64_t num_samples; | 106 int64_t num_samples; |
| 107 rtc::Optional<int> max; |
105 }; | 108 }; |
106 struct QpCounters { | 109 struct QpCounters { |
107 SampleCounter vp8; | 110 SampleCounter vp8; |
108 }; | 111 }; |
109 | 112 |
| 113 struct ContentSpecificStats { |
| 114 SampleCounter e2e_delay_counter; |
| 115 SampleCounter interframe_delay_counter; |
| 116 int64_t flow_duration_ms = 0; |
| 117 int64_t total_media_bytes = 0; |
| 118 SampleCounter received_width; |
| 119 SampleCounter received_height; |
| 120 SampleCounter qp_counter; |
| 121 }; |
| 122 |
110 void UpdateHistograms() EXCLUSIVE_LOCKS_REQUIRED(crit_); | 123 void UpdateHistograms() EXCLUSIVE_LOCKS_REQUIRED(crit_); |
111 | 124 |
112 void QualitySample() EXCLUSIVE_LOCKS_REQUIRED(crit_); | 125 void QualitySample() EXCLUSIVE_LOCKS_REQUIRED(crit_); |
113 | 126 |
114 // Removes info about old frames and then updates the framerate. | 127 // Removes info about old frames and then updates the framerate. |
115 void UpdateFramerate(int64_t now_ms) const EXCLUSIVE_LOCKS_REQUIRED(crit_); | 128 void UpdateFramerate(int64_t now_ms) const EXCLUSIVE_LOCKS_REQUIRED(crit_); |
116 | 129 |
117 Clock* const clock_; | 130 Clock* const clock_; |
118 // Ownership of this object lies with the owner of the ReceiveStatisticsProxy | 131 // Ownership of this object lies with the owner of the ReceiveStatisticsProxy |
119 // instance. Lifetime is guaranteed to outlive |this|. | 132 // instance. Lifetime is guaranteed to outlive |this|. |
(...skipping 20 matching lines...) Expand all Loading... |
140 rtc::RateTracker render_pixel_tracker_ GUARDED_BY(crit_); | 153 rtc::RateTracker render_pixel_tracker_ GUARDED_BY(crit_); |
141 rtc::RateTracker total_byte_tracker_ GUARDED_BY(crit_); | 154 rtc::RateTracker total_byte_tracker_ GUARDED_BY(crit_); |
142 SampleCounter render_width_counter_ GUARDED_BY(crit_); | 155 SampleCounter render_width_counter_ GUARDED_BY(crit_); |
143 SampleCounter render_height_counter_ GUARDED_BY(crit_); | 156 SampleCounter render_height_counter_ GUARDED_BY(crit_); |
144 SampleCounter sync_offset_counter_ GUARDED_BY(crit_); | 157 SampleCounter sync_offset_counter_ GUARDED_BY(crit_); |
145 SampleCounter decode_time_counter_ GUARDED_BY(crit_); | 158 SampleCounter decode_time_counter_ GUARDED_BY(crit_); |
146 SampleCounter jitter_buffer_delay_counter_ GUARDED_BY(crit_); | 159 SampleCounter jitter_buffer_delay_counter_ GUARDED_BY(crit_); |
147 SampleCounter target_delay_counter_ GUARDED_BY(crit_); | 160 SampleCounter target_delay_counter_ GUARDED_BY(crit_); |
148 SampleCounter current_delay_counter_ GUARDED_BY(crit_); | 161 SampleCounter current_delay_counter_ GUARDED_BY(crit_); |
149 SampleCounter delay_counter_ GUARDED_BY(crit_); | 162 SampleCounter delay_counter_ GUARDED_BY(crit_); |
150 SampleCounter e2e_delay_counter_video_ GUARDED_BY(crit_); | 163 std::map<VideoContentType, ContentSpecificStats> content_specific_stats_ |
151 SampleCounter e2e_delay_counter_screenshare_ GUARDED_BY(crit_); | 164 GUARDED_BY(crit_); |
152 SampleCounter interframe_delay_counter_video_ GUARDED_BY(crit_); | 165 SampleCounter e2e_delay_counter GUARDED_BY(crit_); |
153 SampleCounter interframe_delay_counter_screenshare_ GUARDED_BY(crit_); | 166 SampleCounter interframe_delay_counter GUARDED_BY(crit_); |
154 int64_t e2e_delay_max_ms_video_ GUARDED_BY(crit_); | |
155 int64_t e2e_delay_max_ms_screenshare_ GUARDED_BY(crit_); | |
156 int64_t interframe_delay_max_ms_video_ GUARDED_BY(crit_); | |
157 int64_t interframe_delay_max_ms_screenshare_ GUARDED_BY(crit_); | |
158 MaxCounter freq_offset_counter_ GUARDED_BY(crit_); | 167 MaxCounter freq_offset_counter_ GUARDED_BY(crit_); |
159 int64_t first_report_block_time_ms_ GUARDED_BY(crit_); | 168 int64_t first_report_block_time_ms_ GUARDED_BY(crit_); |
160 ReportBlockStats report_block_stats_ GUARDED_BY(crit_); | 169 ReportBlockStats report_block_stats_ GUARDED_BY(crit_); |
161 QpCounters qp_counters_; // Only accessed on the decoding thread. | 170 QpCounters qp_counters_; // Only accessed on the decoding thread. |
162 std::map<uint32_t, StreamDataCounters> rtx_stats_ GUARDED_BY(crit_); | 171 std::map<uint32_t, StreamDataCounters> rtx_stats_ GUARDED_BY(crit_); |
163 int64_t avg_rtt_ms_ GUARDED_BY(crit_); | 172 int64_t avg_rtt_ms_ GUARDED_BY(crit_); |
164 mutable std::map<int64_t, size_t> frame_window_ GUARDED_BY(&crit_); | 173 mutable std::map<int64_t, size_t> frame_window_ GUARDED_BY(&crit_); |
165 VideoContentType last_content_type_ GUARDED_BY(&crit_); | 174 VideoContentType last_content_type_ GUARDED_BY(&crit_); |
166 rtc::Optional<int64_t> last_decoded_frame_time_ms_ GUARDED_BY(&crit_); | 175 rtc::Optional<int64_t> last_decoded_frame_time_ms_ GUARDED_BY(&crit_); |
167 rtc::Optional<TimingFrameInfo> timing_frame_info_ GUARDED_BY(&crit_); | 176 rtc::Optional<TimingFrameInfo> timing_frame_info_ GUARDED_BY(&crit_); |
168 }; | 177 }; |
169 | 178 |
170 } // namespace webrtc | 179 } // namespace webrtc |
171 #endif // WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_ | 180 #endif // WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_ |
OLD | NEW |