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_input_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_input_manager.cc')
| -rw-r--r-- | video_engine/vie_input_manager.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/video_engine/vie_input_manager.cc b/video_engine/vie_input_manager.cc index f7755574..964c4df8 100644 --- a/video_engine/vie_input_manager.cc +++ b/video_engine/vie_input_manager.cc @@ -26,8 +26,9 @@ namespace webrtc { -ViEInputManager::ViEInputManager(const int engine_id) - : engine_id_(engine_id), +ViEInputManager::ViEInputManager(const int engine_id, const Config& config) + : config_(config), + engine_id_(engine_id), map_cs_(CriticalSectionWrapper::CreateCriticalSection()), device_info_cs_(CriticalSectionWrapper::CreateCriticalSection()), vie_frame_provider_map_(), @@ -260,7 +261,7 @@ int ViEInputManager::CreateCaptureDevice( return kViECaptureDeviceMaxNoDevicesAllocated; } ViECapturer* vie_capture = ViECapturer::CreateViECapture( - newcapture_id, engine_id_, device_unique_idUTF8, + newcapture_id, engine_id_, config_, device_unique_idUTF8, device_unique_idUTF8Length, *module_process_thread_); if (!vie_capture) { ReturnCaptureId(newcapture_id); @@ -299,7 +300,8 @@ int ViEInputManager::CreateCaptureDevice(VideoCaptureModule* capture_module, } ViECapturer* vie_capture = ViECapturer::CreateViECapture( - newcapture_id, engine_id_, capture_module, *module_process_thread_); + newcapture_id, engine_id_, config_, + capture_module, *module_process_thread_); if (!vie_capture) { ReturnCaptureId(newcapture_id); WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideo, ViEId(engine_id_), @@ -369,7 +371,7 @@ int ViEInputManager::CreateExternalCaptureDevice( } ViECapturer* vie_capture = ViECapturer::CreateViECapture( - newcapture_id, engine_id_, NULL, 0, *module_process_thread_); + newcapture_id, engine_id_, config_, NULL, 0, *module_process_thread_); if (!vie_capture) { ReturnCaptureId(newcapture_id); WEBRTC_TRACE(webrtc::kTraceError, webrtc::kTraceVideo, ViEId(engine_id_), |