| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/renderer/gpu/gpu_video_service_host.h" | 5 #include "content/renderer/gpu/gpu_video_service_host.h" |
| 6 | 6 |
| 7 #include "content/common/gpu/gpu_messages.h" | 7 #include "content/common/gpu/gpu_messages.h" |
| 8 #include "content/renderer/gpu/gpu_video_decode_accelerator_host.h" | 8 #include "content/renderer/gpu/gpu_video_decode_accelerator_host.h" |
| 9 #include "content/renderer/render_thread.h" | 9 #include "content/renderer/render_thread.h" |
| 10 #include "media/video/video_decode_accelerator.h" | 10 #include "media/video/video_decode_accelerator.h" |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 DCHECK(on_initialized_.is_null()); | 65 DCHECK(on_initialized_.is_null()); |
| 66 on_initialized_ = on_initialized; | 66 on_initialized_ = on_initialized; |
| 67 channel = channel_; | 67 channel = channel_; |
| 68 } | 68 } |
| 69 if (channel) | 69 if (channel) |
| 70 on_initialized.Run(); | 70 on_initialized.Run(); |
| 71 } | 71 } |
| 72 | 72 |
| 73 GpuVideoDecodeAcceleratorHost* GpuVideoServiceHost::CreateVideoAccelerator( | 73 GpuVideoDecodeAcceleratorHost* GpuVideoServiceHost::CreateVideoAccelerator( |
| 74 media::VideoDecodeAccelerator::Client* client, | 74 media::VideoDecodeAccelerator::Client* client, |
| 75 int command_buffer_route_id) { | 75 int32 command_buffer_route_id, |
| 76 gpu::CommandBufferHelper* cmd_buffer_helper) { |
| 76 base::AutoLock auto_lock(lock_); | 77 base::AutoLock auto_lock(lock_); |
| 77 DCHECK(channel_); | 78 DCHECK(channel_); |
| 78 return new GpuVideoDecodeAcceleratorHost( | 79 return new GpuVideoDecodeAcceleratorHost( |
| 79 &router_, channel_, next_decoder_host_id_++, | 80 &router_, channel_, next_decoder_host_id_++, |
| 80 command_buffer_route_id, client); | 81 command_buffer_route_id, cmd_buffer_helper, client); |
| 81 } | 82 } |
| OLD | NEW |