| Index: media/gpu/v4l2_jpeg_decode_accelerator.h
|
| diff --git a/content/common/gpu/media/v4l2_jpeg_decode_accelerator.h b/media/gpu/v4l2_jpeg_decode_accelerator.h
|
| similarity index 91%
|
| rename from content/common/gpu/media/v4l2_jpeg_decode_accelerator.h
|
| rename to media/gpu/v4l2_jpeg_decode_accelerator.h
|
| index a7e0f65d00dc88b1c949cf4f81e2fc7620fc5d70..f3090d1bbde2395fd1f90e34aa927e4405c00d9c 100644
|
| --- a/content/common/gpu/media/v4l2_jpeg_decode_accelerator.h
|
| +++ b/media/gpu/v4l2_jpeg_decode_accelerator.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_COMMON_GPU_MEDIA_V4L2_JPEG_DECODE_ACCELERATOR_H_
|
| -#define CONTENT_COMMON_GPU_MEDIA_V4L2_JPEG_DECODE_ACCELERATOR_H_
|
| +#ifndef MEDIA_GPU_V4L2_JPEG_DECODE_ACCELERATOR_H_
|
| +#define MEDIA_GPU_V4L2_JPEG_DECODE_ACCELERATOR_H_
|
|
|
| #include <stddef.h>
|
| #include <stdint.h>
|
| @@ -17,16 +17,16 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/threading/thread.h"
|
| -#include "content/common/content_export.h"
|
| -#include "content/common/gpu/media/shared_memory_region.h"
|
| -#include "content/common/gpu/media/v4l2_device.h"
|
| #include "media/base/bitstream_buffer.h"
|
| #include "media/base/video_frame.h"
|
| +#include "media/gpu/media_gpu_export.h"
|
| +#include "media/gpu/shared_memory_region.h"
|
| +#include "media/gpu/v4l2_device.h"
|
| #include "media/video/jpeg_decode_accelerator.h"
|
|
|
| -namespace content {
|
| +namespace media {
|
|
|
| -class CONTENT_EXPORT V4L2JpegDecodeAccelerator
|
| +class MEDIA_GPU_EXPORT V4L2JpegDecodeAccelerator
|
| : public media::JpegDecodeAccelerator {
|
| public:
|
| V4L2JpegDecodeAccelerator(
|
| @@ -45,8 +45,8 @@ class CONTENT_EXPORT V4L2JpegDecodeAccelerator
|
| struct BufferRecord {
|
| BufferRecord();
|
| ~BufferRecord();
|
| - void* address; // mmap() address.
|
| - size_t length; // mmap() length.
|
| + void* address; // mmap() address.
|
| + size_t length; // mmap() length.
|
|
|
| // Set true during QBUF and DQBUF. |address| will be accessed by hardware.
|
| bool at_device;
|
| @@ -177,6 +177,6 @@ class CONTENT_EXPORT V4L2JpegDecodeAccelerator
|
| DISALLOW_COPY_AND_ASSIGN(V4L2JpegDecodeAccelerator);
|
| };
|
|
|
| -} // namespace content
|
| +} // namespace media
|
|
|
| -#endif // CONTENT_COMMON_GPU_MEDIA_V4L2_JPEG_DECODE_ACCELERATOR_H_
|
| +#endif // MEDIA_GPU_V4L2_JPEG_DECODE_ACCELERATOR_H_
|
|
|