Change the functions in video_capture_device to pass around PowerLineFrequency enums instead of int…

media/capture/video/win/video_capture_device_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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 <ks.h>
 #include <ksmedia.h>
 
 #include <algorithm>
@@ skipping 521 matching lines @@
       capabilities_.emplace_back(stream_index, format, h->bmiHeader);
     }
   }
 
   return !capabilities_.empty();
 }
 
 // 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 cl format"?

[mcasas, 2015/09/21 15:30:06]

Yeah, git cl format can be run by anyone all the time, and
it only applies to your diff lines (perhaps the immediate 
vicinity as well).

       power_line_frequency !=
-          static_cast<int>(media::PowerLineFrequency::FREQUENCY_60HZ)) {
+          media::PowerLineFrequency::FREQUENCY_60HZ) {
     return;
   }
   ScopedComPtr<IKsPropertySet> ks_propset;
   DWORD type_support = 0;
   HRESULT hr;
   if (SUCCEEDED(hr = ks_propset.QueryFrom(capture_filter_.get())) &&
       SUCCEEDED(hr = ks_propset->QuerySupported(
                     PROPSETID_VIDCAP_VIDEOPROCAMP,
                     KSPROPERTY_VIDEOPROCAMP_POWERLINE_FREQUENCY,
                     &type_support)) &&
       (type_support & KSPROPERTY_SUPPORT_SET)) {
     KSPROPERTY_VIDEOPROCAMP_S data = {};
     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))
+                  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;
     hr = ks_propset->Set(PROPSETID_VIDCAP_VIDEOPROCAMP,
                          KSPROPERTY_VIDEOPROCAMP_POWERLINE_FREQUENCY, &data,
                          sizeof(data), &data, sizeof(data));
     DLOG_IF(ERROR, FAILED(hr)) << "Anti-flicker setting failed: "
                                << logging::SystemErrorCodeToString(hr);
     DVLOG_IF(2, SUCCEEDED(hr)) << "Anti-flicker set correctly.";
   } else {
     DVLOG(2) << "Anti-flicker setting not supported.";
   }
 }
 
 void VideoCaptureDeviceWin::SetErrorState(const std::string& reason) {
   DCHECK(thread_checker_.CalledOnValidThread());
   state_ = kError;
   client_->OnError(reason);
 }
 }  // namespace media