Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(448)

Unified Diff: media/gpu/v4l2_device.h

Issue 1882373004: Migrate content/common/gpu/media code to media/gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix several more bot-identified build issues Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/gpu/v4l2_device.h
diff --git a/content/common/gpu/media/v4l2_device.h b/media/gpu/v4l2_device.h
similarity index 93%
rename from content/common/gpu/media/v4l2_device.h
rename to media/gpu/v4l2_device.h
index 0a88d7686d0cc21b84846eea85e4a52621574330..01ae96edad717e30287753e28593251a1ac952ce 100644
--- a/content/common/gpu/media/v4l2_device.h
+++ b/media/gpu/v4l2_device.h
@@ -6,8 +6,8 @@
// V4L2DecodeAccelerator class to delegate/pass the device specific
// handling of any of the functionalities.
-#ifndef CONTENT_COMMON_GPU_MEDIA_V4L2_DEVICE_H_
-#define CONTENT_COMMON_GPU_MEDIA_V4L2_DEVICE_H_
+#ifndef MEDIA_GPU_V4L2_DEVICE_H_
+#define MEDIA_GPU_V4L2_DEVICE_H_
#include <stddef.h>
#include <stdint.h>
@@ -16,9 +16,9 @@
#include "base/files/scoped_file.h"
#include "base/memory/ref_counted.h"
-#include "content/common/content_export.h"
#include "media/base/video_decoder_config.h"
#include "media/base/video_frame.h"
+#include "media/gpu/media_gpu_export.h"
#include "media/video/video_decode_accelerator.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gl/gl_bindings.h"
@@ -29,9 +29,9 @@
#define V4L2_PIX_FMT_VP8_FRAME v4l2_fourcc('V', 'P', '8', 'F')
#define V4L2_PIX_FMT_MT21 v4l2_fourcc('M', 'T', '2', '1')
-namespace content {
+namespace media {
-class CONTENT_EXPORT V4L2Device
+class MEDIA_GPU_EXPORT V4L2Device
: public base::RefCountedThreadSafe<V4L2Device> {
public:
// Utility format conversion functions
@@ -128,13 +128,15 @@ class CONTENT_EXPORT V4L2Device
// Get minimum and maximum resolution for fourcc |pixelformat| and store to
// |min_resolution| and |max_resolution|.
- void GetSupportedResolution(uint32_t pixelformat, gfx::Size* min_resolution,
+ void GetSupportedResolution(uint32_t pixelformat,
+ gfx::Size* min_resolution,
gfx::Size* max_resolution);
// Return supported profiles for decoder, including only profiles for given
// fourcc |pixelformats|.
media::VideoDecodeAccelerator::SupportedProfiles GetSupportedDecodeProfiles(
- const size_t num_formats, const uint32_t pixelformats[]);
+ const size_t num_formats,
+ const uint32_t pixelformats[]);
// Return true if the device supports |profile|, taking into account only
// fourccs from the given array of |pixelformats| of size |num_formats|.
@@ -151,6 +153,6 @@ class CONTENT_EXPORT V4L2Device
const Type type_;
};
-} // namespace content
+} // namespace media
-#endif // CONTENT_COMMON_GPU_MEDIA_V4L2_DEVICE_H_
+#endif // MEDIA_GPU_V4L2_DEVICE_H_

Powered by Google App Engine
This is Rietveld 408576698