| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/audio/audio_parameters.h" | 5 #include "media/audio/audio_parameters.h" |
| 6 | 6 |
| 7 #include "media/base/limits.h" | 7 #include "media/base/limits.h" |
| 8 | 8 |
| 9 AudioParameters::AudioParameters() | 9 AudioParameters::AudioParameters() |
| 10 : format(AUDIO_PCM_LINEAR), | 10 : format(AUDIO_PCM_LINEAR), |
| 11 channels(0), | 11 channels(0), |
| 12 sample_rate(0), | 12 sample_rate(0), |
| 13 bits_per_sample(0) { | 13 bits_per_sample(0), |
| 14 samples_per_packet(0) { |
| 14 } | 15 } |
| 15 | 16 |
| 16 AudioParameters::AudioParameters(Format format, int channels, | 17 AudioParameters::AudioParameters(Format format, int channels, |
| 17 int sample_rate, int bits_per_sample) | 18 int sample_rate, int bits_per_sample, |
| 19 int samples_per_packet) |
| 18 : format(format), | 20 : format(format), |
| 19 channels(channels), | 21 channels(channels), |
| 20 sample_rate(sample_rate), | 22 sample_rate(sample_rate), |
| 21 bits_per_sample(bits_per_sample) { | 23 bits_per_sample(bits_per_sample), |
| 24 samples_per_packet(samples_per_packet) { |
| 22 } | 25 } |
| 23 | 26 |
| 24 bool AudioParameters::IsValid() const { | 27 bool AudioParameters::IsValid() const { |
| 25 return (format >= 0) && (format < AUDIO_LAST_FORMAT) && | 28 return (format >= 0) && (format < AUDIO_LAST_FORMAT) && |
| 26 (channels > 0) && (channels <= media::Limits::kMaxChannels) && | 29 (channels > 0) && (channels <= media::Limits::kMaxChannels) && |
| 27 (sample_rate > 0) && (sample_rate <= media::Limits::kMaxSampleRate) && | 30 (sample_rate > 0) && (sample_rate <= media::Limits::kMaxSampleRate) && |
| 28 (bits_per_sample > 0) && | 31 (bits_per_sample > 0) && |
| 29 (bits_per_sample <= media::Limits::kMaxBitsPerSample); | 32 (bits_per_sample <= media::Limits::kMaxBitsPerSample) && |
| 33 (samples_per_packet > 0) && |
| 34 (samples_per_packet <= media::Limits::kMaxSamplesPerPacket); |
| 30 } | 35 } |
| OLD | NEW |