Index: media/gpu/v4l2_video_encode_accelerator.h |
diff --git a/content/common/gpu/media/v4l2_video_encode_accelerator.h b/media/gpu/v4l2_video_encode_accelerator.h |
similarity index 94% |
rename from content/common/gpu/media/v4l2_video_encode_accelerator.h |
rename to media/gpu/v4l2_video_encode_accelerator.h |
index f1f6a3c38650a9507e6040d085af0cf7e9055ec7..a99af33ebf9e0cf1964cbed38b89d31a55c5867d 100644 |
--- a/content/common/gpu/media/v4l2_video_encode_accelerator.h |
+++ b/media/gpu/v4l2_video_encode_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_VIDEO_ENCODE_ACCELERATOR_H_ |
-#define CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_ENCODE_ACCELERATOR_H_ |
+#ifndef MEDIA_GPU_V4L2_VIDEO_ENCODE_ACCELERATOR_H_ |
+#define MEDIA_GPU_V4L2_VIDEO_ENCODE_ACCELERATOR_H_ |
#include <linux/videodev2.h> |
#include <stddef.h> |
@@ -17,9 +17,9 @@ |
#include "base/memory/weak_ptr.h" |
#include "base/threading/thread.h" |
#include "base/time/time.h" |
-#include "content/common/content_export.h" |
-#include "content/common/gpu/media/v4l2_device.h" |
-#include "content/common/gpu/media/v4l2_image_processor.h" |
+#include "media/gpu/media_gpu_export.h" |
+#include "media/gpu/v4l2_device.h" |
+#include "media/gpu/v4l2_image_processor.h" |
#include "media/video/video_encode_accelerator.h" |
#include "ui/gfx/geometry/size.h" |
@@ -29,7 +29,7 @@ class BitstreamBuffer; |
} // namespace media |
-namespace content { |
+namespace media { |
// This class handles video encode acceleration by interfacing with a V4L2 |
// device exposed by the codec hardware driver. The threading model of this |
@@ -38,7 +38,7 @@ namespace content { |
// This class may try to instantiate and use a V4L2ImageProcessor for input |
// format conversion, if the input format requested via Initialize() is not |
// accepted by the hardware codec. |
-class CONTENT_EXPORT V4L2VideoEncodeAccelerator |
+class MEDIA_GPU_EXPORT V4L2VideoEncodeAccelerator |
: public media::VideoEncodeAccelerator { |
public: |
explicit V4L2VideoEncodeAccelerator(const scoped_refptr<V4L2Device>& device); |
@@ -54,8 +54,7 @@ class CONTENT_EXPORT V4L2VideoEncodeAccelerator |
Client* client) override; |
void Encode(const scoped_refptr<media::VideoFrame>& frame, |
bool force_keyframe) override; |
- void UseOutputBitstreamBuffer(const media::BitstreamBuffer& buffer) |
- override; |
+ void UseOutputBitstreamBuffer(const media::BitstreamBuffer& buffer) override; |
void RequestEncodingParametersChange(uint32_t bitrate, |
uint32_t framerate) override; |
void Destroy() override; |
@@ -260,7 +259,7 @@ class CONTENT_EXPORT V4L2VideoEncodeAccelerator |
// Bitstream buffers ready to be used to return encoded output, as a LIFO |
// since we don't care about ordering. |
- std::vector<linked_ptr<BitstreamBufferRef> > encoder_output_queue_; |
+ std::vector<linked_ptr<BitstreamBufferRef>> encoder_output_queue_; |
// Image processor, if one is in use. |
std::unique_ptr<V4L2ImageProcessor> image_processor_; |
@@ -296,6 +295,6 @@ class CONTENT_EXPORT V4L2VideoEncodeAccelerator |
DISALLOW_COPY_AND_ASSIGN(V4L2VideoEncodeAccelerator); |
}; |
-} // namespace content |
+} // namespace media |
-#endif // CONTENT_COMMON_GPU_MEDIA_V4L2_VIDEO_ENCODE_ACCELERATOR_H_ |
+#endif // MEDIA_GPU_V4L2_VIDEO_ENCODE_ACCELERATOR_H_ |