diff options
| author | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-12 16:04:51 +0000 |
|---|---|---|
| committer | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-12 16:04:51 +0000 |
| commit | 2badc36817ba53d61774fd9d739ebe4d583b6edd (patch) | |
| tree | 886d5a830a9786dceff3b56ced1fdea63cfceb6a /media/audio | |
| parent | b52650baddee93e7fe95e64efb8eb77bbac834d3 (diff) | |
| download | chromium_src-2badc36817ba53d61774fd9d739ebe4d583b6edd.zip chromium_src-2badc36817ba53d61774fd9d739ebe4d583b6edd.tar.gz chromium_src-2badc36817ba53d61774fd9d739ebe4d583b6edd.tar.bz2 | |
Remove WASAPI channel count. Too much trouble for now.
BUG=none
TEST=none
TBR=scherkus
Review URL: https://chromiumcodereview.appspot.com/10905240
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156307 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio')
| -rw-r--r-- | media/audio/audio_output_resampler.cc | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/media/audio/audio_output_resampler.cc b/media/audio/audio_output_resampler.cc index 5f4a50a..c52d340 100644 --- a/media/audio/audio_output_resampler.cc +++ b/media/audio/audio_output_resampler.cc @@ -19,41 +19,18 @@ #include "media/base/limits.h" #include "media/base/multi_channel_resampler.h" -#if defined(OS_WIN) -#include "media/audio/win/audio_low_latency_output_win.h" -#endif - namespace media { static void RecordStats(const AudioParameters& output_params) { UMA_HISTOGRAM_ENUMERATION( "Media.HardwareAudioBitsPerChannel", output_params.bits_per_sample(), limits::kMaxBitsPerSample); - - bool recorded_wasapi_config = false; -#if defined(OS_WIN) - // TODO(dalecurtis): Since channel mixing is handled by the output device - // right now and not by AudioOutputResampler, we need to query for hardware - // channel information. Remove once AOR handles this, http://crbug.com/138762 - if (IsWASAPISupported()) { - recorded_wasapi_config = true; - UMA_HISTOGRAM_ENUMERATION( - "Media.HardwareAudioChannelLayout", - WASAPIAudioOutputStream::HardwareChannelLayout(), CHANNEL_LAYOUT_MAX); - UMA_HISTOGRAM_ENUMERATION( - "Media.HardwareAudioChannelCount", - WASAPIAudioOutputStream::HardwareChannelCount(), limits::kMaxChannels); - } -#endif - - if (!recorded_wasapi_config) { - UMA_HISTOGRAM_ENUMERATION( - "Media.HardwareAudioChannelLayout", output_params.channel_layout(), - CHANNEL_LAYOUT_MAX); - UMA_HISTOGRAM_ENUMERATION( - "Media.HardwareAudioChannelCount", output_params.channels(), - limits::kMaxChannels); - } + UMA_HISTOGRAM_ENUMERATION( + "Media.HardwareAudioChannelLayout", output_params.channel_layout(), + CHANNEL_LAYOUT_MAX); + UMA_HISTOGRAM_ENUMERATION( + "Media.HardwareAudioChannelCount", output_params.channels(), + limits::kMaxChannels); AudioSampleRate asr = media::AsAudioSampleRate(output_params.sample_rate()); if (asr != kUnexpectedAudioSampleRate) { |