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

Unified Diff: media/capture/video/video_capture_device.cc

Issue 1323093006: Change the media::PowerLineFrequency from an enum class to a proper class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Pass around PowerLineFrequency objects in VideoCaptureDevice instead of integers 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
« no previous file with comments | « media/capture/video/video_capture_device.h ('k') | media/capture/video/win/video_capture_device_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/capture/video/video_capture_device.cc
diff --git a/media/capture/video/video_capture_device.cc b/media/capture/video/video_capture_device.cc
index 4b771e564ee9c05c0641bd14b5174cd4d005f6b6..e6a527c8f5d777d94556f0458a2ef03ec38002cc 100644
--- a/media/capture/video/video_capture_device.cc
+++ b/media/capture/video/video_capture_device.cc
@@ -138,10 +138,11 @@ VideoCaptureDevice::Client::Buffer::~Buffer() {
VideoCaptureDevice::~VideoCaptureDevice() {
}
-int VideoCaptureDevice::GetPowerLineFrequencyForLocation() const {
+media::PowerLineFrequency
+VideoCaptureDevice::GetPowerLineFrequencyForLocation() const {
std::string current_country = base::CountryCodeForCurrentTimezone();
if (current_country.empty())
- return 0;
+ return media::PowerLineFrequency();
// 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[] = {
@@ -153,17 +154,19 @@ int VideoCaptureDevice::GetPowerLineFrequencyForLocation() const {
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(
+ media::PowerLineFrequency::FREQUENCY_50HZ);
}
- return static_cast<int>(media::PowerLineFrequency::FREQUENCY_60HZ);
+ return media::PowerLineFrequency(
+ media::PowerLineFrequency::FREQUENCY_60HZ);
}
-int VideoCaptureDevice::GetPowerLineFrequency(
+media::PowerLineFrequency VideoCaptureDevice::GetPowerLineFrequency(
const VideoCaptureParams& params) const {
- switch (params.power_line_frequency) {
+ switch (params.power_line_frequency.get()) {
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();
}
« no previous file with comments | « media/capture/video/video_capture_device.h ('k') | media/capture/video/win/video_capture_device_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698