Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 267 } | 267 } |
| 268 video_decode_accelerator_.reset(new V4L2VideoDecodeAccelerator( | 268 video_decode_accelerator_.reset(new V4L2VideoDecodeAccelerator( |
| 269 gfx::GLSurfaceEGL::GetHardwareDisplay(), | 269 gfx::GLSurfaceEGL::GetHardwareDisplay(), |
| 270 stub_->decoder()->GetGLContext()->GetHandle(), | 270 stub_->decoder()->GetGLContext()->GetHandle(), |
| 271 weak_factory_for_io_.GetWeakPtr(), | 271 weak_factory_for_io_.GetWeakPtr(), |
| 272 make_context_current_, | 272 make_context_current_, |
| 273 device.Pass(), | 273 device.Pass(), |
| 274 io_message_loop_)); | 274 io_message_loop_)); |
| 275 #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11) | 275 #elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11) |
| 276 if (gfx::GetGLImplementation() != gfx::kGLImplementationDesktopGL) { | 276 if (gfx::GetGLImplementation() != gfx::kGLImplementationDesktopGL) { |
| 277 VLOG(1) << "HW video decode acceleration not available without " | 277 DVLOG(1) << "HW video decode acceleration not available without " |
|
Pawel Osciak
2014/11/13 10:27:51
I would strongly prefer this to remain as VLOG().
anujsharma
2014/11/13 10:40:26
Done.
| |
| 278 "DesktopGL (GLX)."; | 278 "DesktopGL (GLX)."; |
| 279 SendCreateDecoderReply(init_done_msg, false); | 279 SendCreateDecoderReply(init_done_msg, false); |
| 280 return; | 280 return; |
| 281 } | 281 } |
| 282 gfx::GLContextGLX* glx_context = | 282 gfx::GLContextGLX* glx_context = |
| 283 static_cast<gfx::GLContextGLX*>(stub_->decoder()->GetGLContext()); | 283 static_cast<gfx::GLContextGLX*>(stub_->decoder()->GetGLContext()); |
| 284 video_decode_accelerator_.reset(new VaapiVideoDecodeAccelerator( | 284 video_decode_accelerator_.reset(new VaapiVideoDecodeAccelerator( |
| 285 glx_context->display(), make_context_current_)); | 285 glx_context->display(), make_context_current_)); |
| 286 #elif defined(USE_OZONE) | 286 #elif defined(USE_OZONE) |
| 287 media::MediaOzonePlatform* platform = | 287 media::MediaOzonePlatform* platform = |
| 288 media::MediaOzonePlatform::GetInstance(); | 288 media::MediaOzonePlatform::GetInstance(); |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 506 return stub_->channel()->Send(message); | 506 return stub_->channel()->Send(message); |
| 507 } | 507 } |
| 508 | 508 |
| 509 void GpuVideoDecodeAccelerator::SendCreateDecoderReply(IPC::Message* message, | 509 void GpuVideoDecodeAccelerator::SendCreateDecoderReply(IPC::Message* message, |
| 510 bool succeeded) { | 510 bool succeeded) { |
| 511 GpuCommandBufferMsg_CreateVideoDecoder::WriteReplyParams(message, succeeded); | 511 GpuCommandBufferMsg_CreateVideoDecoder::WriteReplyParams(message, succeeded); |
| 512 Send(message); | 512 Send(message); |
| 513 } | 513 } |
| 514 | 514 |
| 515 } // namespace content | 515 } // namespace content |
| OLD | NEW |