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

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

Issue 1250513006: Remove webrtc::Config from ViEChannelGroup. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: remove experiment.h from build files Created 5 years, 5 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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 public VCMDecoderTimingCallback, 92 public VCMDecoderTimingCallback,
93 public VCMPacketRequestCallback, 93 public VCMPacketRequestCallback,
94 public RtpFeedback { 94 public RtpFeedback {
95 public: 95 public:
96 friend class ChannelStatsObserver; 96 friend class ChannelStatsObserver;
97 friend class ViEChannelProtectionCallback; 97 friend class ViEChannelProtectionCallback;
98 98
99 ViEChannel(int32_t channel_id, 99 ViEChannel(int32_t channel_id,
100 int32_t engine_id, 100 int32_t engine_id,
101 uint32_t number_of_cores, 101 uint32_t number_of_cores,
102 const Config& config,
103 Transport* transport, 102 Transport* transport,
104 ProcessThread* module_process_thread, 103 ProcessThread* module_process_thread,
105 RtcpIntraFrameObserver* intra_frame_observer, 104 RtcpIntraFrameObserver* intra_frame_observer,
106 RtcpBandwidthObserver* bandwidth_observer, 105 RtcpBandwidthObserver* bandwidth_observer,
107 RemoteBitrateEstimator* remote_bitrate_estimator, 106 RemoteBitrateEstimator* remote_bitrate_estimator,
108 RtcpRttStats* rtt_stats, 107 RtcpRttStats* rtt_stats,
109 PacedSender* paced_sender, 108 PacedSender* paced_sender,
110 PacketRouter* packet_router, 109 PacketRouter* packet_router,
111 size_t max_rtp_streams, 110 size_t max_rtp_streams,
112 bool sender); 111 bool sender);
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 const rtc::scoped_ptr<ReportBlockStats> report_block_stats_sender_; 483 const rtc::scoped_ptr<ReportBlockStats> report_block_stats_sender_;
485 484
486 // RtpRtcp modules, declared last as they use other members on construction. 485 // RtpRtcp modules, declared last as they use other members on construction.
487 const std::vector<RtpRtcp*> rtp_rtcp_modules_; 486 const std::vector<RtpRtcp*> rtp_rtcp_modules_;
488 size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_); 487 size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_);
489 }; 488 };
490 489
491 } // namespace webrtc 490 } // namespace webrtc
492 491
493 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_ 492 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/video_engine/encoder_state_feedback_unittest.cc ('k') | webrtc/video_engine/vie_channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698