Refactor AudioParameters member setting.

media/audio/audio_parameters.h

 // 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.
 
 #ifndef MEDIA_AUDIO_AUDIO_PARAMETERS_H_
 #define MEDIA_AUDIO_AUDIO_PARAMETERS_H_
 
 #include <stdint.h>
 #include <string>
 
@@ skipping 62 matching lines @@
   // effects should be enabled.
   enum PlatformEffectsMask {
     NO_EFFECTS = 0x0,
     ECHO_CANCELLER = 0x1,
     DUCKING = 0x2,  // Enables ducking if the OS supports it.
     KEYBOARD_MIC = 0x4,
     HOTWORD = 0x8,
   };
 
   AudioParameters();
-  AudioParameters(Format format, ChannelLayout channel_layout,
-                  int sample_rate, int bits_per_sample,
+  AudioParameters(Format format,
+                  ChannelLayout channel_layout,
+                  int sample_rate,

[tommi (sloooow) - chröme, 2015/09/05 09:49:58]

this is a great improvement over how things were.  It's still possible to make
mistakes since we have three ints in a row. Maybe we should strongly type these
in the future. E.g. have an enum, typedef or even a class for sample rate, bits
per sample etc.

[ajm, 2015/09/06 07:24:14]

I could see using an enum for bits_per_sample, since there aren't a lot of
possibilities.

+                  int bits_per_sample,
                   int frames_per_buffer);
-  AudioParameters(Format format, ChannelLayout channel_layout,
-                  int sample_rate, int bits_per_sample,
-                  int frames_per_buffer, int effects);
-  AudioParameters(Format format, ChannelLayout channel_layout,
-                  int channels, int sample_rate, int bits_per_sample,
-                  int frames_per_buffer, int effects);
 
-  void Reset(Format format, ChannelLayout channel_layout,
-             int channels, int sample_rate, int bits_per_sample,
+  // Re-initializes all members.
+  void Reset(Format format,
+             ChannelLayout channel_layout,
+             int sample_rate,
+             int bits_per_sample,
              int frames_per_buffer);
 
   // Checks that all values are in the expected range. All limits are specified
   // in media::Limits.
   bool IsValid() const;
 
   // Returns a human-readable string describing |*this|.  For debugging & test
   // output only.
   std::string AsHumanReadableString() const;
 
   // Returns size of audio buffer in bytes.
   int GetBytesPerBuffer() const;
 
   // Returns the number of bytes representing one second of audio.
   int GetBytesPerSecond() const;
 
   // Returns the number of bytes representing a frame of audio.
   int GetBytesPerFrame() const;
 
   // Returns the duration of this buffer as calculated from frames_per_buffer()
   // and sample_rate().
   base::TimeDelta GetBufferDuration() const;
 
   // Comparison with other AudioParams.
   bool Equals(const AudioParameters& other) const;
 
+  void set_format(Format format) { format_ = format; }
   Format format() const { return format_; }
+
+  // A setter for channel_layout_ is intentionally excluded.
   ChannelLayout channel_layout() const { return channel_layout_; }
+
+  // The number of channels is usually computed from channel_layout_. Setting
+  // this explictly is only required with CHANNEL_LAYOUT_DISCRETE.
+  void set_channels_for_discrete(int channels) {
+    DCHECK(channel_layout_ == CHANNEL_LAYOUT_DISCRETE ||
+           channels == ChannelLayoutToChannelCount(channel_layout_));
+    channels_ = channels;
+  }
+  int channels() const { return channels_; }
+
+  void set_sample_rate(int sample_rate) { sample_rate_ = sample_rate; }
   int sample_rate() const { return sample_rate_; }
+
+  void set_bits_per_sample(int bits_per_sample) {
+    bits_per_sample_ = bits_per_sample;
+  }
   int bits_per_sample() const { return bits_per_sample_; }
+
+  void set_frames_per_buffer(int frames_per_buffer) {
+    frames_per_buffer_ = frames_per_buffer;
+  }
   int frames_per_buffer() const { return frames_per_buffer_; }
-  int channels() const { return channels_; }
+
+  void set_effects(int effects) { effects_ = effects; }
   int effects() const { return effects_; }
 
+  AudioParameters(const AudioParameters&) = default;
+  AudioParameters& operator=(const AudioParameters&) = default;
+
  private:
-  // These members are mutable to support entire struct assignment. They should
-  // not be mutated individually.
   Format format_;                 // Format of the stream.
   ChannelLayout channel_layout_;  // Order of surround sound channels.
+  int channels_;                  // Number of channels. Value set based on
+                                  // |channel_layout|.
   int sample_rate_;               // Sampling frequency/rate.
   int bits_per_sample_;           // Number of bits per sample.
   int frames_per_buffer_;         // Number of frames in a buffer.
-
-  int channels_;                  // Number of channels. Value set based on
-                                  // |channel_layout|.
   int effects_;                   // Bitmask using PlatformEffectsMask.
 };
 
 // Comparison is useful when AudioParameters is used with std structures.
 inline bool operator<(const AudioParameters& a, const AudioParameters& b) {
   if (a.format() != b.format())
     return a.format() < b.format();
   if (a.channels() != b.channels())
     return a.channels() < b.channels();
   if (a.sample_rate() != b.sample_rate())
     return a.sample_rate() < b.sample_rate();
   if (a.bits_per_sample() != b.bits_per_sample())
     return a.bits_per_sample() < b.bits_per_sample();
   return a.frames_per_buffer() < b.frames_per_buffer();
 }
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_PARAMETERS_H_