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

Unified Diff: media/audio/audio_parameters.cc

Issue 4661001: Simplified AudioOutputStream interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 10 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: media/audio/audio_parameters.cc
diff --git a/media/audio/audio_parameters.cc b/media/audio/audio_parameters.cc
index ca12452e475d9cbfca3083bd48a6845329cffe92..afea9cdac9823752e600dacd94f9285bd0a2ca91 100644
--- a/media/audio/audio_parameters.cc
+++ b/media/audio/audio_parameters.cc
@@ -10,15 +10,18 @@ AudioParameters::AudioParameters()
: format(AUDIO_PCM_LINEAR),
channels(0),
sample_rate(0),
- bits_per_sample(0) {
+ bits_per_sample(0),
+ samples_per_packet(0) {
}
AudioParameters::AudioParameters(Format format, int channels,
- int sample_rate, int bits_per_sample)
+ int sample_rate, int bits_per_sample,
+ int samples_per_packet)
: format(format),
channels(channels),
sample_rate(sample_rate),
- bits_per_sample(bits_per_sample) {
+ bits_per_sample(bits_per_sample),
+ samples_per_packet(samples_per_packet) {
}
bool AudioParameters::IsValid() const {
@@ -26,5 +29,7 @@ bool AudioParameters::IsValid() const {
(channels > 0) && (channels <= media::Limits::kMaxChannels) &&
(sample_rate > 0) && (sample_rate <= media::Limits::kMaxSampleRate) &&
(bits_per_sample > 0) &&
- (bits_per_sample <= media::Limits::kMaxBitsPerSample);
+ (bits_per_sample <= media::Limits::kMaxBitsPerSample) &&
+ (samples_per_packet > 0) &&
+ (samples_per_packet <= media::Limits::kMaxSamplesPerPacket);
}

Powered by Google App Engine
This is Rietveld 408576698