| Index: device/capture/video/linux/v4l2_capture_delegate.h
|
| diff --git a/media/capture/video/linux/v4l2_capture_delegate.h b/device/capture/video/linux/v4l2_capture_delegate.h
|
| similarity index 88%
|
| rename from media/capture/video/linux/v4l2_capture_delegate.h
|
| rename to device/capture/video/linux/v4l2_capture_delegate.h
|
| index 120272745c9d2d690f44497a23c873d66c221adf..2fcd7439996dfbd82be65d701355d6173248a58c 100644
|
| --- a/media/capture/video/linux/v4l2_capture_delegate.h
|
| +++ b/device/capture/video/linux/v4l2_capture_delegate.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 MEDIA_CAPTURE_VIDEO_LINUX_V4L2_CAPTURE_DELEGATE_H_
|
| -#define MEDIA_CAPTURE_VIDEO_LINUX_V4L2_CAPTURE_DELEGATE_H_
|
| +#ifndef DEVICE_CAPTURE_VIDEO_LINUX_V4L2_CAPTURE_DELEGATE_H_
|
| +#define DEVICE_CAPTURE_VIDEO_LINUX_V4L2_CAPTURE_DELEGATE_H_
|
|
|
| #include <stddef.h>
|
| #include <stdint.h>
|
| @@ -12,7 +12,7 @@
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "build/build_config.h"
|
| -#include "media/capture/video/video_capture_device.h"
|
| +#include "device/capture/video/video_capture_device.h"
|
|
|
| #if defined(OS_OPENBSD)
|
| #include <sys/videoio.h>
|
| @@ -24,7 +24,7 @@ namespace tracked_objects {
|
| class Location;
|
| } // namespace tracked_objects
|
|
|
| -namespace media {
|
| +namespace device {
|
|
|
| // Class doing the actual Linux capture using V4L2 API. V4L2 SPLANE/MPLANE
|
| // capture specifics are implemented in derived classes. Created and destroyed
|
| @@ -35,7 +35,8 @@ class V4L2CaptureDelegate final
|
| public:
|
| // Retrieves the #planes for a given |fourcc|, or 0 if unknown.
|
| static size_t GetNumPlanesForFourCc(uint32_t fourcc);
|
| - // Returns the Chrome pixel format for |v4l2_fourcc| or PIXEL_FORMAT_UNKNOWN.
|
| + // Returns the Chrome pixel format for |v4l2_fourcc| or
|
| + // media::PIXEL_FORMAT_UNKNOWN.
|
| static VideoPixelFormat V4l2FourCcToChromiumPixelFormat(
|
| uint32_t v4l2_fourcc);
|
|
|
| @@ -93,6 +94,6 @@ class V4L2CaptureDelegate final
|
| DISALLOW_COPY_AND_ASSIGN(V4L2CaptureDelegate);
|
| };
|
|
|
| -} // namespace media
|
| +} // namespace device
|
|
|
| -#endif // MEDIA_CAPTURE_VIDEO_LINUX_V4L2_CAPTURE_DELEGATE_H_
|
| +#endif // DEVICE_CAPTURE_VIDEO_LINUX_V4L2_CAPTURE_DELEGATE_H_
|
|
|