summaryrefslogtreecommitdiffstats
path: root/media/base
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-30 20:28:50 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-30 20:28:50 +0000
commit4af58de57546a1058f575d29a9a4037172b3940b (patch)
treeaecee055c406f277175db1cf32466e0461f3b9b5 /media/base
parent6f00f7e6d4f18af869d89cf669bf95b8d21e67f0 (diff)
downloadchromium_src-4af58de57546a1058f575d29a9a4037172b3940b.zip
chromium_src-4af58de57546a1058f575d29a9a4037172b3940b.tar.gz
chromium_src-4af58de57546a1058f575d29a9a4037172b3940b.tar.bz2
Flag-enabled the experimental x-adaptive scheme with --enable-adaptive.
BUG=none TEST=none Review URL: http://codereview.chromium.org/6749045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79886 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
-rw-r--r--media/base/media_switches.cc5
-rw-r--r--media/base/media_switches.h3
2 files changed, 6 insertions, 2 deletions
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
index ee47bb3..92c7019 100644
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -16,6 +16,9 @@ const char kAlsaInputDevice[] = "alsa-input-device";
// Enable hardware decoding through gpu process.
const char kEnableAcceleratedDecoding[] = "enable-accelerated-decoding";
+// Enable x-adaptive URL scheme.
+const char kEnableAdaptive[] = "enable-adaptive";
+
// Enable hardware decoding using OpenMax API.
// In practice this is for ChromeOS ARM.
const char kEnableOpenMax[] = "enable-openmax";
diff --git a/media/base/media_switches.h b/media/base/media_switches.h
index 67aa4f1..5fb98f2 100644
--- a/media/base/media_switches.h
+++ b/media/base/media_switches.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -17,6 +17,7 @@ extern const char kAlsaInputDevice[];
#endif
extern const char kEnableAcceleratedDecoding[];
+extern const char kEnableAdaptive[];
extern const char kEnableOpenMax[];
extern const char kVideoThreads[];