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

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

Issue 1350163005: Avoid circular dependency rtp_rtcp <-> paced_sender (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase 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
« no previous file with comments | « webrtc/video/webrtc_video.gypi ('k') | webrtc/video_engine/vie_channel.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 static std::vector<RtpRtcp*> CreateRtpRtcpModules( 291 static std::vector<RtpRtcp*> CreateRtpRtcpModules(
292 bool receiver_only, 292 bool receiver_only,
293 ReceiveStatistics* receive_statistics, 293 ReceiveStatistics* receive_statistics,
294 Transport* outgoing_transport, 294 Transport* outgoing_transport,
295 RtcpIntraFrameObserver* intra_frame_callback, 295 RtcpIntraFrameObserver* intra_frame_callback,
296 RtcpBandwidthObserver* bandwidth_callback, 296 RtcpBandwidthObserver* bandwidth_callback,
297 TransportFeedbackObserver* transport_feedback_callback, 297 TransportFeedbackObserver* transport_feedback_callback,
298 RtcpRttStats* rtt_stats, 298 RtcpRttStats* rtt_stats,
299 RtcpPacketTypeCounterObserver* rtcp_packet_type_counter_observer, 299 RtcpPacketTypeCounterObserver* rtcp_packet_type_counter_observer,
300 RemoteBitrateEstimator* remote_bitrate_estimator, 300 RemoteBitrateEstimator* remote_bitrate_estimator,
301 PacedSender* paced_sender, 301 RtpPacketSender* paced_sender,
302 PacketRouter* packet_router, 302 TransportSequenceNumberAllocator* transport_sequence_number_allocator,
303 BitrateStatisticsObserver* send_bitrate_observer, 303 BitrateStatisticsObserver* send_bitrate_observer,
304 FrameCountObserver* send_frame_count_observer, 304 FrameCountObserver* send_frame_count_observer,
305 SendSideDelayObserver* send_side_delay_observer, 305 SendSideDelayObserver* send_side_delay_observer,
306 size_t num_modules); 306 size_t num_modules);
307 307
308 // Assumed to be protected. 308 // Assumed to be protected.
309 void StartDecodeThread(); 309 void StartDecodeThread();
310 void StopDecodeThread(); 310 void StopDecodeThread();
311 311
312 void ProcessNACKRequest(const bool enable); 312 void ProcessNACKRequest(const bool enable);
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 size_t num_rtts_ GUARDED_BY(crit_); 446 size_t num_rtts_ GUARDED_BY(crit_);
447 447
448 // RtpRtcp modules, declared last as they use other members on construction. 448 // RtpRtcp modules, declared last as they use other members on construction.
449 const std::vector<RtpRtcp*> rtp_rtcp_modules_; 449 const std::vector<RtpRtcp*> rtp_rtcp_modules_;
450 size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_); 450 size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_);
451 }; 451 };
452 452
453 } // namespace webrtc 453 } // namespace webrtc
454 454
455 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_ 455 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/video/webrtc_video.gypi ('k') | webrtc/video_engine/vie_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698