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

Unified Diff: media/capture/video/win/video_capture_device_win.cc

Issue 1345993002: Change the functions in video_capture_device to pass around PowerLineFrequency enums instead of int… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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: media/capture/video/win/video_capture_device_win.cc
diff --git a/media/capture/video/win/video_capture_device_win.cc b/media/capture/video/win/video_capture_device_win.cc
index 055fc2105f1e51c7af9e847da6da6f97bfc060ca..3dc2f9087841d5693126be8a4f28747b83516988 100644
--- a/media/capture/video/win/video_capture_device_win.cc
+++ b/media/capture/video/win/video_capture_device_win.cc
@@ -539,11 +539,11 @@ bool VideoCaptureDeviceWin::CreateCapabilityMap() {
// Set the power line frequency removal in |capture_filter_| if available.
void VideoCaptureDeviceWin::SetAntiFlickerInCaptureFilter(
const VideoCaptureParams& params) {
- const int power_line_frequency = GetPowerLineFrequency(params);
+ const PowerLineFrequency power_line_frequency = GetPowerLineFrequency(params);
if (power_line_frequency !=
- static_cast<int>(media::PowerLineFrequency::FREQUENCY_50HZ) &&
+ media::PowerLineFrequency::FREQUENCY_50HZ &&
ajose 2015/09/17 19:33:32 Can these be one line? Do you have access to "git
mcasas 2015/09/21 15:30:06 Yeah, git cl format can be run by anyone all the t
power_line_frequency !=
- static_cast<int>(media::PowerLineFrequency::FREQUENCY_60HZ)) {
+ media::PowerLineFrequency::FREQUENCY_60HZ) {
return;
}
ScopedComPtr<IKsPropertySet> ks_propset;
@@ -560,7 +560,7 @@ void VideoCaptureDeviceWin::SetAntiFlickerInCaptureFilter(
data.Property.Id = KSPROPERTY_VIDEOPROCAMP_POWERLINE_FREQUENCY;
data.Property.Flags = KSPROPERTY_TYPE_SET;
data.Value = (power_line_frequency ==
- static_cast<int>(media::PowerLineFrequency::FREQUENCY_50HZ))
+ media::PowerLineFrequency::FREQUENCY_50HZ)
? 1
: 2;
ajose 2015/09/17 19:33:32 These two can fit on line above?
data.Flags = KSPROPERTY_VIDEOPROCAMP_FLAGS_MANUAL;
« media/capture/video/video_capture_device.cc ('K') | « media/capture/video/video_capture_device.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698