summaryrefslogtreecommitdiffstats
path: root/content/browser/ppapi_plugin_process_host.cc
diff options
context:
space:
mode:
authorihf@chromium.org <ihf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-22 23:35:38 +0000
committerihf@chromium.org <ihf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-22 23:35:38 +0000
commit791bc42c0ba6d8e4cce3ef29bf073d5f7419a1c8 (patch)
tree51a1c0c19892a72111ef99f6ea2a4dc9c01db5f6 /content/browser/ppapi_plugin_process_host.cc
parent09a81cdfad04d174b324020e63b89e4da4bb7820 (diff)
downloadchromium_src-791bc42c0ba6d8e4cce3ef29bf073d5f7419a1c8.zip
chromium_src-791bc42c0ba6d8e4cce3ef29bf073d5f7419a1c8.tar.gz
chromium_src-791bc42c0ba6d8e4cce3ef29bf073d5f7419a1c8.tar.bz2
Add Windows Flash hw video decode trial.
This is to support the Windows rollout of the feature. The distribution on different channels will be controlled from the server. Initially we will target 100% on canary/dev, 50% on beta and starting slowly (say from 1%) on stable but this will be gradual and is subject to approval. Also remove low latency audio trail which has expired a long time ago. (It also is hard wired to enabled in all Flash binaries.) BUG=chromium:335836 TEST=Verified Flash flags are properly passed on Link. Review URL: https://codereview.chromium.org/141753006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/ppapi_plugin_process_host.cc')
-rw-r--r--content/browser/ppapi_plugin_process_host.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc
index 7e17d46..953f84c 100644
--- a/content/browser/ppapi_plugin_process_host.cc
+++ b/content/browser/ppapi_plugin_process_host.cc
@@ -307,11 +307,15 @@ bool PpapiPluginProcessHost::Init(const PepperPluginInfo& info) {
// TODO(vtl): Stop passing flash args in the command line, or windows is
// going to explode.
std::string field_trial =
- base::FieldTrialList::FindFullName(kLowLatencyFlashAudioFieldTrialName);
+ base::FieldTrialList::FindFullName(kFlashHwVideoDecodeFieldTrialName);
std::string existing_args =
browser_command_line.GetSwitchValueASCII(switches::kPpapiFlashArgs);
- if (field_trial == kLowLatencyFlashAudioFieldTrialEnabledName)
- existing_args.append(" enable_low_latency_audio=1");
+ if (field_trial == kFlashHwVideoDecodeFieldTrialEnabledName) {
+ // Arguments passed to Flash are comma delimited.
+ if (!existing_args.empty())
+ existing_args.append(",");
+ existing_args.append("enable_hw_video_decode=1");
+ }
cmd_line->AppendSwitchASCII(switches::kPpapiFlashArgs, existing_args);
}