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

Unified Diff: device/capture/video/win/video_capture_device_win.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/win/video_capture_device_win.h ('k') | media/base/media_switches.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/capture/video/win/video_capture_device_win.cc
diff --git a/media/capture/video/win/video_capture_device_win.cc b/device/capture/video/win/video_capture_device_win.cc
similarity index 96%
rename from media/capture/video/win/video_capture_device_win.cc
rename to device/capture/video/win/video_capture_device_win.cc
index d3c5d539c2b6c5926da1e34f40de0079c77e8da0..65b9ff0bdb167f03b25eb854f8eea722ba28b4c1 100644
--- a/media/capture/video/win/video_capture_device_win.cc
+++ b/device/capture/video/win/video_capture_device_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_win.h"
+#include "device/capture/video/win/video_capture_device_win.h"
#include <ks.h>
#include <ksmedia.h>
@@ -21,7 +21,7 @@ using base::win::ScopedCoMem;
using base::win::ScopedComPtr;
using base::win::ScopedVariant;
-namespace media {
+namespace device {
// Check if a Pin matches a category.
bool PinMatchesCategory(IPin* pin, REFGUID category) {
@@ -150,14 +150,14 @@ VideoCaptureDeviceWin::TranslateMediaSubtypeToPixelFormat(
const GUID& sub_type;
VideoPixelFormat format;
} const kMediaSubtypeToPixelFormatCorrespondence[] = {
- {kMediaSubTypeI420, PIXEL_FORMAT_I420},
- {MEDIASUBTYPE_IYUV, PIXEL_FORMAT_I420},
- {MEDIASUBTYPE_RGB24, PIXEL_FORMAT_RGB24},
- {MEDIASUBTYPE_YUY2, PIXEL_FORMAT_YUY2},
- {MEDIASUBTYPE_MJPG, PIXEL_FORMAT_MJPEG},
- {MEDIASUBTYPE_UYVY, PIXEL_FORMAT_UYVY},
- {MEDIASUBTYPE_ARGB32, PIXEL_FORMAT_ARGB},
- {kMediaSubTypeHDYC, PIXEL_FORMAT_UYVY},
+ {kMediaSubTypeI420, media::PIXEL_FORMAT_I420},
+ {MEDIASUBTYPE_IYUV, media::PIXEL_FORMAT_I420},
+ {MEDIASUBTYPE_RGB24, media::PIXEL_FORMAT_RGB24},
+ {MEDIASUBTYPE_YUY2, media::PIXEL_FORMAT_YUY2},
+ {MEDIASUBTYPE_MJPG, media::PIXEL_FORMAT_MJPEG},
+ {MEDIASUBTYPE_UYVY, media::PIXEL_FORMAT_UYVY},
+ {MEDIASUBTYPE_ARGB32, media::PIXEL_FORMAT_ARGB},
+ {kMediaSubTypeHDYC, media::PIXEL_FORMAT_UYVY},
};
for (const auto& pixel_format : kMediaSubtypeToPixelFormatCorrespondence) {
if (sub_type == pixel_format.sub_type)
@@ -168,7 +168,7 @@ VideoCaptureDeviceWin::TranslateMediaSubtypeToPixelFormat(
StringFromGUID2(sub_type, guid_str, arraysize(guid_str));
DVLOG(2) << "Device (also) supports an unknown media type " << guid_str;
#endif
- return PIXEL_FORMAT_UNKNOWN;
+ return media::PIXEL_FORMAT_UNKNOWN;
}
void VideoCaptureDeviceWin::ScopedMediaType::Free() {
@@ -508,7 +508,7 @@ bool VideoCaptureDeviceWin::CreateCapabilityMap() {
VideoCaptureFormat format;
format.pixel_format =
TranslateMediaSubtypeToPixelFormat(media_type->subtype);
- if (format.pixel_format == PIXEL_FORMAT_UNKNOWN)
+ if (format.pixel_format == media::PIXEL_FORMAT_UNKNOWN)
continue;
VIDEOINFOHEADER* h =
@@ -551,7 +551,8 @@ bool VideoCaptureDeviceWin::CreateCapabilityMap() {
// Set the power line frequency removal in |capture_filter_| if available.
void VideoCaptureDeviceWin::SetAntiFlickerInCaptureFilter(
const VideoCaptureParams& params) {
- const PowerLineFrequency power_line_frequency = GetPowerLineFrequency(params);
+ const media::PowerLineFrequency power_line_frequency =
+ GetPowerLineFrequency(params);
if (power_line_frequency != media::PowerLineFrequency::FREQUENCY_50HZ &&
power_line_frequency != media::PowerLineFrequency::FREQUENCY_60HZ) {
return;
@@ -591,4 +592,4 @@ void VideoCaptureDeviceWin::SetErrorState(
state_ = kError;
client_->OnError(from_here, reason);
}
-} // namespace media
+} // namespace device
« no previous file with comments | « device/capture/video/win/video_capture_device_win.h ('k') | media/base/media_switches.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698