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

Unified Diff: device/capture/video/linux/video_capture_device_factory_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
Index: device/capture/video/linux/video_capture_device_factory_linux.cc
diff --git a/media/capture/video/linux/video_capture_device_factory_linux.cc b/device/capture/video/linux/video_capture_device_factory_linux.cc
similarity index 96%
rename from media/capture/video/linux/video_capture_device_factory_linux.cc
rename to device/capture/video/linux/video_capture_device_factory_linux.cc
index abe433706718f047473a27d28e46c72a93d7887b..fb6513a373591203a11e4c55cbdfc43fb3b7cbf4 100644
--- a/media/capture/video/linux/video_capture_device_factory_linux.cc
+++ b/device/capture/video/linux/video_capture_device_factory_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_factory_linux.h"
+#include "device/capture/video/linux/video_capture_device_factory_linux.h"
#include <errno.h>
#include <fcntl.h>
@@ -22,11 +22,11 @@
#endif
#if defined(OS_CHROMEOS)
-#include "media/capture/video/linux/video_capture_device_chromeos.h"
+#include "device/capture/video/linux/video_capture_device_chromeos.h"
#endif
-#include "media/capture/video/linux/video_capture_device_linux.h"
+#include "device/capture/video/linux/video_capture_device_linux.h"
-namespace media {
+namespace device {
// USB VID and PID are both 4 bytes long.
static const size_t kVidPidSize = 4;
@@ -116,7 +116,7 @@ static void GetSupportedFormatsForV4L2BufferType(
VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat(
v4l2_format.pixelformat);
- if (supported_format.pixel_format == PIXEL_FORMAT_UNKNOWN)
+ if (supported_format.pixel_format == media::PIXEL_FORMAT_UNKNOWN)
continue;
v4l2_frmsizeenum frame_size = {};
@@ -257,4 +257,4 @@ VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory(
return new VideoCaptureDeviceFactoryLinux(ui_task_runner);
}
-} // namespace media
+} // namespace device

Powered by Google App Engine
This is Rietveld 408576698