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 |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 163 Clock* const clock_; | 163 Clock* const clock_; |
| 164 const std::string payload_name_; | 164 const std::string payload_name_; |
| 165 const VideoSendStream::Config::Rtp rtp_config_; | 165 const VideoSendStream::Config::Rtp rtp_config_; |
| 166 rtc::CriticalSection crit_; | 166 rtc::CriticalSection crit_; |
| 167 VideoEncoderConfig::ContentType content_type_ GUARDED_BY(crit_); | 167 VideoEncoderConfig::ContentType content_type_ GUARDED_BY(crit_); |
| 168 const int64_t start_ms_; | 168 const int64_t start_ms_; |
| 169 VideoSendStream::Stats stats_ GUARDED_BY(crit_); | 169 VideoSendStream::Stats stats_ GUARDED_BY(crit_); |
| 170 uint32_t last_sent_frame_timestamp_ GUARDED_BY(crit_); | 170 uint32_t last_sent_frame_timestamp_ GUARDED_BY(crit_); |
| 171 std::map<uint32_t, StatsUpdateTimes> update_times_ GUARDED_BY(crit_); | 171 std::map<uint32_t, StatsUpdateTimes> update_times_ GUARDED_BY(crit_); |
| 172 rtc::ExpFilter encode_time_ GUARDED_BY(crit_); | 172 rtc::ExpFilter encode_time_ GUARDED_BY(crit_); |
| 173 int quality_downscales_ GUARDED_BY(crit_) = 0; | 173 int quality_downscales_ GUARDED_BY(crit_) = -1; |
|
brandtr
2017/04/07 06:42:02
No other members are initialized here, so probably
åsapersson
2017/04/07 07:13:33
Done.
| |
| 174 int cpu_downscales_ GUARDED_BY(crit_) = -1; | |
| 174 | 175 |
| 175 // Contains stats used for UMA histograms. These stats will be reset if | 176 // Contains stats used for UMA histograms. These stats will be reset if |
| 176 // content type changes between real-time video and screenshare, since these | 177 // content type changes between real-time video and screenshare, since these |
| 177 // will be reported separately. | 178 // will be reported separately. |
| 178 struct UmaSamplesContainer { | 179 struct UmaSamplesContainer { |
| 179 UmaSamplesContainer(const char* prefix, | 180 UmaSamplesContainer(const char* prefix, |
| 180 const VideoSendStream::Stats& start_stats, | 181 const VideoSendStream::Stats& start_stats, |
| 181 Clock* clock); | 182 Clock* clock); |
| 182 ~UmaSamplesContainer(); | 183 ~UmaSamplesContainer(); |
| 183 | 184 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 223 | 224 |
| 224 std::map<int, QpCounters> | 225 std::map<int, QpCounters> |
| 225 qp_counters_; // QP counters mapped by spatial idx. | 226 qp_counters_; // QP counters mapped by spatial idx. |
| 226 }; | 227 }; |
| 227 | 228 |
| 228 std::unique_ptr<UmaSamplesContainer> uma_container_ GUARDED_BY(crit_); | 229 std::unique_ptr<UmaSamplesContainer> uma_container_ GUARDED_BY(crit_); |
| 229 }; | 230 }; |
| 230 | 231 |
| 231 } // namespace webrtc | 232 } // namespace webrtc |
| 232 #endif // WEBRTC_VIDEO_SEND_STATISTICS_PROXY_H_ | 233 #endif // WEBRTC_VIDEO_SEND_STATISTICS_PROXY_H_ |
| OLD | NEW |