| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #ifndef CONTENT_COMMON_GPU_MEDIA_MEDIA_CHANNEL_H_ | 5 #ifndef CONTENT_COMMON_GPU_MEDIA_MEDIA_CHANNEL_H_ |
| 6 #define CONTENT_COMMON_GPU_MEDIA_MEDIA_CHANNEL_H_ | 6 #define CONTENT_COMMON_GPU_MEDIA_MEDIA_CHANNEL_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 9 |
| 8 #include "content/common/gpu/media/gpu_jpeg_decode_accelerator.h" | 10 #include "content/common/gpu/media/gpu_jpeg_decode_accelerator.h" |
| 9 #include "ipc/ipc_listener.h" | 11 #include "ipc/ipc_listener.h" |
| 10 #include "ipc/ipc_sender.h" | 12 #include "ipc/ipc_sender.h" |
| 11 #include "media/video/video_decode_accelerator.h" | 13 #include "media/video/video_decode_accelerator.h" |
| 12 | 14 |
| 13 namespace media { | 15 namespace media { |
| 14 struct CreateVideoEncoderParams; | 16 struct CreateVideoEncoderParams; |
| 15 } | 17 } |
| 16 | 18 |
| 17 namespace gpu { | 19 namespace gpu { |
| (...skipping 30 matching lines...) Expand all Loading... |
| 48 IPC::Message* reply_message); | 50 IPC::Message* reply_message); |
| 49 | 51 |
| 50 gpu::GpuChannel* const channel_; | 52 gpu::GpuChannel* const channel_; |
| 51 std::unique_ptr<GpuJpegDecodeAccelerator> jpeg_decoder_; | 53 std::unique_ptr<GpuJpegDecodeAccelerator> jpeg_decoder_; |
| 52 DISALLOW_COPY_AND_ASSIGN(MediaChannel); | 54 DISALLOW_COPY_AND_ASSIGN(MediaChannel); |
| 53 }; | 55 }; |
| 54 | 56 |
| 55 } // namespace content | 57 } // namespace content |
| 56 | 58 |
| 57 #endif // CONTENT_COMMON_GPU_MEDIA_MEDIA_CHANNEL_H_ | 59 #endif // CONTENT_COMMON_GPU_MEDIA_MEDIA_CHANNEL_H_ |
| OLD | NEW |