| Index: media/audio/audio_parameters.cc
|
| diff --git a/media/audio/audio_parameters.cc b/media/audio/audio_parameters.cc
|
| index c9dcdeb7e5f6ce66db2c93c7dbd6ecb490f3db67..872413f808379b92ad460be125340d26b7735c6a 100644
|
| --- a/media/audio/audio_parameters.cc
|
| +++ b/media/audio/audio_parameters.cc
|
| @@ -68,12 +68,8 @@ void AudioParameters::Reset(Format format, ChannelLayout channel_layout,
|
| }
|
|
|
| bool AudioParameters::IsValid() const {
|
| - return (format_ >= AUDIO_PCM_LINEAR) &&
|
| - (format_ < AUDIO_LAST_FORMAT) &&
|
| - (channels_ > 0) &&
|
| - (channels_ <= media::limits::kMaxChannels) &&
|
| + return (channels_ > 0) && (channels_ <= media::limits::kMaxChannels) &&
|
| (channel_layout_ > CHANNEL_LAYOUT_UNSUPPORTED) &&
|
| - (channel_layout_ <= CHANNEL_LAYOUT_MAX) &&
|
| (sample_rate_ >= media::limits::kMinSampleRate) &&
|
| (sample_rate_ <= media::limits::kMaxSampleRate) &&
|
| (bits_per_sample_ > 0) &&
|
|
|