| Index: content/browser/device_monitor_mac.mm
|
| diff --git a/content/browser/device_monitor_mac.mm b/content/browser/device_monitor_mac.mm
|
| index 0e536746deda496fe666e8dd90e87a28f1bf2f8d..15f6da203338f1a277b60ffde7960781ae75aa78 100644
|
| --- a/content/browser/device_monitor_mac.mm
|
| +++ b/content/browser/device_monitor_mac.mm
|
| @@ -337,22 +337,24 @@ void AVFoundationMonitorImpl::OnDeviceChanged() {
|
| namespace content {
|
|
|
| DeviceMonitorMac::DeviceMonitorMac() {
|
| + // Both QTKit and AVFoundation do not need to be fired up until the user
|
| + // exercises a GetUserMedia. Bringing up either library and enumerating the
|
| + // devices in the system is an operation taking in the range of hundred of ms,
|
| + // so it is triggered explicitly from MediaStreamManager::StartMonitoring().
|
| +}
|
| +
|
| +DeviceMonitorMac::~DeviceMonitorMac() {}
|
| +
|
| +void DeviceMonitorMac::StartMonitoring() {
|
| if (AVFoundationGlue::IsAVFoundationSupported()) {
|
| DVLOG(1) << "Monitoring via AVFoundation";
|
| device_monitor_impl_.reset(new AVFoundationMonitorImpl(this));
|
| - // For the AVFoundation to start sending connect/disconnect notifications,
|
| - // the AVFoundation NSBundle has to be loaded and the devices enumerated.
|
| - // This operation seems to take in the range of hundred of ms. so should be
|
| - // moved to the point when is needed, and that is during
|
| - // DeviceVideoCaptureMac +getDeviceNames.
|
| } else {
|
| DVLOG(1) << "Monitoring via QTKit";
|
| device_monitor_impl_.reset(new QTKitMonitorImpl(this));
|
| }
|
| }
|
|
|
| -DeviceMonitorMac::~DeviceMonitorMac() {}
|
| -
|
| void DeviceMonitorMac::NotifyDeviceChanged(
|
| base::SystemMonitor::DeviceType type) {
|
| // TODO(xians): Remove the global variable for SystemMonitor.
|
|
|