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

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

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
« no previous file with comments | « webrtc/video_engine/vie_channel.h ('k') | webrtc/video_engine/vie_channel_group.h » ('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
11 #include "webrtc/video_engine/vie_channel.h" 11 #include "webrtc/video_engine/vie_channel.h"
12 12
13 #include <algorithm> 13 #include <algorithm>
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/base/checks.h" 16 #include "webrtc/base/checks.h"
17 #include "webrtc/common.h" 17 #include "webrtc/common.h"
18 #include "webrtc/common_video/interface/incoming_video_stream.h" 18 #include "webrtc/common_video/interface/incoming_video_stream.h"
19 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" 19 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
20 #include "webrtc/experiments.h"
21 #include "webrtc/frame_callback.h" 20 #include "webrtc/frame_callback.h"
22 #include "webrtc/modules/pacing/include/paced_sender.h" 21 #include "webrtc/modules/pacing/include/paced_sender.h"
23 #include "webrtc/modules/pacing/include/packet_router.h" 22 #include "webrtc/modules/pacing/include/packet_router.h"
24 #include "webrtc/modules/rtp_rtcp/interface/rtp_receiver.h" 23 #include "webrtc/modules/rtp_rtcp/interface/rtp_receiver.h"
25 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h" 24 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
26 #include "webrtc/modules/utility/interface/process_thread.h" 25 #include "webrtc/modules/utility/interface/process_thread.h"
27 #include "webrtc/modules/video_coding/main/interface/video_coding.h" 26 #include "webrtc/modules/video_coding/main/interface/video_coding.h"
28 #include "webrtc/modules/video_processing/main/interface/video_processing.h" 27 #include "webrtc/modules/video_processing/main/interface/video_processing.h"
29 #include "webrtc/modules/video_render/include/video_render_defines.h" 28 #include "webrtc/modules/video_render/include/video_render_defines.h"
30 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" 29 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 sent_video_rate_bps, sent_nack_rate_bps, 73 sent_video_rate_bps, sent_nack_rate_bps,
75 sent_fec_rate_bps); 74 sent_fec_rate_bps);
76 } 75 }
77 private: 76 private:
78 ViEChannel* owner_; 77 ViEChannel* owner_;
79 }; 78 };
80 79
81 ViEChannel::ViEChannel(int32_t channel_id, 80 ViEChannel::ViEChannel(int32_t channel_id,
82 int32_t engine_id, 81 int32_t engine_id,
83 uint32_t number_of_cores, 82 uint32_t number_of_cores,
84 const Config& config,
85 Transport* transport, 83 Transport* transport,
86 ProcessThread* module_process_thread, 84 ProcessThread* module_process_thread,
87 RtcpIntraFrameObserver* intra_frame_observer, 85 RtcpIntraFrameObserver* intra_frame_observer,
88 RtcpBandwidthObserver* bandwidth_observer, 86 RtcpBandwidthObserver* bandwidth_observer,
89 RemoteBitrateEstimator* remote_bitrate_estimator, 87 RemoteBitrateEstimator* remote_bitrate_estimator,
90 RtcpRttStats* rtt_stats, 88 RtcpRttStats* rtt_stats,
91 PacedSender* paced_sender, 89 PacedSender* paced_sender,
92 PacketRouter* packet_router, 90 PacketRouter* packet_router,
93 size_t max_rtp_streams, 91 size_t max_rtp_streams,
94 bool sender) 92 bool sender)
(...skipping 1153 matching lines...) Expand 10 before | Expand all | Expand 10 after
1248 CriticalSectionScoped cs(crit_.get()); 1246 CriticalSectionScoped cs(crit_.get());
1249 vcm_receive_stats_callback_ = receive_statistics_proxy; 1247 vcm_receive_stats_callback_ = receive_statistics_proxy;
1250 } 1248 }
1251 1249
1252 void ViEChannel::SetIncomingVideoStream( 1250 void ViEChannel::SetIncomingVideoStream(
1253 IncomingVideoStream* incoming_video_stream) { 1251 IncomingVideoStream* incoming_video_stream) {
1254 CriticalSectionScoped cs(crit_.get()); 1252 CriticalSectionScoped cs(crit_.get());
1255 incoming_video_stream_ = incoming_video_stream; 1253 incoming_video_stream_ = incoming_video_stream;
1256 } 1254 }
1257 } // namespace webrtc 1255 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video_engine/vie_channel.h ('k') | webrtc/video_engine/vie_channel_group.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698