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

Side by Side Diff: content/common/gpu/media/gpu_video_decode_accelerator.cc

Issue 16430003: Remove linux x86 from HW video decode black list Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase to r263658 Created 6 years, 8 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 unified diff | Download patch
« no previous file with comments | « no previous file | content/common/gpu/media/video_decode_accelerator_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/common/gpu/media/gpu_video_decode_accelerator.h" 5 #include "content/common/gpu/media/gpu_video_decode_accelerator.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 10 matching lines...) Expand all
21 #include "media/base/limits.h" 21 #include "media/base/limits.h"
22 #include "ui/gl/gl_context.h" 22 #include "ui/gl/gl_context.h"
23 #include "ui/gl/gl_surface_egl.h" 23 #include "ui/gl/gl_surface_egl.h"
24 24
25 #if defined(OS_WIN) 25 #if defined(OS_WIN)
26 #include "base/win/windows_version.h" 26 #include "base/win/windows_version.h"
27 #include "content/common/gpu/media/dxva_video_decode_accelerator.h" 27 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
28 #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) && defined(USE_X11) 28 #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) && defined(USE_X11)
29 #include "content/common/gpu/media/v4l2_video_decode_accelerator.h" 29 #include "content/common/gpu/media/v4l2_video_decode_accelerator.h"
30 #include "content/common/gpu/media/v4l2_video_device.h" 30 #include "content/common/gpu/media/v4l2_video_device.h"
31 #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11) 31 #elif defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11)
32 #include "content/common/gpu/media/vaapi_video_decode_accelerator.h" 32 #include "content/common/gpu/media/vaapi_video_decode_accelerator.h"
33 #include "ui/gl/gl_context_glx.h" 33 #include "ui/gl/gl_context_glx.h"
34 #include "ui/gl/gl_implementation.h" 34 #include "ui/gl/gl_implementation.h"
35 #elif defined(OS_ANDROID) 35 #elif defined(OS_ANDROID)
36 #include "content/common/gpu/media/android_video_decode_accelerator.h" 36 #include "content/common/gpu/media/android_video_decode_accelerator.h"
37 #endif 37 #endif
38 38
39 #include "ui/gfx/size.h" 39 #include "ui/gfx/size.h"
40 40
41 namespace content { 41 namespace content {
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 if (!device.get()) { 257 if (!device.get()) {
258 SendCreateDecoderReply(init_done_msg, false); 258 SendCreateDecoderReply(init_done_msg, false);
259 return; 259 return;
260 } 260 }
261 video_decode_accelerator_.reset( 261 video_decode_accelerator_.reset(
262 new V4L2VideoDecodeAccelerator(gfx::GLSurfaceEGL::GetHardwareDisplay(), 262 new V4L2VideoDecodeAccelerator(gfx::GLSurfaceEGL::GetHardwareDisplay(),
263 weak_factory_for_io_.GetWeakPtr(), 263 weak_factory_for_io_.GetWeakPtr(),
264 make_context_current_, 264 make_context_current_,
265 device.Pass(), 265 device.Pass(),
266 io_message_loop_)); 266 io_message_loop_));
267 #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11) 267 #elif defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11)
268 if (gfx::GetGLImplementation() != gfx::kGLImplementationDesktopGL) { 268 if (gfx::GetGLImplementation() != gfx::kGLImplementationDesktopGL) {
269 VLOG(1) << "HW video decode acceleration not available without " 269 VLOG(1) << "HW video decode acceleration not available without "
270 "DesktopGL (GLX)."; 270 "DesktopGL (GLX).";
271 SendCreateDecoderReply(init_done_msg, false); 271 SendCreateDecoderReply(init_done_msg, false);
272 return; 272 return;
273 } 273 }
274 gfx::GLContextGLX* glx_context = 274 gfx::GLContextGLX* glx_context =
275 static_cast<gfx::GLContextGLX*>(stub_->decoder()->GetGLContext()); 275 static_cast<gfx::GLContextGLX*>(stub_->decoder()->GetGLContext());
276 video_decode_accelerator_.reset(new VaapiVideoDecodeAccelerator( 276 video_decode_accelerator_.reset(new VaapiVideoDecodeAccelerator(
277 glx_context->display(), make_context_current_)); 277 glx_context->display(), make_context_current_));
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 return stub_->channel()->Send(message); 490 return stub_->channel()->Send(message);
491 } 491 }
492 492
493 void GpuVideoDecodeAccelerator::SendCreateDecoderReply(IPC::Message* message, 493 void GpuVideoDecodeAccelerator::SendCreateDecoderReply(IPC::Message* message,
494 bool succeeded) { 494 bool succeeded) {
495 GpuCommandBufferMsg_CreateVideoDecoder::WriteReplyParams(message, succeeded); 495 GpuCommandBufferMsg_CreateVideoDecoder::WriteReplyParams(message, succeeded);
496 Send(message); 496 Send(message);
497 } 497 }
498 498
499 } // namespace content 499 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/common/gpu/media/video_decode_accelerator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698