| Index: device/capture/video/win/video_capture_device_mf_win.cc
|
| diff --git a/media/capture/video/win/video_capture_device_mf_win.cc b/device/capture/video/win/video_capture_device_mf_win.cc
|
| similarity index 94%
|
| rename from media/capture/video/win/video_capture_device_mf_win.cc
|
| rename to device/capture/video/win/video_capture_device_mf_win.cc
|
| index 9965e7c76a3fbd083c5661478d1015034b8a5cd9..4833e719ea110b104ecc7e958fb52bb20d05b1f8 100644
|
| --- a/media/capture/video/win/video_capture_device_mf_win.cc
|
| +++ b/device/capture/video/win/video_capture_device_mf_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_mf_win.h"
|
| +#include "device/capture/video/win/video_capture_device_mf_win.h"
|
|
|
| #include <mfapi.h>
|
| #include <mferror.h>
|
| @@ -17,12 +17,12 @@
|
| #include "base/synchronization/waitable_event.h"
|
| #include "base/win/scoped_co_mem.h"
|
| #include "base/win/windows_version.h"
|
| -#include "media/capture/video/win/capability_list_win.h"
|
| +#include "device/capture/video/win/capability_list_win.h"
|
|
|
| using base::win::ScopedCoMem;
|
| using base::win::ScopedComPtr;
|
|
|
| -namespace media {
|
| +namespace device {
|
|
|
| static bool GetFrameSize(IMFMediaType* type, gfx::Size* frame_size) {
|
| UINT32 width32, height32;
|
| @@ -163,13 +163,13 @@ bool VideoCaptureDeviceMFWin::FormatFromGuid(const GUID& guid,
|
| const GUID& guid;
|
| const VideoPixelFormat format;
|
| } static const kFormatMap[] = {
|
| - {MFVideoFormat_I420, PIXEL_FORMAT_I420},
|
| - {MFVideoFormat_YUY2, PIXEL_FORMAT_YUY2},
|
| - {MFVideoFormat_UYVY, PIXEL_FORMAT_UYVY},
|
| - {MFVideoFormat_RGB24, PIXEL_FORMAT_RGB24},
|
| - {MFVideoFormat_ARGB32, PIXEL_FORMAT_ARGB},
|
| - {MFVideoFormat_MJPG, PIXEL_FORMAT_MJPEG},
|
| - {MFVideoFormat_YV12, PIXEL_FORMAT_YV12},
|
| + {MFVideoFormat_I420, media::PIXEL_FORMAT_I420},
|
| + {MFVideoFormat_YUY2, media::PIXEL_FORMAT_YUY2},
|
| + {MFVideoFormat_UYVY, media::PIXEL_FORMAT_UYVY},
|
| + {MFVideoFormat_RGB24, media::PIXEL_FORMAT_RGB24},
|
| + {MFVideoFormat_ARGB32, media::PIXEL_FORMAT_ARGB},
|
| + {MFVideoFormat_MJPG, media::PIXEL_FORMAT_MJPEG},
|
| + {MFVideoFormat_YV12, media::PIXEL_FORMAT_YV12},
|
| };
|
|
|
| for (const auto& kFormat : kFormatMap) {
|
| @@ -312,4 +312,4 @@ void VideoCaptureDeviceMFWin::OnError(
|
| }
|
| }
|
|
|
| -} // namespace media
|
| +} // namespace device
|
|
|