Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Unified Diff: content/common/gpu/gpu_video_service.cc

Issue 6979017: Revert 86681 - Updated OMX decoder for recent PPAPI changes, and added to the build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/gpu_video_service.cc
===================================================================
--- content/common/gpu/gpu_video_service.cc (revision 86686)
+++ content/common/gpu/gpu_video_service.cc (working copy)
@@ -8,10 +8,6 @@
#include "content/common/gpu/gpu_messages.h"
#include "content/common/gpu/gpu_video_decode_accelerator.h"
-#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
-#include "content/common/gpu/omx_video_decode_accelerator.h"
-#endif // defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
-
GpuVideoService::GpuVideoService() {
// TODO(jiesun): move this time consuming stuff out of here.
IntializeGpuVideoService();
@@ -61,10 +57,6 @@
// Create GpuVideoDecodeAccelerator and add to map.
scoped_refptr<GpuVideoDecodeAccelerator> decoder =
new GpuVideoDecodeAccelerator(channel, decoder_host_id);
-#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
- decoder->set_video_decode_accelerator(
- new OmxVideoDecodeAccelerator(decoder, MessageLoop::current()));
-#endif // defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
bool result = decoder_map_.insert(std::make_pair(decoder_id, decoder)).second;
« no previous file with comments | « content/common/gpu/gpu_video_decode_accelerator.cc ('k') | content/common/gpu/omx_video_decode_accelerator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698