Make AudioParameters a class instead of a struct

media/audio/audio_parameters.cc

Index: media/audio/audio_parameters.cc
diff --git a/media/audio/audio_parameters.cc b/media/audio/audio_parameters.cc
index 4395481764a626a3f6837742e0dac40be9aad487..3c059bfebfda2d2fee981c45b07954718b0162ae 100644
--- a/media/audio/audio_parameters.cc
+++ b/media/audio/audio_parameters.cc
@@ -7,61 +7,73 @@
 #include "media/base/limits.h"
 
 AudioParameters::AudioParameters()
-    : format(AUDIO_PCM_LINEAR),
-      channel_layout(CHANNEL_LAYOUT_NONE),
-      sample_rate(0),
-      bits_per_sample(0),
-      samples_per_packet(0),
-      channels(0) {
+    : format_(AUDIO_PCM_LINEAR),
+      channel_layout_(CHANNEL_LAYOUT_NONE),
+      samples_per_second_(0),
+      bits_per_sample_(0),
+      samples_per_packet_(0),
+      channels_(0) {
 }
 
 AudioParameters::AudioParameters(Format format, ChannelLayout channel_layout,
-                                 int sample_rate, int bits_per_sample,
+                                 int samples_per_second, int bits_per_sample,
                                  int samples_per_packet)
-    : format(format),
-      channel_layout(channel_layout),
-      sample_rate(sample_rate),
-      bits_per_sample(bits_per_sample),
-      samples_per_packet(samples_per_packet),
-      channels(ChannelLayoutToChannelCount(channel_layout)) {
+    : format_(format),
+      channel_layout_(channel_layout),
+      samples_per_second_(samples_per_second),
+      bits_per_sample_(bits_per_sample),
+      samples_per_packet_(samples_per_packet),
+      channels_(ChannelLayoutToChannelCount(channel_layout)) {
+}
+
+void AudioParameters::Reset(Format format, ChannelLayout channel_layout,
+                       int samples_per_second, int bits_per_sample,

[scherkus (not reviewing), 2012/03/09 21:48:59]

indent

[vrk (LEFT CHROMIUM), 2012/03/16 18:30:41]

Done.

+                       int samples_per_packet) {
+  format_ = format;
+  channel_layout_ = channel_layout;
+  samples_per_second_ = samples_per_second;
+  bits_per_sample_ = bits_per_sample;
+  samples_per_packet_ = samples_per_packet;
+  channels_ = ChannelLayoutToChannelCount(channel_layout);
 }
 
 bool AudioParameters::IsValid() const {
-  return (format >= 0) && (format < AUDIO_LAST_FORMAT) &&
-      (channels > 0) && (channels <= media::limits::kMaxChannels) &&
-      (sample_rate > 0) && (sample_rate <= media::limits::kMaxSampleRate) &&
-      (bits_per_sample > 0) &&
-      (bits_per_sample <= media::limits::kMaxBitsPerSample) &&
-      (samples_per_packet > 0) &&
-      (samples_per_packet <= media::limits::kMaxSamplesPerPacket);
+  return (format_ >= 0) && (format_ < AUDIO_LAST_FORMAT) &&
+      (channels_ > 0) && (channels_ <= media::limits::kMaxChannels) &&
+      (samples_per_second_ > 0) &&
+      (samples_per_second_ <= media::limits::kMaxSampleRate) &&
+      (bits_per_sample_ > 0) &&
+      (bits_per_sample_ <= media::limits::kMaxBitsPerSample) &&
+      (samples_per_packet_ > 0) &&
+      (samples_per_packet_ <= media::limits::kMaxSamplesPerPacket);
 }
 
 int AudioParameters::GetPacketSize() const {
-  return samples_per_packet * channels * bits_per_sample / 8;
+  return samples_per_packet_ * channels_ * bits_per_sample_ / 8;
 }
 
 int AudioParameters::GetBytesPerSecond() const {
-  return sample_rate * channels * bits_per_sample / 8;
+  return samples_per_second_ * channels_ * bits_per_sample_ / 8;
 }
 
 bool AudioParameters::Compare::operator()(
     const AudioParameters& a,
     const AudioParameters& b) const {
-  if (a.format < b.format)
+  if (a.format_ < b.format_)
     return true;
-  if (a.format > b.format)
+  if (a.format_ > b.format_)
     return false;
-  if (a.channels < b.channels)
+  if (a.channels_ < b.channels_)
     return true;
-  if (a.channels > b.channels)
+  if (a.channels_ > b.channels_)
     return false;
-  if (a.sample_rate < b.sample_rate)
+  if (a.samples_per_second_ < b.samples_per_second_)
     return true;
-  if (a.sample_rate > b.sample_rate)
+  if (a.samples_per_second_ > b.samples_per_second_)
     return false;
-  if (a.bits_per_sample < b.bits_per_sample)
+  if (a.bits_per_sample_ < b.bits_per_sample_)
     return true;
-  if (a.bits_per_sample > b.bits_per_sample)
+  if (a.bits_per_sample_ > b.bits_per_sample_)
     return false;
-  return a.samples_per_packet < b.samples_per_packet;
+  return a.samples_per_packet_ < b.samples_per_packet_;
 }