Clean up histogram'd media enum max values.

media/audio/audio_parameters.cc

 // Copyright (c) 2012 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/audio/audio_parameters.h"
 
 #include "base/logging.h"
 #include "media/base/limits.h"
 
 namespace media {
@@ skipping 67 matching lines @@
   bits_per_sample_ = bits_per_sample;
   frames_per_buffer_ = frames_per_buffer;
 }
 
 bool AudioParameters::IsValid() const {
   return (format_ >= AUDIO_PCM_LINEAR) &&
          (format_ < AUDIO_LAST_FORMAT) &&
          (channels_ > 0) &&
          (channels_ <= media::limits::kMaxChannels) &&
          (channel_layout_ > CHANNEL_LAYOUT_UNSUPPORTED) &&
-         (channel_layout_ < CHANNEL_LAYOUT_MAX) &&
+         (channel_layout_ < CHANNEL_LAYOUT_HISTOGRAM_MAX) &&
          (input_channels_ >= 0) &&
          (input_channels_ <= media::limits::kMaxChannels) &&
          (sample_rate_ >= media::limits::kMinSampleRate) &&
          (sample_rate_ <= media::limits::kMaxSampleRate) &&
          (bits_per_sample_ > 0) &&
          (bits_per_sample_ <= media::limits::kMaxBitsPerSample) &&
          (frames_per_buffer_ > 0) &&
          (frames_per_buffer_ <= media::limits::kMaxSamplesPerPacket);
 }
 
 int AudioParameters::GetBytesPerBuffer() const {
   return frames_per_buffer_ * GetBytesPerFrame();
 }
 
 int AudioParameters::GetBytesPerSecond() const {
   return sample_rate_ * GetBytesPerFrame();
 }
 
 int AudioParameters::GetBytesPerFrame() const {
   return channels_ * bits_per_sample_ / 8;
 }
 
 base::TimeDelta AudioParameters::GetBufferDuration() const {
   return base::TimeDelta::FromMicroseconds(
       frames_per_buffer_ * base::Time::kMicrosecondsPerSecond /
       static_cast<float>(sample_rate_));
 }
 
 }  // namespace media