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

Unified Diff: content/common/gpu/media/gpu_video_decode_accelerator.cc

Issue 8897022: Revert 113895 - <video> decode in hardware! (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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
« no previous file with comments | « no previous file | content/common/gpu/media/omx_video_decode_accelerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/media/gpu_video_decode_accelerator.cc
===================================================================
--- content/common/gpu/media/gpu_video_decode_accelerator.cc (revision 113906)
+++ content/common/gpu/media/gpu_video_decode_accelerator.cc (working copy)
@@ -112,16 +112,16 @@
DCHECK(!video_decode_accelerator_.get());
DCHECK(!init_done_msg_);
DCHECK(init_done_msg);
- init_done_msg_ = init_done_msg;
#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
DCHECK(stub_ && stub_->decoder());
+ init_done_msg_ = init_done_msg;
OmxVideoDecodeAccelerator* omx_decoder = new OmxVideoDecodeAccelerator(this);
omx_decoder->SetEglState(
gfx::GLSurfaceEGL::GetHardwareDisplay(),
stub_->decoder()->GetGLContext()->GetHandle());
video_decode_accelerator_ = omx_decoder;
video_decode_accelerator_->Initialize(profile);
-#else // Update RenderViewImpl::createMediaPlayer when adding clauses.
+#else
NOTIMPLEMENTED() << "HW video decode acceleration not available.";
NotifyError(media::VideoDecodeAccelerator::PLATFORM_FAILURE);
#endif // defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
Property changes on: content/common/gpu/media/gpu_video_decode_accelerator.cc
___________________________________________________________________
Added: svn:mergeinfo
« no previous file with comments | « no previous file | content/common/gpu/media/omx_video_decode_accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698