diff options
| author | mcasas@chromium.org <mcasas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-09 18:39:28 +0000 |
|---|---|---|
| committer | mcasas@chromium.org <mcasas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-09 18:39:28 +0000 |
| commit | 140cc3f38bf484809401e1bccba891c53f56491d (patch) | |
| tree | e32c267032390f490aab730a1d0c08217a951138 | |
| parent | 77fc0db9c3d1385681edc1b9b5bccd26c5c5a42c (diff) | |
| download | chromium_src-140cc3f38bf484809401e1bccba891c53f56491d.zip chromium_src-140cc3f38bf484809401e1bccba891c53f56491d.tar.gz chromium_src-140cc3f38bf484809401e1bccba891c53f56491d.tar.bz2 | |
Added code for AVFoundation Finch Experiment enabling
BUG=288562, 332034
Review URL: https://codereview.chromium.org/128373002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243933 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | media/video/capture/mac/avfoundation_glue.mm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/media/video/capture/mac/avfoundation_glue.mm b/media/video/capture/mac/avfoundation_glue.mm index 1610d0f..4f7de4d 100644 --- a/media/video/capture/mac/avfoundation_glue.mm +++ b/media/video/capture/mac/avfoundation_glue.mm @@ -9,6 +9,7 @@ #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 { @@ -56,9 +57,13 @@ static NSString* ReadNSStringPtr(const char* symbol) { } // namespace media 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) && - base::mac::IsOSLionOrLater() && [AVFoundationBundle() load]; + return (cmd_line->HasSwitch(switches::kEnableAVFoundation) || + group_name == "Enabled") && [AVFoundationBundle() load]; } NSBundle const* AVFoundationGlue::AVFoundationBundle() { |