Index: media/gpu/vaapi_jpeg_decode_accelerator.h |
diff --git a/content/common/gpu/media/vaapi_jpeg_decode_accelerator.h b/media/gpu/vaapi_jpeg_decode_accelerator.h |
similarity index 89% |
rename from content/common/gpu/media/vaapi_jpeg_decode_accelerator.h |
rename to media/gpu/vaapi_jpeg_decode_accelerator.h |
index 6493c42088388b784f5a30fe42b9f7d497a09601..1e94b6b3d985ccadd86edc1733648ae59c502f5b 100644 |
--- a/content/common/gpu/media/vaapi_jpeg_decode_accelerator.h |
+++ b/media/gpu/vaapi_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_VAAPI_JPEG_DECODE_ACCELERATOR_H_ |
-#define CONTENT_COMMON_GPU_MEDIA_VAAPI_JPEG_DECODE_ACCELERATOR_H_ |
+#ifndef MEDIA_GPU_VAAPI_JPEG_DECODE_ACCELERATOR_H_ |
+#define MEDIA_GPU_VAAPI_JPEG_DECODE_ACCELERATOR_H_ |
#include <stdint.h> |
@@ -14,14 +14,14 @@ |
#include "base/synchronization/lock.h" |
#include "base/threading/non_thread_safe.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/vaapi_jpeg_decoder.h" |
-#include "content/common/gpu/media/vaapi_wrapper.h" |
#include "media/base/bitstream_buffer.h" |
+#include "media/gpu/media_gpu_export.h" |
+#include "media/gpu/shared_memory_region.h" |
+#include "media/gpu/vaapi_jpeg_decoder.h" |
+#include "media/gpu/vaapi_wrapper.h" |
#include "media/video/jpeg_decode_accelerator.h" |
-namespace content { |
+namespace media { |
// Class to provide JPEG decode acceleration for Intel systems with hardware |
// support for it, and on which libva is available. |
@@ -31,7 +31,7 @@ namespace content { |
// ChildThread. A few methods on it are called on the decoder thread which is |
// stopped during |this->Destroy()|, so any tasks posted to the decoder thread |
// can assume |*this| is still alive. See |weak_this_| below for more details. |
-class CONTENT_EXPORT VaapiJpegDecodeAccelerator |
+class MEDIA_GPU_EXPORT VaapiJpegDecodeAccelerator |
: public media::JpegDecodeAccelerator { |
public: |
VaapiJpegDecodeAccelerator( |
@@ -115,6 +115,6 @@ class CONTENT_EXPORT VaapiJpegDecodeAccelerator |
DISALLOW_COPY_AND_ASSIGN(VaapiJpegDecodeAccelerator); |
}; |
-} // namespace content |
+} // namespace media |
-#endif // CONTENT_COMMON_GPU_MEDIA_VAAPI_JPEG_DECODE_ACCELERATOR_H_ |
+#endif // MEDIA_GPU_VAAPI_JPEG_DECODE_ACCELERATOR_H_ |