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/base/criticalsection.h" | 17 #include "webrtc/base/criticalsection.h" |
18 #include "webrtc/base/rate_statistics.h" | 18 #include "webrtc/base/rate_statistics.h" |
19 #include "webrtc/base/ratetracker.h" | 19 #include "webrtc/base/ratetracker.h" |
20 #include "webrtc/base/thread_annotations.h" | 20 #include "webrtc/base/thread_annotations.h" |
21 #include "webrtc/common_types.h" | 21 #include "webrtc/common_types.h" |
22 #include "webrtc/common_video/include/frame_callback.h" | 22 #include "webrtc/common_video/include/frame_callback.h" |
23 #include "webrtc/modules/video_coding/include/video_coding_defines.h" | 23 #include "webrtc/modules/video_coding/include/video_coding_defines.h" |
| 24 #include "webrtc/video/bad_call_threshold.h" |
24 #include "webrtc/video/report_block_stats.h" | 25 #include "webrtc/video/report_block_stats.h" |
25 #include "webrtc/video/video_stream_decoder.h" | 26 #include "webrtc/video/video_stream_decoder.h" |
26 #include "webrtc/video_receive_stream.h" | 27 #include "webrtc/video_receive_stream.h" |
27 | 28 |
28 namespace webrtc { | 29 namespace webrtc { |
29 | 30 |
30 class Clock; | 31 class Clock; |
31 class ViECodec; | 32 class ViECodec; |
32 class ViEDecoderObserver; | 33 class ViEDecoderObserver; |
33 struct CodecSpecificInfo; | 34 struct CodecSpecificInfo; |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 const RtcpPacketTypeCounter& packet_counter) override; | 78 const RtcpPacketTypeCounter& packet_counter) override; |
78 // Overrides StreamDataCountersCallback. | 79 // Overrides StreamDataCountersCallback. |
79 void DataCountersUpdated(const webrtc::StreamDataCounters& counters, | 80 void DataCountersUpdated(const webrtc::StreamDataCounters& counters, |
80 uint32_t ssrc) override; | 81 uint32_t ssrc) override; |
81 | 82 |
82 private: | 83 private: |
83 struct SampleCounter { | 84 struct SampleCounter { |
84 SampleCounter() : sum(0), num_samples(0) {} | 85 SampleCounter() : sum(0), num_samples(0) {} |
85 void Add(int sample); | 86 void Add(int sample); |
86 int Avg(int min_required_samples) const; | 87 int Avg(int min_required_samples) const; |
| 88 void Reset(); |
87 | 89 |
88 private: | 90 private: |
89 int sum; | 91 int sum; |
90 int num_samples; | 92 int num_samples; |
91 }; | 93 }; |
92 struct QpCounters { | 94 struct QpCounters { |
93 SampleCounter vp8; | 95 SampleCounter vp8; |
94 }; | 96 }; |
95 | 97 |
96 void UpdateHistograms() EXCLUSIVE_LOCKS_REQUIRED(crit_); | 98 void UpdateHistograms() EXCLUSIVE_LOCKS_REQUIRED(crit_); |
97 | 99 |
| 100 void BadCallSample() EXCLUSIVE_LOCKS_REQUIRED(crit_); |
| 101 |
98 Clock* const clock_; | 102 Clock* const clock_; |
99 // Ownership of this object lies with the owner of the ReceiveStatisticsProxy | 103 // Ownership of this object lies with the owner of the ReceiveStatisticsProxy |
100 // instance. Lifetime is guaranteed to outlive |this|. | 104 // instance. Lifetime is guaranteed to outlive |this|. |
101 // TODO(tommi): In practice the config_ reference is only used for accessing | 105 // TODO(tommi): In practice the config_ reference is only used for accessing |
102 // config_.rtp.ulpfec.ulpfec_payload_type. Instead of holding a pointer back, | 106 // config_.rtp.ulpfec.ulpfec_payload_type. Instead of holding a pointer back, |
103 // we could just store the value of ulpfec_payload_type and change the | 107 // we could just store the value of ulpfec_payload_type and change the |
104 // ReceiveStatisticsProxy() ctor to accept a const& of Config (since we'll | 108 // ReceiveStatisticsProxy() ctor to accept a const& of Config (since we'll |
105 // then no longer store a pointer to the object). | 109 // then no longer store a pointer to the object). |
106 const VideoReceiveStream::Config& config_; | 110 const VideoReceiveStream::Config& config_; |
107 const int64_t start_ms_; | 111 const int64_t start_ms_; |
108 | 112 |
109 rtc::CriticalSection crit_; | 113 rtc::CriticalSection crit_; |
| 114 uint64_t last_sample_time_ GUARDED_BY(crit_); |
| 115 BadCallThreshold fps_threshold_ GUARDED_BY(crit_); |
| 116 BadCallThreshold qp_threshold_ GUARDED_BY(crit_); |
| 117 SampleCounter qp_sample_ GUARDED_BY(crit_); |
110 VideoReceiveStream::Stats stats_ GUARDED_BY(crit_); | 118 VideoReceiveStream::Stats stats_ GUARDED_BY(crit_); |
111 RateStatistics decode_fps_estimator_ GUARDED_BY(crit_); | 119 RateStatistics decode_fps_estimator_ GUARDED_BY(crit_); |
112 RateStatistics renders_fps_estimator_ GUARDED_BY(crit_); | 120 RateStatistics renders_fps_estimator_ GUARDED_BY(crit_); |
113 rtc::RateTracker render_fps_tracker_ GUARDED_BY(crit_); | 121 rtc::RateTracker render_fps_tracker_ GUARDED_BY(crit_); |
114 rtc::RateTracker render_pixel_tracker_ GUARDED_BY(crit_); | 122 rtc::RateTracker render_pixel_tracker_ GUARDED_BY(crit_); |
115 SampleCounter render_width_counter_ GUARDED_BY(crit_); | 123 SampleCounter render_width_counter_ GUARDED_BY(crit_); |
116 SampleCounter render_height_counter_ GUARDED_BY(crit_); | 124 SampleCounter render_height_counter_ GUARDED_BY(crit_); |
117 SampleCounter sync_offset_counter_ GUARDED_BY(crit_); | 125 SampleCounter sync_offset_counter_ GUARDED_BY(crit_); |
118 SampleCounter decode_time_counter_ GUARDED_BY(crit_); | 126 SampleCounter decode_time_counter_ GUARDED_BY(crit_); |
119 SampleCounter jitter_buffer_delay_counter_ GUARDED_BY(crit_); | 127 SampleCounter jitter_buffer_delay_counter_ GUARDED_BY(crit_); |
120 SampleCounter target_delay_counter_ GUARDED_BY(crit_); | 128 SampleCounter target_delay_counter_ GUARDED_BY(crit_); |
121 SampleCounter current_delay_counter_ GUARDED_BY(crit_); | 129 SampleCounter current_delay_counter_ GUARDED_BY(crit_); |
122 SampleCounter delay_counter_ GUARDED_BY(crit_); | 130 SampleCounter delay_counter_ GUARDED_BY(crit_); |
123 SampleCounter e2e_delay_counter_ GUARDED_BY(crit_); | 131 SampleCounter e2e_delay_counter_ GUARDED_BY(crit_); |
124 ReportBlockStats report_block_stats_ GUARDED_BY(crit_); | 132 ReportBlockStats report_block_stats_ GUARDED_BY(crit_); |
125 QpCounters qp_counters_; // Only accessed on the decoding thread. | 133 QpCounters qp_counters_; // Only accessed on the decoding thread. |
126 std::map<uint32_t, StreamDataCounters> rtx_stats_ GUARDED_BY(crit_); | 134 std::map<uint32_t, StreamDataCounters> rtx_stats_ GUARDED_BY(crit_); |
127 }; | 135 }; |
128 | 136 |
129 } // namespace webrtc | 137 } // namespace webrtc |
130 #endif // WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_ | 138 #endif // WEBRTC_VIDEO_RECEIVE_STATISTICS_PROXY_H_ |
OLD | NEW |