Revert 240548 "Enable platform echo cancellation through the Aud..."

trunk/src/media/audio/audio_parameters.h

Index: trunk/src/media/audio/audio_parameters.h
===================================================================
--- trunk/src/media/audio/audio_parameters.h	(revision 240589)
+++ trunk/src/media/audio/audio_parameters.h	(working copy)
@@ -44,13 +44,6 @@
     kAudioCDSampleRate = 44100,
   };
 
-  // Bitmasks to determine whether certain platform (typically hardware) audio
-  // effects should be enabled.
-  enum PlatformEffectsMask {
-    NO_EFFECTS = 0x0,
-    ECHO_CANCELLER = 0x1
-  };
-
   AudioParameters();
   AudioParameters(Format format, ChannelLayout channel_layout,
                   int sample_rate, int bits_per_sample,
@@ -58,12 +51,7 @@
   AudioParameters(Format format, ChannelLayout channel_layout,
                   int input_channels,
                   int sample_rate, int bits_per_sample,
-                  int frames_per_buffer, int effects);
-  AudioParameters(Format format, ChannelLayout channel_layout,
-                  int channels, int input_channels,
-                  int sample_rate, int bits_per_sample,
-                  int frames_per_buffer, int effects);
-
+                  int frames_per_buffer);
   void Reset(Format format, ChannelLayout channel_layout,
              int channels, int input_channels,
              int sample_rate, int bits_per_sample,
@@ -93,8 +81,10 @@
   int frames_per_buffer() const { return frames_per_buffer_; }
   int channels() const { return channels_; }
   int input_channels() const { return input_channels_; }
-  int effects() const { return effects_; }
 
+  // Set to CHANNEL_LAYOUT_DISCRETE with given number of channels.
+  void SetDiscreteChannels(int channels);
+
   // Comparison with other AudioParams.
   bool operator==(const AudioParameters& other) const {
     return format_ == other.format() &&
@@ -103,13 +93,10 @@
            channels_ == other.channels() &&
            input_channels_ == other.input_channels() &&
            bits_per_sample_ == other.bits_per_sample() &&
-           frames_per_buffer_ == other.frames_per_buffer() &&
-           effects_ == other.effects();
+           frames_per_buffer_ == other.frames_per_buffer();
   }
 
  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 sample_rate_;               // Sampling frequency/rate.
@@ -121,7 +108,6 @@
   int input_channels_;            // Optional number of input channels.
                                   // Normally 0, but can be set to specify
                                   // synchronized I/O.
-  int effects_;                   // Bitmask using PlatformEffectsMask.
 };
 
 // Comparison is useful when AudioParameters is used with std structures.