summaryrefslogtreecommitdiffstats
path: root/media/base
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-03 16:33:56 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-03 16:33:56 +0000
commitef03875e8fab7be527abe1c890d420b1fedc58f6 (patch)
treee6b00dd59a5ba859a88e3e65e38237a9ef162c6d /media/base
parent6556c953778fcd26f9b2ddd817be926cfd9ca191 (diff)
downloadchromium_src-ef03875e8fab7be527abe1c890d420b1fedc58f6.zip
chromium_src-ef03875e8fab7be527abe1c890d420b1fedc58f6.tar.gz
chromium_src-ef03875e8fab7be527abe1c890d420b1fedc58f6.tar.bz2
Revert 87790 - Removing defunct OpenMAX code.
All of this code hasn't been used in over a year and has been replaced by VideoDecodeAccelerator and it's corresponding OpenMAX implementation OmxVideoDecodeAccelerator. BUG=none TEST=the world still compiles Review URL: http://codereview.chromium.org/7066071 TBR=scherkus@chromium.org Review URL: http://codereview.chromium.org/7065060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87793 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
-rw-r--r--media/base/media_switches.cc4
-rw-r--r--media/base/media_switches.h2
2 files changed, 6 insertions, 0 deletions
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
index 54e83b5..c93727e 100644
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -19,6 +19,10 @@ 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";
+
// Set number of threads to use for video decoding.
const char kVideoThreads[] = "video-threads";
diff --git a/media/base/media_switches.h b/media/base/media_switches.h
index b84fcda..904f9bc 100644
--- a/media/base/media_switches.h
+++ b/media/base/media_switches.h
@@ -18,8 +18,10 @@ extern const char kAlsaInputDevice[];
extern const char kEnableAcceleratedDecoding[];
extern const char kEnableAdaptive[];
+extern const char kEnableOpenMax[];
extern const char kVideoThreads[];
+
} // namespace switches
#endif // MEDIA_BASE_MEDIA_SWITCHES_H_