| Index: device/capture/video/win/video_capture_device_factory_win.cc
|
| diff --git a/media/capture/video/win/video_capture_device_factory_win.cc b/device/capture/video/win/video_capture_device_factory_win.cc
|
| similarity index 97%
|
| rename from media/capture/video/win/video_capture_device_factory_win.cc
|
| rename to device/capture/video/win/video_capture_device_factory_win.cc
|
| index 7f4c7a0225e968cabef934a3948afec1c47769f0..246a76234e5436c8d5cc5afc9161bd5fb97beb31 100644
|
| --- a/media/capture/video/win/video_capture_device_factory_win.cc
|
| +++ b/device/capture/video/win/video_capture_device_factory_win.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/win/video_capture_device_factory_win.h"
|
| +#include "device/capture/video/win/video_capture_device_factory_win.h"
|
|
|
| #include <mfapi.h>
|
| #include <mferror.h>
|
| @@ -16,18 +16,20 @@
|
| #include "base/win/scoped_co_mem.h"
|
| #include "base/win/scoped_variant.h"
|
| #include "base/win/windows_version.h"
|
| +#include "device/capture/video/win/video_capture_device_mf_win.h"
|
| +#include "device/capture/video/win/video_capture_device_win.h"
|
| #include "media/base/media_switches.h"
|
| #include "media/base/win/mf_initializer.h"
|
| -#include "media/capture/video/win/video_capture_device_mf_win.h"
|
| -#include "media/capture/video/win/video_capture_device_win.h"
|
|
|
| using base::win::ScopedCoMem;
|
| using base::win::ScopedComPtr;
|
| using base::win::ScopedVariant;
|
| -using Descriptor = media::VideoCaptureDeviceDescriptor;
|
| -using Descriptors = media::VideoCaptureDeviceDescriptors;
|
| +using media::VideoCaptureFormat;
|
| +using media::VideoCaptureFormats;
|
| +using Descriptor = device::VideoCaptureDeviceDescriptor;
|
| +using Descriptors = device::VideoCaptureDeviceDescriptors;
|
|
|
| -namespace media {
|
| +namespace device {
|
|
|
| // In Windows device identifiers, the USB VID and PID are preceded by the string
|
| // "vid_" or "pid_". The identifiers are each 4 bytes long.
|
| @@ -79,7 +81,7 @@ static bool LoadMediaFoundationDlls() {
|
| static bool PrepareVideoCaptureAttributesMediaFoundation(
|
| IMFAttributes** attributes,
|
| int count) {
|
| - InitializeMediaFoundation();
|
| + media::InitializeMediaFoundation();
|
|
|
| if (FAILED(MFCreateAttributes(attributes, count)))
|
| return false;
|
| @@ -309,7 +311,7 @@ static void GetDeviceSupportedFormatsDirectShow(const Descriptor& descriptor,
|
| format.pixel_format =
|
| VideoCaptureDeviceWin::TranslateMediaSubtypeToPixelFormat(
|
| media_type->subtype);
|
| - if (format.pixel_format == PIXEL_FORMAT_UNKNOWN)
|
| + if (format.pixel_format == media::PIXEL_FORMAT_UNKNOWN)
|
| continue;
|
| VIDEOINFOHEADER* h =
|
| reinterpret_cast<VIDEOINFOHEADER*>(media_type->pbFormat);
|
| @@ -463,4 +465,4 @@ VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory(
|
| return new VideoCaptureDeviceFactoryWin();
|
| }
|
|
|
| -} // namespace media
|
| +} // namespace device
|
|
|