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

media/capture/video/video_capture_device.cc

 // Copyright 2013 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/video_capture_device.h"
 
 #include "base/i18n/timezone.h"
 #include "base/strings/string_util.h"
 
 namespace media {
@@ skipping 120 matching lines @@
   }
 }
 #endif
 
 VideoCaptureDevice::Client::Buffer::~Buffer() {
 }
 
 VideoCaptureDevice::~VideoCaptureDevice() {
 }
 
-int VideoCaptureDevice::GetPowerLineFrequencyForLocation() const {
+PowerLineFrequency
+VideoCaptureDevice::GetPowerLineFrequencyForLocation() const {
   std::string current_country = base::CountryCodeForCurrentTimezone();

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

Can be const, right?

   if (current_country.empty())
-    return 0;
+    return media::PowerLineFrequency::FREQUENCY_DEFAULT;

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

No need for media::

   // Sorted out list of countries with 60Hz power line frequency, from
   // http://en.wikipedia.org/wiki/Mains_electricity_by_country
   const char* countries_using_60Hz[] = {
       "AI", "AO", "AS", "AW", "AZ", "BM", "BR", "BS", "BZ", "CA", "CO",
       "CR", "CU", "DO", "EC", "FM", "GT", "GU", "GY", "HN", "HT", "JP",
       "KN", "KR", "KY", "MS", "MX", "NI", "PA", "PE", "PF", "PH", "PR",
       "PW", "SA", "SR", "SV", "TT", "TW", "UM", "US", "VG", "VI", "VE"};
   const char** countries_using_60Hz_end =
       countries_using_60Hz + arraysize(countries_using_60Hz);
   if (std::find(countries_using_60Hz, countries_using_60Hz_end,
                 current_country) == countries_using_60Hz_end) {
-    return static_cast<int>(media::PowerLineFrequency::FREQUENCY_50HZ);
+    return media::PowerLineFrequency::FREQUENCY_50HZ;
   }
-  return static_cast<int>(media::PowerLineFrequency::FREQUENCY_60HZ);
+  return media::PowerLineFrequency::FREQUENCY_60HZ;
 }
 
-int VideoCaptureDevice::GetPowerLineFrequency(
+PowerLineFrequency VideoCaptureDevice::GetPowerLineFrequency(
     const VideoCaptureParams& params) const {
   switch (params.power_line_frequency) {
     case media::PowerLineFrequency::FREQUENCY_50HZ:  // fall through
     case media::PowerLineFrequency::FREQUENCY_60HZ:
-      return static_cast<int>(params.power_line_frequency);
+      return params.power_line_frequency;
     default:
       return GetPowerLineFrequencyForLocation();
   }
 }
 
 }  // namespace media