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

Side by Side Diff: media/capture/video/video_capture_device.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 5 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/capture/video/video_capture_device.h" 5 #include "media/capture/video/video_capture_device.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/i18n/timezone.h" 8 #include "base/i18n/timezone.h"
9 #include "base/macros.h"
9 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
11 #include "build/build_config.h"
10 #include "media/base/media_switches.h" 12 #include "media/base/media_switches.h"
11 13
12 namespace media { 14 namespace media {
13 15
14 // TODO(msu.koo): http://crbug.com/532272, remove checking the switch in favour 16 // TODO(msu.koo): http://crbug.com/532272, remove checking the switch in favour
15 // of deferring GetModel() call to the actual VideoCaptureDevice object. 17 // of deferring GetModel() call to the actual VideoCaptureDevice object.
16 const std::string VideoCaptureDevice::Name::GetNameAndModel() const { 18 const std::string VideoCaptureDevice::Name::GetNameAndModel() const {
17 const std::string model_id = GetModel(); 19 const std::string model_id = GetModel();
18 if (model_id.empty()) 20 if (model_id.empty())
19 return device_name_; 21 return device_name_;
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 switch (params.power_line_frequency) { 173 switch (params.power_line_frequency) {
172 case media::PowerLineFrequency::FREQUENCY_50HZ: // fall through 174 case media::PowerLineFrequency::FREQUENCY_50HZ: // fall through
173 case media::PowerLineFrequency::FREQUENCY_60HZ: 175 case media::PowerLineFrequency::FREQUENCY_60HZ:
174 return params.power_line_frequency; 176 return params.power_line_frequency;
175 default: 177 default:
176 return GetPowerLineFrequencyForLocation(); 178 return GetPowerLineFrequencyForLocation();
177 } 179 }
178 } 180 }
179 181
180 } // namespace media 182 } // namespace media
OLDNEW
« no previous file with comments | « media/capture/video/video_capture_device.h ('k') | media/capture/video/video_capture_device_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698