| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 bool nack_enabled_ ACCESS_ON(&encoder_queue_); | 204 bool nack_enabled_ ACCESS_ON(&encoder_queue_); |
| 205 uint32_t last_observed_bitrate_bps_ ACCESS_ON(&encoder_queue_); | 205 uint32_t last_observed_bitrate_bps_ ACCESS_ON(&encoder_queue_); |
| 206 bool encoder_paused_and_dropped_frame_ ACCESS_ON(&encoder_queue_); | 206 bool encoder_paused_and_dropped_frame_ ACCESS_ON(&encoder_queue_); |
| 207 bool has_received_sli_ ACCESS_ON(&encoder_queue_); | 207 bool has_received_sli_ ACCESS_ON(&encoder_queue_); |
| 208 uint8_t picture_id_sli_ ACCESS_ON(&encoder_queue_); | 208 uint8_t picture_id_sli_ ACCESS_ON(&encoder_queue_); |
| 209 bool has_received_rpsi_ ACCESS_ON(&encoder_queue_); | 209 bool has_received_rpsi_ ACCESS_ON(&encoder_queue_); |
| 210 uint64_t picture_id_rpsi_ ACCESS_ON(&encoder_queue_); | 210 uint64_t picture_id_rpsi_ ACCESS_ON(&encoder_queue_); |
| 211 Clock* const clock_; | 211 Clock* const clock_; |
| 212 // Counters used for deciding if the video resolution is currently | 212 // Counters used for deciding if the video resolution is currently |
| 213 // restricted, and if so, why. | 213 // restricted, and if so, why. |
| 214 int scale_counter_[kScaleReasonSize] ACCESS_ON(&encoder_queue_) = {0}; | 214 std::vector<int> scale_counter_ ACCESS_ON(&encoder_queue_); |
| 215 // Set depending on degradation preferences | 215 // Set depending on degradation preferences |
| 216 bool scaling_enabled_ ACCESS_ON(&encoder_queue_) = false; | 216 bool scaling_enabled_ ACCESS_ON(&encoder_queue_) = false; |
| 217 | 217 |
| 218 int last_frame_width_ ACCESS_ON(&encoder_queue_); | 218 int last_frame_width_ ACCESS_ON(&encoder_queue_); |
| 219 int last_frame_height_ ACCESS_ON(&encoder_queue_); | 219 int last_frame_height_ ACCESS_ON(&encoder_queue_); |
| 220 // Pixel count last time the resolution was requested to be changed down. | 220 // Pixel count last time the resolution was requested to be changed down. |
| 221 rtc::Optional<int> max_pixel_count_ ACCESS_ON(&encoder_queue_); | 221 rtc::Optional<int> max_pixel_count_ ACCESS_ON(&encoder_queue_); |
| 222 // Pixel count last time the resolution was requested to be changed up. | 222 // Pixel count last time the resolution was requested to be changed up. |
| 223 rtc::Optional<int> max_pixel_count_step_up_ ACCESS_ON(&encoder_queue_); | 223 rtc::Optional<int> max_pixel_count_step_up_ ACCESS_ON(&encoder_queue_); |
| 224 | 224 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 239 // All public methods are proxied to |encoder_queue_|. It must must be | 239 // All public methods are proxied to |encoder_queue_|. It must must be |
| 240 // destroyed first to make sure no tasks are run that use other members. | 240 // destroyed first to make sure no tasks are run that use other members. |
| 241 rtc::TaskQueue encoder_queue_; | 241 rtc::TaskQueue encoder_queue_; |
| 242 | 242 |
| 243 RTC_DISALLOW_COPY_AND_ASSIGN(ViEEncoder); | 243 RTC_DISALLOW_COPY_AND_ASSIGN(ViEEncoder); |
| 244 }; | 244 }; |
| 245 | 245 |
| 246 } // namespace webrtc | 246 } // namespace webrtc |
| 247 | 247 |
| 248 #endif // WEBRTC_VIDEO_VIE_ENCODER_H_ | 248 #endif // WEBRTC_VIDEO_VIE_ENCODER_H_ |
| OLD | NEW |