| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2004 Google Inc. | 3 * Copyright 2004 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 main_thread_ = rtc::Thread::Current(); | 107 main_thread_ = rtc::Thread::Current(); |
| 108 worker_thread_ = worker_thread; | 108 worker_thread_ = worker_thread; |
| 109 // Get the default audio options from the media engine. | 109 // Get the default audio options from the media engine. |
| 110 audio_options_ = media_engine_->GetAudioOptions(); | 110 audio_options_ = media_engine_->GetAudioOptions(); |
| 111 audio_in_device_ = DeviceManagerInterface::kDefaultDeviceName; | 111 audio_in_device_ = DeviceManagerInterface::kDefaultDeviceName; |
| 112 audio_out_device_ = DeviceManagerInterface::kDefaultDeviceName; | 112 audio_out_device_ = DeviceManagerInterface::kDefaultDeviceName; |
| 113 audio_delay_offset_ = kDefaultAudioDelayOffset; | 113 audio_delay_offset_ = kDefaultAudioDelayOffset; |
| 114 audio_output_volume_ = kNotSetOutputVolume; | 114 audio_output_volume_ = kNotSetOutputVolume; |
| 115 local_renderer_ = NULL; | 115 local_renderer_ = NULL; |
| 116 capturing_ = false; | 116 capturing_ = false; |
| 117 monitoring_ = false; | |
| 118 enable_rtx_ = false; | 117 enable_rtx_ = false; |
| 119 | 118 |
| 120 // Init the device manager immediately, and set up our default video device. | 119 // Init the device manager immediately, and set up our default video device. |
| 121 SignalDevicesChange.repeat(device_manager_->SignalDevicesChange); | 120 SignalDevicesChange.repeat(device_manager_->SignalDevicesChange); |
| 122 device_manager_->Init(); | 121 device_manager_->Init(); |
| 123 | 122 |
| 124 capture_manager_->SignalCapturerStateChange.connect( | 123 capture_manager_->SignalCapturerStateChange.connect( |
| 125 this, &ChannelManager::OnVideoCaptureStateChange); | 124 this, &ChannelManager::OnVideoCaptureStateChange); |
| 126 } | 125 } |
| 127 | 126 |
| (...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 701 ret = worker_thread_->Invoke<bool>( | 700 ret = worker_thread_->Invoke<bool>( |
| 702 Bind(&MediaEngineInterface::SetDefaultVideoEncoderConfig, | 701 Bind(&MediaEngineInterface::SetDefaultVideoEncoderConfig, |
| 703 media_engine_.get(), c)); | 702 media_engine_.get(), c)); |
| 704 } | 703 } |
| 705 if (ret) { | 704 if (ret) { |
| 706 default_video_encoder_config_ = c; | 705 default_video_encoder_config_ = c; |
| 707 } | 706 } |
| 708 return ret; | 707 return ret; |
| 709 } | 708 } |
| 710 | 709 |
| 711 bool ChannelManager::SetLocalMonitor(bool enable) { | |
| 712 bool ret = initialized_ && worker_thread_->Invoke<bool>( | |
| 713 Bind(&MediaEngineInterface::SetLocalMonitor, | |
| 714 media_engine_.get(), enable)); | |
| 715 if (ret) { | |
| 716 monitoring_ = enable; | |
| 717 } | |
| 718 return ret; | |
| 719 } | |
| 720 | |
| 721 void ChannelManager::SetVoiceLogging(int level, const char* filter) { | 710 void ChannelManager::SetVoiceLogging(int level, const char* filter) { |
| 722 if (initialized_) { | 711 if (initialized_) { |
| 723 worker_thread_->Invoke<void>( | 712 worker_thread_->Invoke<void>( |
| 724 Bind(&MediaEngineInterface::SetVoiceLogging, | 713 Bind(&MediaEngineInterface::SetVoiceLogging, |
| 725 media_engine_.get(), level, filter)); | 714 media_engine_.get(), level, filter)); |
| 726 } else { | 715 } else { |
| 727 media_engine_->SetVoiceLogging(level, filter); | 716 media_engine_->SetVoiceLogging(level, filter); |
| 728 } | 717 } |
| 729 } | 718 } |
| 730 | 719 |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 905 const VideoFormat& max_format) { | 894 const VideoFormat& max_format) { |
| 906 device_manager_->SetVideoCaptureDeviceMaxFormat(usb_id, max_format); | 895 device_manager_->SetVideoCaptureDeviceMaxFormat(usb_id, max_format); |
| 907 } | 896 } |
| 908 | 897 |
| 909 bool ChannelManager::StartAecDump(rtc::PlatformFile file) { | 898 bool ChannelManager::StartAecDump(rtc::PlatformFile file) { |
| 910 return worker_thread_->Invoke<bool>( | 899 return worker_thread_->Invoke<bool>( |
| 911 Bind(&MediaEngineInterface::StartAecDump, media_engine_.get(), file)); | 900 Bind(&MediaEngineInterface::StartAecDump, media_engine_.get(), file)); |
| 912 } | 901 } |
| 913 | 902 |
| 914 } // namespace cricket | 903 } // namespace cricket |
| OLD | NEW |