Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Side by Side Diff: webrtc/video_engine/vie_channel.h

Issue 1329083005: Add TransportFeedback adapter, adapting remote feedback to bwe estiamtor (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Bad merge, test issue Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 friend class ChannelStatsObserver; 65 friend class ChannelStatsObserver;
66 friend class ViEChannelProtectionCallback; 66 friend class ViEChannelProtectionCallback;
67 67
68 ViEChannel(int32_t channel_id, 68 ViEChannel(int32_t channel_id,
69 int32_t engine_id, 69 int32_t engine_id,
70 uint32_t number_of_cores, 70 uint32_t number_of_cores,
71 Transport* transport, 71 Transport* transport,
72 ProcessThread* module_process_thread, 72 ProcessThread* module_process_thread,
73 RtcpIntraFrameObserver* intra_frame_observer, 73 RtcpIntraFrameObserver* intra_frame_observer,
74 RtcpBandwidthObserver* bandwidth_observer, 74 RtcpBandwidthObserver* bandwidth_observer,
75 SendTimeObserver* send_time_observer, 75 TransportFeedbackObserver* transport_feedback_observer,
76 RemoteBitrateEstimator* remote_bitrate_estimator, 76 RemoteBitrateEstimator* remote_bitrate_estimator,
77 RtcpRttStats* rtt_stats, 77 RtcpRttStats* rtt_stats,
78 PacedSender* paced_sender, 78 PacedSender* paced_sender,
79 PacketRouter* packet_router, 79 PacketRouter* packet_router,
80 size_t max_rtp_streams, 80 size_t max_rtp_streams,
81 bool sender); 81 bool sender);
82 ~ViEChannel(); 82 ~ViEChannel();
83 83
84 int32_t Init(); 84 int32_t Init();
85 85
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 uint32_t* sent_fec_rate_bps); 295 uint32_t* sent_fec_rate_bps);
296 296
297 private: 297 private:
298 static std::vector<RtpRtcp*> CreateRtpRtcpModules( 298 static std::vector<RtpRtcp*> CreateRtpRtcpModules(
299 int32_t id, 299 int32_t id,
300 bool receiver_only, 300 bool receiver_only,
301 ReceiveStatistics* receive_statistics, 301 ReceiveStatistics* receive_statistics,
302 Transport* outgoing_transport, 302 Transport* outgoing_transport,
303 RtcpIntraFrameObserver* intra_frame_callback, 303 RtcpIntraFrameObserver* intra_frame_callback,
304 RtcpBandwidthObserver* bandwidth_callback, 304 RtcpBandwidthObserver* bandwidth_callback,
305 SendTimeObserver* send_time_observer, 305 TransportFeedbackObserver* transport_feedback_callback,
306 RtcpRttStats* rtt_stats, 306 RtcpRttStats* rtt_stats,
307 RtcpPacketTypeCounterObserver* rtcp_packet_type_counter_observer, 307 RtcpPacketTypeCounterObserver* rtcp_packet_type_counter_observer,
308 RemoteBitrateEstimator* remote_bitrate_estimator, 308 RemoteBitrateEstimator* remote_bitrate_estimator,
309 PacedSender* paced_sender, 309 PacedSender* paced_sender,
310 PacketRouter* packet_router, 310 PacketRouter* packet_router,
311 BitrateStatisticsObserver* send_bitrate_observer, 311 BitrateStatisticsObserver* send_bitrate_observer,
312 FrameCountObserver* send_frame_count_observer, 312 FrameCountObserver* send_frame_count_observer,
313 SendSideDelayObserver* send_side_delay_observer, 313 SendSideDelayObserver* send_side_delay_observer,
314 size_t num_modules); 314 size_t num_modules);
315 315
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 // Not owned. 434 // Not owned.
435 ReceiveStatisticsProxy* receive_stats_callback_ GUARDED_BY(crit_); 435 ReceiveStatisticsProxy* receive_stats_callback_ GUARDED_BY(crit_);
436 FrameCounts receive_frame_counts_ GUARDED_BY(crit_); 436 FrameCounts receive_frame_counts_ GUARDED_BY(crit_);
437 IncomingVideoStream* incoming_video_stream_ GUARDED_BY(crit_); 437 IncomingVideoStream* incoming_video_stream_ GUARDED_BY(crit_);
438 RtcpIntraFrameObserver* const intra_frame_observer_; 438 RtcpIntraFrameObserver* const intra_frame_observer_;
439 RtcpRttStats* const rtt_stats_; 439 RtcpRttStats* const rtt_stats_;
440 PacedSender* const paced_sender_; 440 PacedSender* const paced_sender_;
441 PacketRouter* const packet_router_; 441 PacketRouter* const packet_router_;
442 442
443 const rtc::scoped_ptr<RtcpBandwidthObserver> bandwidth_observer_; 443 const rtc::scoped_ptr<RtcpBandwidthObserver> bandwidth_observer_;
444 SendTimeObserver* const send_time_observer_; 444 TransportFeedbackObserver* const transport_feedback_observer_;
445 445
446 rtc::scoped_ptr<ThreadWrapper> decode_thread_; 446 rtc::scoped_ptr<ThreadWrapper> decode_thread_;
447 447
448 int nack_history_size_sender_; 448 int nack_history_size_sender_;
449 int max_nack_reordering_threshold_; 449 int max_nack_reordering_threshold_;
450 I420FrameCallback* pre_render_callback_ GUARDED_BY(crit_); 450 I420FrameCallback* pre_render_callback_ GUARDED_BY(crit_);
451 451
452 const rtc::scoped_ptr<ReportBlockStats> report_block_stats_sender_; 452 const rtc::scoped_ptr<ReportBlockStats> report_block_stats_sender_;
453 453
454 int64_t time_of_first_rtt_ms_ GUARDED_BY(crit_); 454 int64_t time_of_first_rtt_ms_ GUARDED_BY(crit_);
455 int64_t rtt_sum_ms_ GUARDED_BY(crit_); 455 int64_t rtt_sum_ms_ GUARDED_BY(crit_);
456 size_t num_rtts_ GUARDED_BY(crit_); 456 size_t num_rtts_ GUARDED_BY(crit_);
457 457
458 // RtpRtcp modules, declared last as they use other members on construction. 458 // RtpRtcp modules, declared last as they use other members on construction.
459 const std::vector<RtpRtcp*> rtp_rtcp_modules_; 459 const std::vector<RtpRtcp*> rtp_rtcp_modules_;
460 size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_); 460 size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_);
461 }; 461 };
462 462
463 } // namespace webrtc 463 } // namespace webrtc
464 464
465 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_ 465 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698