diff options
| author | mcasas@chromium.org <mcasas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 03:58:55 +0000 |
|---|---|---|
| committer | mcasas@chromium.org <mcasas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 03:58:55 +0000 |
| commit | 8bee9c0b0949f8e32924d72af12b9252da1a8cb3 (patch) | |
| tree | 263a9b69d60e12f9b998ff35d872c7d053ebf4b7 | |
| parent | ca82b083a26fdcc6b80b8f46675784ca30e16ebf (diff) | |
| download | chromium_src-8bee9c0b0949f8e32924d72af12b9252da1a8cb3.zip chromium_src-8bee9c0b0949f8e32924d72af12b9252da1a8cb3.tar.gz chromium_src-8bee9c0b0949f8e32924d72af12b9252da1a8cb3.tar.bz2 | |
Mac AVFoundation: Reenable Finch experiment.
BUG=288562, 356106
Review URL: https://codereview.chromium.org/210983002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259462 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | media/video/capture/mac/avfoundation_glue.mm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/video/capture/mac/avfoundation_glue.mm b/media/video/capture/mac/avfoundation_glue.mm index 7373a661..6d968f3 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 { @@ -122,8 +123,10 @@ 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::kEnableAVFoundation) && [AVFoundationBundle() load]; + (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableAVFoundation) || + base::FieldTrialList::FindFullName("AVFoundationMacVideoCapture") + == "Enabled") && [AVFoundationBundle() load]; return is_av_foundation_supported; } |