Chromium Code Reviews| 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/moving_max_counter.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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 145 SampleCounter current_delay_counter_ GUARDED_BY(crit_); | 146 SampleCounter current_delay_counter_ GUARDED_BY(crit_); |
| 146 SampleCounter delay_counter_ GUARDED_BY(crit_); | 147 SampleCounter delay_counter_ GUARDED_BY(crit_); |
| 147 SampleCounter e2e_delay_counter_video_ GUARDED_BY(crit_); | 148 SampleCounter e2e_delay_counter_video_ GUARDED_BY(crit_); |
| 148 SampleCounter e2e_delay_counter_screenshare_ GUARDED_BY(crit_); | 149 SampleCounter e2e_delay_counter_screenshare_ GUARDED_BY(crit_); |
| 149 SampleCounter interframe_delay_counter_video_ GUARDED_BY(crit_); | 150 SampleCounter interframe_delay_counter_video_ GUARDED_BY(crit_); |
| 150 SampleCounter interframe_delay_counter_screenshare_ GUARDED_BY(crit_); | 151 SampleCounter interframe_delay_counter_screenshare_ GUARDED_BY(crit_); |
| 151 int64_t e2e_delay_max_ms_video_ GUARDED_BY(crit_); | 152 int64_t e2e_delay_max_ms_video_ GUARDED_BY(crit_); |
| 152 int64_t e2e_delay_max_ms_screenshare_ GUARDED_BY(crit_); | 153 int64_t e2e_delay_max_ms_screenshare_ GUARDED_BY(crit_); |
| 153 int64_t interframe_delay_max_ms_video_ GUARDED_BY(crit_); | 154 int64_t interframe_delay_max_ms_video_ GUARDED_BY(crit_); |
| 154 int64_t interframe_delay_max_ms_screenshare_ GUARDED_BY(crit_); | 155 int64_t interframe_delay_max_ms_screenshare_ GUARDED_BY(crit_); |
| 156 rtc::MovingMaxCounter<int> interframe_delay_max_moving_ GUARDED_BY(crit_); | |
|
kwiberg-webrtc
2017/08/22 21:40:47
What if you made this one mutable instead, and mad
ilnik
2017/08/23 07:46:50
Yes, this is a great idea. Done it.
| |
| 155 MaxCounter freq_offset_counter_ GUARDED_BY(crit_); | 157 MaxCounter freq_offset_counter_ GUARDED_BY(crit_); |
| 156 int64_t first_report_block_time_ms_ GUARDED_BY(crit_); | 158 int64_t first_report_block_time_ms_ GUARDED_BY(crit_); |
| 157 ReportBlockStats report_block_stats_ GUARDED_BY(crit_); | 159 ReportBlockStats report_block_stats_ GUARDED_BY(crit_); |
| 158 QpCounters qp_counters_; // Only accessed on the decoding thread. | 160 QpCounters qp_counters_; // Only accessed on the decoding thread. |
| 159 std::map<uint32_t, StreamDataCounters> rtx_stats_ GUARDED_BY(crit_); | 161 std::map<uint32_t, StreamDataCounters> rtx_stats_ GUARDED_BY(crit_); |
| 160 int64_t avg_rtt_ms_ GUARDED_BY(crit_); | 162 int64_t avg_rtt_ms_ GUARDED_BY(crit_); |
| 161 mutable std::map<int64_t, size_t> frame_window_ GUARDED_BY(&crit_); | 163 mutable std::map<int64_t, size_t> frame_window_ GUARDED_BY(&crit_); |
| 162 VideoContentType last_content_type_ GUARDED_BY(&crit_); | 164 VideoContentType last_content_type_ GUARDED_BY(&crit_); |
| 163 rtc::Optional<int64_t> last_decoded_frame_time_ms_; | 165 rtc::Optional<int64_t> last_decoded_frame_time_ms_; |
| 164 rtc::Optional<TimingFrameInfo> timing_frame_info_ GUARDED_BY(&crit_); | 166 rtc::Optional<TimingFrameInfo> timing_frame_info_ GUARDED_BY(&crit_); |
| 165 }; | 167 }; |
| 166 | 168 |
| 167 } // namespace webrtc | 169 } // namespace webrtc |
| 168 #endif // WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_ | 170 #endif // WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_ |
| OLD | NEW |