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

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

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
« no previous file with comments | « device/capture/video/linux/video_capture_device_linux.h ('k') | device/capture/video/mac/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/capture/video/linux/video_capture_device_linux.cc
diff --git a/media/capture/video/linux/video_capture_device_linux.cc b/device/capture/video/linux/video_capture_device_linux.cc
similarity index 93%
rename from media/capture/video/linux/video_capture_device_linux.cc
rename to device/capture/video/linux/video_capture_device_linux.cc
index a52963e856b700a308db0f3f7abe5ee6766378af..9189ac5b7c9ab5c9cd8304de1ce82ea831143c0d 100644
--- a/media/capture/video/linux/video_capture_device_linux.cc
+++ b/device/capture/video/linux/video_capture_device_linux.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "media/capture/video/linux/video_capture_device_linux.h"
+#include "device/capture/video/linux/video_capture_device_linux.h"
#include <stddef.h>
@@ -10,7 +10,7 @@
#include "base/bind.h"
#include "build/build_config.h"
-#include "media/capture/video/linux/v4l2_capture_delegate.h"
+#include "device/capture/video/linux/v4l2_capture_delegate.h"
#if defined(OS_OPENBSD)
#include <sys/videoio.h>
@@ -18,7 +18,7 @@
#include <linux/videodev2.h>
#endif
-namespace media {
+namespace device {
// Translates Video4Linux pixel formats to Chromium pixel formats.
// static
@@ -91,7 +91,7 @@ void VideoCaptureDeviceLinux::SetRotation(int rotation) {
// static
int VideoCaptureDeviceLinux::TranslatePowerLineFrequencyToV4L2(
- PowerLineFrequency frequency) {
+ media::PowerLineFrequency frequency) {
switch (frequency) {
case media::PowerLineFrequency::FREQUENCY_50HZ:
return V4L2_CID_POWER_LINE_FREQUENCY_50HZ;
@@ -103,4 +103,4 @@ int VideoCaptureDeviceLinux::TranslatePowerLineFrequencyToV4L2(
}
}
-} // namespace media
+} // namespace device
« no previous file with comments | « device/capture/video/linux/video_capture_device_linux.h ('k') | device/capture/video/mac/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698