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

Side by Side Diff: webrtc/video_engine/vie_channel_group.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
« no previous file with comments | « webrtc/video_engine/vie_channel.cc ('k') | webrtc/video_engine/vie_channel_group.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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 rtc::scoped_ptr<CallStats> call_stats_; 88 rtc::scoped_ptr<CallStats> call_stats_;
89 rtc::scoped_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_; 89 rtc::scoped_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_;
90 rtc::scoped_ptr<EncoderStateFeedback> encoder_state_feedback_; 90 rtc::scoped_ptr<EncoderStateFeedback> encoder_state_feedback_;
91 rtc::scoped_ptr<PacketRouter> packet_router_; 91 rtc::scoped_ptr<PacketRouter> packet_router_;
92 rtc::scoped_ptr<PacedSender> pacer_; 92 rtc::scoped_ptr<PacedSender> pacer_;
93 ChannelMap channel_map_; 93 ChannelMap channel_map_;
94 // Maps Channel id -> ViEEncoder. 94 // Maps Channel id -> ViEEncoder.
95 mutable rtc::CriticalSection encoder_map_crit_; 95 mutable rtc::CriticalSection encoder_map_crit_;
96 EncoderMap vie_encoder_map_ GUARDED_BY(encoder_map_crit_); 96 EncoderMap vie_encoder_map_ GUARDED_BY(encoder_map_crit_);
97 97
98 const rtc::scoped_ptr<Config> config_;
99
100 // Registered at construct time and assumed to outlive this class. 98 // Registered at construct time and assumed to outlive this class.
101 ProcessThread* process_thread_; 99 ProcessThread* process_thread_;
102 rtc::scoped_ptr<ProcessThread> pacer_thread_; 100 rtc::scoped_ptr<ProcessThread> pacer_thread_;
103 101
104 rtc::scoped_ptr<BitrateController> bitrate_controller_; 102 rtc::scoped_ptr<BitrateController> bitrate_controller_;
105 }; 103 };
106 104
107 } // namespace webrtc 105 } // namespace webrtc
108 106
109 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_ 107 #endif // WEBRTC_VIDEO_ENGINE_VIE_CHANNEL_GROUP_H_
OLDNEW
« no previous file with comments | « webrtc/video_engine/vie_channel.cc ('k') | webrtc/video_engine/vie_channel_group.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698