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

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: Fixed formatting issue pointed out of ajose 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..9960406ea1d61238be2abe6b88fd5096135c143b 100644
--- a/media/capture/video/win/video_capture_device_win.cc
+++ b/media/capture/video/win/video_capture_device_win.cc
@@ -539,11 +539,9 @@ 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);
- if (power_line_frequency !=
- static_cast<int>(media::PowerLineFrequency::FREQUENCY_50HZ) &&
- power_line_frequency !=
- static_cast<int>(media::PowerLineFrequency::FREQUENCY_60HZ)) {
+ const PowerLineFrequency power_line_frequency = GetPowerLineFrequency(params);
+ if (power_line_frequency != media::PowerLineFrequency::FREQUENCY_50HZ &&
+ power_line_frequency != media::PowerLineFrequency::FREQUENCY_60HZ) {
return;
}
ScopedComPtr<IKsPropertySet> ks_propset;
@@ -559,10 +557,9 @@ void VideoCaptureDeviceWin::SetAntiFlickerInCaptureFilter(
data.Property.Set = PROPSETID_VIDCAP_VIDEOPROCAMP;
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))
- ? 1
- : 2;
+ data.Value =
+ (power_line_frequency == media::PowerLineFrequency::FREQUENCY_50HZ) ? 1
+ : 2;
data.Flags = KSPROPERTY_VIDEOPROCAMP_FLAGS_MANUAL;
hr = ks_propset->Set(PROPSETID_VIDCAP_VIDEOPROCAMP,
KSPROPERTY_VIDEOPROCAMP_POWERLINE_FREQUENCY, &data,
« 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