diff options
| author | andresp@webrtc.org <andresp@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-05-13 10:50:50 +0000 |
|---|---|---|
| committer | andresp@webrtc.org <andresp@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-05-13 10:50:50 +0000 |
| commit | ac6d919eec548c708588f29923f617a17283c7e2 (patch) | |
| tree | 4151562ee8c0cf56d99e72b71d46730c32d01114 /video_engine/vie_channel_manager.cc | |
| parent | 7d6e2a00356b107f745ff84b738a6f0a94b9b9a2 (diff) | |
| download | webrtc-ac6d919eec548c708588f29923f617a17283c7e2.tar.gz | |
Wiring down config from video engine until video coding and remote bitrate estimator modules instantiation.
R=mflodman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1450008
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4007 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'video_engine/vie_channel_manager.cc')
| -rw-r--r-- | video_engine/vie_channel_manager.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/video_engine/vie_channel_manager.cc b/video_engine/vie_channel_manager.cc index 73bc87eb..874b16f8 100644 --- a/video_engine/vie_channel_manager.cc +++ b/video_engine/vie_channel_manager.cc @@ -29,7 +29,8 @@ namespace webrtc { ViEChannelManager::ViEChannelManager( int engine_id, int number_of_cores, - const OverUseDetectorOptions& options) + const OverUseDetectorOptions& options, + const Config& config) : channel_id_critsect_(CriticalSectionWrapper::CreateCriticalSection()), engine_id_(engine_id), number_of_cores_(number_of_cores), @@ -39,7 +40,8 @@ ViEChannelManager::ViEChannelManager( voice_engine_(NULL), module_process_thread_(NULL), over_use_detector_options_(options), - bwe_mode_(RemoteBitrateEstimator::kSingleStreamEstimation) { + bwe_mode_(RemoteBitrateEstimator::kSingleStreamEstimation), + config_(config) { WEBRTC_TRACE(kTraceMemory, kTraceVideo, ViEId(engine_id), "ViEChannelManager::ViEChannelManager(engine_id: %d)", engine_id); @@ -93,10 +95,12 @@ int ViEChannelManager::CreateChannel(int* channel_id) { // Create a new channel group and add this channel. ChannelGroup* group = new ChannelGroup(module_process_thread_, over_use_detector_options_, - bwe_mode_); + bwe_mode_, + config_); BitrateController* bitrate_controller = group->GetBitrateController(); ViEEncoder* vie_encoder = new ViEEncoder(engine_id_, new_channel_id, number_of_cores_, + config_, *module_process_thread_, bitrate_controller); @@ -165,6 +169,7 @@ int ViEChannelManager::CreateChannel(int* channel_id, if (sender) { // We need to create a new ViEEncoder. vie_encoder = new ViEEncoder(engine_id_, new_channel_id, number_of_cores_, + config_, *module_process_thread_, bitrate_controller); if (!(vie_encoder->Init() && @@ -423,6 +428,7 @@ bool ViEChannelManager::CreateChannelObject( ViEChannel* vie_channel = new ViEChannel(channel_id, engine_id_, number_of_cores_, + config_, *module_process_thread_, intra_frame_observer, bandwidth_observer, |