diff options
| author | mcasas@chromium.org <mcasas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 13:49:41 +0000 |
|---|---|---|
| committer | mcasas@chromium.org <mcasas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-12 13:49:41 +0000 |
| commit | 380bbe2fea6ed46ef68cb168da1a0e7b1788528d (patch) | |
| tree | b160ee5a6dcaa996b6ec20bb831322a8d8a0d59b /media | |
| parent | 68fe60ff51e006b604f2884e76ea5d91861b30d7 (diff) | |
| download | chromium_src-380bbe2fea6ed46ef68cb168da1a0e7b1788528d.zip chromium_src-380bbe2fea6ed46ef68cb168da1a0e7b1788528d.tar.gz chromium_src-380bbe2fea6ed46ef68cb168da1a0e7b1788528d.tar.bz2 | |
Remove Mac AVFoundation experiment and enable AVFoundation by default.
This CL removes the code introduced to support a Chrome
Finch experiment, in the CL [1]. It also enables
AVFoundation by default, flipping the media switch
--enable-avfoundation with --disable-avfoundation.
[1] https://codereview.chromium.org/128373002/
BUG=158170,309554
Review URL: https://codereview.chromium.org/144473006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/media_switches.cc | 6 | ||||
| -rw-r--r-- | media/base/media_switches.h | 2 | ||||
| -rw-r--r-- | media/video/capture/mac/avfoundation_glue.mm | 9 |
3 files changed, 6 insertions, 11 deletions
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc index 3ffba47..9ea08a1 100644 --- a/media/base/media_switches.cc +++ b/media/base/media_switches.cc @@ -48,9 +48,9 @@ const char kDisableMainThreadAudio[] = "disable-main-thread-audio"; // 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 is hidden behind this flag. -const char kEnableAVFoundation[] = "enable-avfoundation"; +// 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"; #endif #if defined(OS_WIN) diff --git a/media/base/media_switches.h b/media/base/media_switches.h index 68fafe5..56db618 100644 --- a/media/base/media_switches.h +++ b/media/base/media_switches.h @@ -34,7 +34,7 @@ MEDIA_EXPORT extern const char kAlsaOutputDevice[]; #if defined(OS_MACOSX) MEDIA_EXPORT extern const char kDisableMainThreadAudio[]; -MEDIA_EXPORT extern const char kEnableAVFoundation[]; +MEDIA_EXPORT extern const char kDisableAVFoundation[]; #endif #if defined(OS_WIN) diff --git a/media/video/capture/mac/avfoundation_glue.mm b/media/video/capture/mac/avfoundation_glue.mm index 11fddd7..1ba764b 100644 --- a/media/video/capture/mac/avfoundation_glue.mm +++ b/media/video/capture/mac/avfoundation_glue.mm @@ -9,7 +9,6 @@ #include "base/command_line.h" #include "base/lazy_instance.h" #include "base/mac/mac_util.h" -#include "base/metrics/field_trial.h" #include "media/base/media_switches.h" namespace { @@ -120,13 +119,9 @@ static base::LazyInstance<AVFoundationInternal> g_avfoundation_handle = LAZY_INSTANCE_INITIALIZER; bool AVFoundationGlue::IsAVFoundationSupported() { - if (!base::mac::IsOSLionOrLater()) - return false; - const std::string group_name = - base::FieldTrialList::FindFullName("AVFoundationMacVideoCapture"); const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); - return (cmd_line->HasSwitch(switches::kEnableAVFoundation) || - group_name == "Enabled") && [AVFoundationBundle() load]; + return (!cmd_line->HasSwitch(switches::kDisableAVFoundation) && + base::mac::IsOSLionOrLater() && [AVFoundationBundle() load]); } NSBundle const* AVFoundationGlue::AVFoundationBundle() { |