diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-03 16:33:56 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-03 16:33:56 +0000 |
| commit | ef03875e8fab7be527abe1c890d420b1fedc58f6 (patch) | |
| tree | e6b00dd59a5ba859a88e3e65e38237a9ef162c6d /content | |
| parent | 6556c953778fcd26f9b2ddd817be926cfd9ca191 (diff) | |
| download | chromium_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 'content')
| -rw-r--r-- | content/browser/renderer_host/browser_render_process_host.cc | 1 | ||||
| -rw-r--r-- | content/renderer/render_process_impl.cc | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/content/browser/renderer_host/browser_render_process_host.cc b/content/browser/renderer_host/browser_render_process_host.cc index cee52c4..a2f246f 100644 --- a/content/browser/renderer_host/browser_render_process_host.cc +++ b/content/browser/renderer_host/browser_render_process_host.cc @@ -569,6 +569,7 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer( switches::kEnableIPCFuzzing, switches::kEnableLogging, switches::kEnableNaCl, + switches::kEnableOpenMax, #if defined(ENABLE_P2P_APIS) switches::kEnableP2PApi, #endif diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc index 182285e..1ded505 100644 --- a/content/renderer/render_process_impl.cc +++ b/content/renderer/render_process_impl.cc @@ -81,6 +81,15 @@ RenderProcessImpl::RenderProcessImpl() content::GetContentClient()->renderer()->GetMediaLibraryPath(); if (!media_path.empty()) media::InitializeMediaLibrary(media_path); + +#if !defined(OS_MACOSX) + // TODO(hclam): Add more checks here. Currently this is not used. + if (media::IsMediaLibraryInitialized() && + CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableOpenMax)) { + media::InitializeOpenMaxLibrary(media_path); + } +#endif } RenderProcessImpl::~RenderProcessImpl() { |