| 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 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 309 void RegisterRtcpPacketTypeCounterObserver( | 309 void RegisterRtcpPacketTypeCounterObserver( |
| 310 RtcpPacketTypeCounterObserver* observer); | 310 RtcpPacketTypeCounterObserver* observer); |
| 311 void RegisterReceiveStatisticsProxy( | 311 void RegisterReceiveStatisticsProxy( |
| 312 ReceiveStatisticsProxy* receive_statistics_proxy); | 312 ReceiveStatisticsProxy* receive_statistics_proxy); |
| 313 void SetIncomingVideoStream(IncomingVideoStream* incoming_video_stream); | 313 void SetIncomingVideoStream(IncomingVideoStream* incoming_video_stream); |
| 314 | 314 |
| 315 protected: | 315 protected: |
| 316 static bool ChannelDecodeThreadFunction(void* obj); | 316 static bool ChannelDecodeThreadFunction(void* obj); |
| 317 bool ChannelDecodeProcess(); | 317 bool ChannelDecodeProcess(); |
| 318 | 318 |
| 319 void OnRttUpdate(int64_t rtt); | 319 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms); |
| 320 | 320 |
| 321 int ProtectionRequest(const FecProtectionParams* delta_fec_params, | 321 int ProtectionRequest(const FecProtectionParams* delta_fec_params, |
| 322 const FecProtectionParams* key_fec_params, | 322 const FecProtectionParams* key_fec_params, |
| 323 uint32_t* sent_video_rate_bps, | 323 uint32_t* sent_video_rate_bps, |
| 324 uint32_t* sent_nack_rate_bps, | 324 uint32_t* sent_nack_rate_bps, |
| 325 uint32_t* sent_fec_rate_bps); | 325 uint32_t* sent_fec_rate_bps); |
| 326 | 326 |
| 327 private: | 327 private: |
| 328 static std::vector<RtpRtcp*> CreateRtpRtcpModules( | 328 static std::vector<RtpRtcp*> CreateRtpRtcpModules( |
| 329 int32_t id, | 329 int32_t id, |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 476 // Current receive codec used for codec change callback. | 476 // Current receive codec used for codec change callback. |
| 477 VideoCodec receive_codec_ GUARDED_BY(crit_); | 477 VideoCodec receive_codec_ GUARDED_BY(crit_); |
| 478 rtc::scoped_ptr<ThreadWrapper> decode_thread_; | 478 rtc::scoped_ptr<ThreadWrapper> decode_thread_; |
| 479 | 479 |
| 480 int nack_history_size_sender_; | 480 int nack_history_size_sender_; |
| 481 int max_nack_reordering_threshold_; | 481 int max_nack_reordering_threshold_; |
| 482 I420FrameCallback* pre_render_callback_ GUARDED_BY(crit_); | 482 I420FrameCallback* pre_render_callback_ GUARDED_BY(crit_); |
| 483 | 483 |
| 484 const rtc::scoped_ptr<ReportBlockStats> report_block_stats_sender_; | 484 const rtc::scoped_ptr<ReportBlockStats> report_block_stats_sender_; |
| 485 | 485 |
| 486 int64_t time_of_first_rtt_ms_ GUARDED_BY(crit_); |
| 487 int64_t rtt_sum_ms_ GUARDED_BY(crit_); |
| 488 size_t num_rtts_ GUARDED_BY(crit_); |
| 489 |
| 486 // RtpRtcp modules, declared last as they use other members on construction. | 490 // RtpRtcp modules, declared last as they use other members on construction. |
| 487 const std::vector<RtpRtcp*> rtp_rtcp_modules_; | 491 const std::vector<RtpRtcp*> rtp_rtcp_modules_; |
| 488 size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_); | 492 size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_); |
| 489 }; | 493 }; |
| 490 | 494 |
| 491 } // namespace webrtc | 495 } // namespace webrtc |
| 492 | 496 |
| 493 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_ | 497 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_ |
| OLD | NEW |