| 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 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 322 FrameCounts receive_frame_counts_ GUARDED_BY(crit_); | 322 FrameCounts receive_frame_counts_ GUARDED_BY(crit_); |
| 323 IncomingVideoStream* incoming_video_stream_ GUARDED_BY(crit_); | 323 IncomingVideoStream* incoming_video_stream_ GUARDED_BY(crit_); |
| 324 RtcpIntraFrameObserver* const intra_frame_observer_; | 324 RtcpIntraFrameObserver* const intra_frame_observer_; |
| 325 RtcpRttStats* const rtt_stats_; | 325 RtcpRttStats* const rtt_stats_; |
| 326 PacedSender* const paced_sender_; | 326 PacedSender* const paced_sender_; |
| 327 PacketRouter* const packet_router_; | 327 PacketRouter* const packet_router_; |
| 328 | 328 |
| 329 const rtc::scoped_ptr<RtcpBandwidthObserver> bandwidth_observer_; | 329 const rtc::scoped_ptr<RtcpBandwidthObserver> bandwidth_observer_; |
| 330 TransportFeedbackObserver* const transport_feedback_observer_; | 330 TransportFeedbackObserver* const transport_feedback_observer_; |
| 331 | 331 |
| 332 int nack_history_size_sender_; | |
| 333 int max_nack_reordering_threshold_; | 332 int max_nack_reordering_threshold_; |
| 334 I420FrameCallback* pre_render_callback_ GUARDED_BY(crit_); | 333 I420FrameCallback* pre_render_callback_ GUARDED_BY(crit_); |
| 335 | 334 |
| 336 int64_t last_rtt_ms_ GUARDED_BY(crit_); | 335 int64_t last_rtt_ms_ GUARDED_BY(crit_); |
| 337 | 336 |
| 338 // RtpRtcp modules, declared last as they use other members on construction. | 337 // RtpRtcp modules, declared last as they use other members on construction. |
| 339 const std::vector<RtpRtcp*> rtp_rtcp_modules_; | 338 const std::vector<RtpRtcp*> rtp_rtcp_modules_; |
| 340 size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_); | 339 size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_); |
| 341 }; | 340 }; |
| 342 | 341 |
| 343 } // namespace webrtc | 342 } // namespace webrtc |
| 344 | 343 |
| 345 #endif // WEBRTC_VIDEO_VIE_CHANNEL_H_ | 344 #endif // WEBRTC_VIDEO_VIE_CHANNEL_H_ |
| OLD | NEW |