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

Side by Side Diff: media/audio/linux/audio_manager_linux.cc

Issue 148553003: Clean up histogram'd media enum max values. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: FOO_MAX = LAST_VALID_FOO Created 6 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/metrics/histogram.h" 6 #include "base/metrics/histogram.h"
7 #if defined(USE_ALSA) 7 #if defined(USE_ALSA)
8 #include "media/audio/alsa/audio_manager_alsa.h" 8 #include "media/audio/alsa/audio_manager_alsa.h"
9 #else 9 #else
10 #include "media/audio/fake_audio_manager.h" 10 #include "media/audio/fake_audio_manager.h"
11 #endif 11 #endif
12 #if defined(USE_CRAS) 12 #if defined(USE_CRAS)
13 #include "media/audio/cras/audio_manager_cras.h" 13 #include "media/audio/cras/audio_manager_cras.h"
14 #endif 14 #endif
15 #if defined(USE_PULSEAUDIO) 15 #if defined(USE_PULSEAUDIO)
16 #include "media/audio/pulse/audio_manager_pulse.h" 16 #include "media/audio/pulse/audio_manager_pulse.h"
17 #endif 17 #endif
18 #include "media/base/media_switches.h" 18 #include "media/base/media_switches.h"
19 19
20 namespace media { 20 namespace media {
21 21
22 enum LinuxAudioIO { 22 enum LinuxAudioIO {
23 kPulse, 23 kPulse,
24 kAlsa, 24 kAlsa,
25 kCras, 25 kCras,
26 kAudioIOMax // Must always be last! 26 kAudioIOMax = kCras // Must always be equal to last entry!
27 }; 27 };
28 28
29 AudioManager* CreateAudioManager(AudioLogFactory* audio_log_factory) { 29 AudioManager* CreateAudioManager(AudioLogFactory* audio_log_factory) {
30 #if defined(USE_CRAS) 30 #if defined(USE_CRAS)
31 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) { 31 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
32 UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax); 32 UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
33 return new AudioManagerCras(audio_log_factory); 33 return new AudioManagerCras(audio_log_factory);
34 } 34 }
35 #endif 35 #endif
36 36
37 #if defined(USE_PULSEAUDIO) 37 #if defined(USE_PULSEAUDIO)
38 AudioManager* manager = AudioManagerPulse::Create(audio_log_factory); 38 AudioManager* manager = AudioManagerPulse::Create(audio_log_factory);
39 if (manager) { 39 if (manager) {
40 UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kPulse, kAudioIOMax); 40 UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kPulse, kAudioIOMax + 1);
41 return manager; 41 return manager;
42 } 42 }
43 #endif 43 #endif
44 44
45 #if defined(USE_ALSA) 45 #if defined(USE_ALSA)
46 UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kAlsa, kAudioIOMax); 46 UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kAlsa, kAudioIOMax + 1);
47 return new AudioManagerAlsa(audio_log_factory); 47 return new AudioManagerAlsa(audio_log_factory);
48 #else 48 #else
49 return new FakeAudioManager(audio_log_factory); 49 return new FakeAudioManager(audio_log_factory);
50 #endif 50 #endif
51 } 51 }
52 52
53 } // namespace media 53 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698