Support Opus Ambisonics playback

media/base/audio_decoder_config.h

Index: media/base/audio_decoder_config.h
diff --git a/media/base/audio_decoder_config.h b/media/base/audio_decoder_config.h
index 86a8dc1fbb989cff5fae6a701566f2d648f6df50..f84e2194f1fa00e4b74bf3f91f60f9e9c279842c 100644
--- a/media/base/audio_decoder_config.h
+++ b/media/base/audio_decoder_config.h
@@ -63,10 +63,18 @@ class MEDIA_EXPORT AudioDecoderConfig {
   // output only.
   std::string AsHumanReadableString() const;
 
+  void SetChannelsForDiscrete(int channels) {

[DaleCurtis, 2017/05/24 00:49:58]

should be in .cc file. Should also DCHECK that is only called for discrete or
equals the layout.

[flim-chromium, 2017/05/25 00:04:25]

Done.

+    if (channel_layout_ == CHANNEL_LAYOUT_DISCRETE) {
+      channels_ = channels;
+      bytes_per_frame_ = channels_ * bytes_per_channel_;
+    }
+  }
+
   AudioCodec codec() const { return codec_; }
   int bits_per_channel() const { return bytes_per_channel_ * 8; }
   int bytes_per_channel() const { return bytes_per_channel_; }
   ChannelLayout channel_layout() const { return channel_layout_; }
+  int channels() const { return channels_; }
   int samples_per_second() const { return samples_per_second_; }
   SampleFormat sample_format() const { return sample_format_; }
   int bytes_per_frame() const { return bytes_per_frame_; }
@@ -96,6 +104,7 @@ class MEDIA_EXPORT AudioDecoderConfig {
   SampleFormat sample_format_;
   int bytes_per_channel_;
   ChannelLayout channel_layout_;
+  int channels_;
   int samples_per_second_;
   int bytes_per_frame_;
   std::vector<uint8_t> extra_data_;