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

Unified Diff: device/capture/video/linux/video_capture_device_linux.h

Issue 2214533002: move //media/capture to //device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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: device/capture/video/linux/video_capture_device_linux.h
diff --git a/media/capture/video/linux/video_capture_device_linux.h b/device/capture/video/linux/video_capture_device_linux.h
similarity index 82%
rename from media/capture/video/linux/video_capture_device_linux.h
rename to device/capture/video/linux/video_capture_device_linux.h
index 48e2a6446ebdd5f47f5a0529e5d769584b66df58..da34ec4d09ce4eaf57e34ca0263a12b5c819bfe8 100644
--- a/media/capture/video/linux/video_capture_device_linux.h
+++ b/device/capture/video/linux/video_capture_device_linux.h
@@ -7,8 +7,8 @@
// capturing so this implementation uses a Chromium thread for fetching frames
// from V4L2.
-#ifndef MEDIA_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_
-#define MEDIA_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_
+#ifndef DEVICE_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_
+#define DEVICE_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_
#include <stdint.h>
@@ -18,10 +18,10 @@
#include "base/files/scoped_file.h"
#include "base/macros.h"
#include "base/threading/thread.h"
+#include "device/capture/video/video_capture_device.h"
#include "media/base/video_capture_types.h"
-#include "media/capture/video/video_capture_device.h"
-namespace media {
+namespace device {
class V4L2CaptureDelegate;
@@ -44,7 +44,8 @@ class VideoCaptureDeviceLinux : public VideoCaptureDevice {
void SetRotation(int rotation);
private:
- static int TranslatePowerLineFrequencyToV4L2(PowerLineFrequency frequency);
+ static int TranslatePowerLineFrequencyToV4L2(
+ media::PowerLineFrequency frequency);
// Internal delegate doing the actual capture setting, buffer allocation and
// circulation with the V4L2 API. Created and deleted in the thread where
@@ -58,6 +59,6 @@ class VideoCaptureDeviceLinux : public VideoCaptureDevice {
DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceLinux);
};
-} // namespace media
+} // namespace device
-#endif // MEDIA_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_
+#endif // DEVICE_CAPTURE_VIDEO_LINUX_VIDEO_CAPTURE_DEVICE_LINUX_H_

Powered by Google App Engine
This is Rietveld 408576698