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 |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 }; | 129 }; |
130 struct QpCounters { | 130 struct QpCounters { |
131 SampleCounter vp8; // QP range: 0-127 | 131 SampleCounter vp8; // QP range: 0-127 |
132 SampleCounter vp9; // QP range: 0-255 | 132 SampleCounter vp9; // QP range: 0-255 |
133 }; | 133 }; |
134 void PurgeOldStats() EXCLUSIVE_LOCKS_REQUIRED(crit_); | 134 void PurgeOldStats() EXCLUSIVE_LOCKS_REQUIRED(crit_); |
135 VideoSendStream::StreamStats* GetStatsEntry(uint32_t ssrc) | 135 VideoSendStream::StreamStats* GetStatsEntry(uint32_t ssrc) |
136 EXCLUSIVE_LOCKS_REQUIRED(crit_); | 136 EXCLUSIVE_LOCKS_REQUIRED(crit_); |
137 | 137 |
138 Clock* const clock_; | 138 Clock* const clock_; |
139 const VideoSendStream::Config config_; | 139 const std::string payload_name_; |
| 140 const VideoSendStream::Config::Rtp rtp_config_; |
140 rtc::CriticalSection crit_; | 141 rtc::CriticalSection crit_; |
141 VideoEncoderConfig::ContentType content_type_ GUARDED_BY(crit_); | 142 VideoEncoderConfig::ContentType content_type_ GUARDED_BY(crit_); |
142 const int64_t start_ms_; | 143 const int64_t start_ms_; |
143 VideoSendStream::Stats stats_ GUARDED_BY(crit_); | 144 VideoSendStream::Stats stats_ GUARDED_BY(crit_); |
144 uint32_t last_sent_frame_timestamp_ GUARDED_BY(crit_); | 145 uint32_t last_sent_frame_timestamp_ GUARDED_BY(crit_); |
145 std::map<uint32_t, StatsUpdateTimes> update_times_ GUARDED_BY(crit_); | 146 std::map<uint32_t, StatsUpdateTimes> update_times_ GUARDED_BY(crit_); |
146 rtc::ExpFilter encode_time_ GUARDED_BY(crit_); | 147 rtc::ExpFilter encode_time_ GUARDED_BY(crit_); |
147 | 148 |
148 // Contains stats used for UMA histograms. These stats will be reset if | 149 // Contains stats used for UMA histograms. These stats will be reset if |
149 // content type changes between real-time video and screenshare, since these | 150 // content type changes between real-time video and screenshare, since these |
150 // will be reported separately. | 151 // will be reported separately. |
151 struct UmaSamplesContainer { | 152 struct UmaSamplesContainer { |
152 UmaSamplesContainer(const char* prefix, | 153 UmaSamplesContainer(const char* prefix, |
153 const VideoSendStream::Stats& start_stats, | 154 const VideoSendStream::Stats& start_stats, |
154 Clock* clock); | 155 Clock* clock); |
155 ~UmaSamplesContainer(); | 156 ~UmaSamplesContainer(); |
156 | 157 |
157 void UpdateHistograms(const VideoSendStream::Config& config, | 158 void UpdateHistograms(const VideoSendStream::Config::Rtp& rtp_config, |
158 const VideoSendStream::Stats& current_stats); | 159 const VideoSendStream::Stats& current_stats); |
159 | 160 |
160 const std::string uma_prefix_; | 161 const std::string uma_prefix_; |
161 Clock* const clock_; | 162 Clock* const clock_; |
162 int max_sent_width_per_timestamp_; | 163 int max_sent_width_per_timestamp_; |
163 int max_sent_height_per_timestamp_; | 164 int max_sent_height_per_timestamp_; |
164 SampleCounter input_width_counter_; | 165 SampleCounter input_width_counter_; |
165 SampleCounter input_height_counter_; | 166 SampleCounter input_height_counter_; |
166 SampleCounter sent_width_counter_; | 167 SampleCounter sent_width_counter_; |
167 SampleCounter sent_height_counter_; | 168 SampleCounter sent_height_counter_; |
(...skipping 13 matching lines...) Expand all Loading... |
181 const VideoSendStream::Stats start_stats_; | 182 const VideoSendStream::Stats start_stats_; |
182 std::map<int, QpCounters> | 183 std::map<int, QpCounters> |
183 qp_counters_; // QP counters mapped by spatial idx. | 184 qp_counters_; // QP counters mapped by spatial idx. |
184 }; | 185 }; |
185 | 186 |
186 std::unique_ptr<UmaSamplesContainer> uma_container_ GUARDED_BY(crit_); | 187 std::unique_ptr<UmaSamplesContainer> uma_container_ GUARDED_BY(crit_); |
187 }; | 188 }; |
188 | 189 |
189 } // namespace webrtc | 190 } // namespace webrtc |
190 #endif // WEBRTC_VIDEO_SEND_STATISTICS_PROXY_H_ | 191 #endif // WEBRTC_VIDEO_SEND_STATISTICS_PROXY_H_ |
OLD | NEW |