diff options
Diffstat (limited to 'media')
-rw-r--r-- | media/base/media_switches.cc | 4 | ||||
-rw-r--r-- | media/base/media_switches.h | 2 | ||||
-rw-r--r-- | media/video/capture/mac/avfoundation_glue.mm | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc index e96e5a10..4be852d 100644 --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc @@ -41,8 +41,8 @@ const char kAlsaOutputDevice[] = "alsa-output-device"; // video capture. Being a dynamically loaded NSBundle and library, it hits the // Chrome startup time (http://crbug.com/311325 and http://crbug.com/311437); // for experimentation purposes, in particular library load time issue, the -// usage of this library can be hidden behind this flag. -const char kDisableAVFoundation[] = "disable-avfoundation"; +// usage of this library can be enabled by using this flag. +const char kEnableAVFoundation[] = "enable-avfoundation"; #endif #if defined(OS_WIN) diff --git a/media/base/media_switches.h b/media/base/media_switches.h index 27fb0aa..dd865ff 100644 --- a/media/base/media_switches.h +++ b/media/base/media_switches.h @@ -30,7 +30,7 @@ MEDIA_EXPORT extern const char kAlsaOutputDevice[]; #endif #if defined(OS_MACOSX) -MEDIA_EXPORT extern const char kDisableAVFoundation[]; +MEDIA_EXPORT extern const char kEnableAVFoundation[]; #endif #if defined(OS_WIN) diff --git a/media/video/capture/mac/avfoundation_glue.mm b/media/video/capture/mac/avfoundation_glue.mm index 706fb1e..7373a661 100644 --- a/media/video/capture/mac/avfoundation_glue.mm +++ b/media/video/capture/mac/avfoundation_glue.mm @@ -122,8 +122,8 @@ bool AVFoundationGlue::IsAVFoundationSupported() { // DeviceMonitorMac will initialize this static bool from the main UI thread // once, during Chrome startup so this construction is thread safe. static bool is_av_foundation_supported = base::mac::IsOSLionOrLater() && - !CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableAVFoundation) && [AVFoundationBundle() load]; + CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableAVFoundation) && [AVFoundationBundle() load]; return is_av_foundation_supported; } |