diff options
| -rw-r--r-- | media/base/media_switches.cc | 5 | ||||
| -rw-r--r-- | media/base/media_switches.h | 2 | ||||
| -rw-r--r-- | media/video/capture/mac/avfoundation_glue.mm | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc index 88113e6..3a8fb33 100644 --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc @@ -56,14 +56,13 @@ const char kAlsaOutputDevice[] = "alsa-output-device"; // tested. See http://crbug.com/158170. // TODO(dalecurtis): Remove this once we're sure nothing has exploded. const char kDisableMainThreadAudio[] = "disable-main-thread-audio"; - // AVFoundation is available in versions 10.7 and onwards, and is to be used // http://crbug.com/288562 for both audio and video device monitoring and for // video capture. Being a dynamically loaded NSBundle and library, it hits the // Chrome startup time (http://crbug.com/311325 and http://crbug.com/311437); // until development is finished and the library load time issue is solved, the -// usage of this library can be disabled by using this flag. -const char kDisableAVFoundation[] = "disable-avfoundation"; +// usage of this library is hidden behind 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 70381f5..0c7fa24 100644 --- a/media/base/media_switches.h +++ b/media/base/media_switches.h @@ -40,7 +40,7 @@ MEDIA_EXPORT extern const char kAlsaOutputDevice[]; #if defined(OS_MACOSX) MEDIA_EXPORT extern const char kDisableMainThreadAudio[]; -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 12d4ad5..1610d0f 100644 --- a/media/video/capture/mac/avfoundation_glue.mm +++ b/media/video/capture/mac/avfoundation_glue.mm @@ -57,7 +57,7 @@ static NSString* ReadNSStringPtr(const char* symbol) { bool AVFoundationGlue::IsAVFoundationSupported() { const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); - return !cmd_line->HasSwitch(switches::kDisableAVFoundation) && + return cmd_line->HasSwitch(switches::kEnableAVFoundation) && base::mac::IsOSLionOrLater() && [AVFoundationBundle() load]; } |