Support Opus Ambisonics playback

media/base/audio_decoder_config.cc

 // 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.
 
 #include "media/base/audio_decoder_config.h"
 
 #include "base/logging.h"
 #include "media/base/limits.h"
 #include "media/base/media_util.h"
 
@@ skipping 33 matching lines @@
   codec_ = codec;
   channel_layout_ = channel_layout;
   samples_per_second_ = samples_per_second;
   sample_format_ = sample_format;
   bytes_per_channel_ = SampleFormatToBytesPerChannel(sample_format);
   extra_data_ = extra_data;
   encryption_scheme_ = encryption_scheme;
   seek_preroll_ = seek_preroll;
   codec_delay_ = codec_delay;
 
-  int channels = ChannelLayoutToChannelCount(channel_layout_);
-  bytes_per_frame_ = channels * bytes_per_channel_;
+  // If |channel_layout_| is CHANNEL_LAYOUT_DISCRETE, |channels_| and
+  // |bytes_per_frame_| will be overwritten in SetChannelsForDiscrete()
+  channels_ = ChannelLayoutToChannelCount(channel_layout_);
+  bytes_per_frame_ = channels_ * bytes_per_channel_;
 }
 
 AudioDecoderConfig::~AudioDecoderConfig() {}
 
 bool AudioDecoderConfig::IsValidConfig() const {
   return codec_ != kUnknownAudioCodec &&
          channel_layout_ != CHANNEL_LAYOUT_UNSUPPORTED &&
          bytes_per_channel_ > 0 &&
          bytes_per_channel_ <= limits::kMaxBytesPerSample &&
          samples_per_second_ > 0 &&
@@ skipping 12 matching lines @@
           (encryption_scheme().Matches(config.encryption_scheme())) &&
           (sample_format() == config.sample_format()) &&
           (seek_preroll() == config.seek_preroll()) &&
           (codec_delay() == config.codec_delay()));
 }
 
 std::string AudioDecoderConfig::AsHumanReadableString() const {
   std::ostringstream s;
   s << "codec: " << GetCodecName(codec())
     << " bytes_per_channel: " << bytes_per_channel()
-    << " channel_layout: " << channel_layout()
+    << " channel_layout: " << channel_layout() << " channels: " << channels()
     << " samples_per_second: " << samples_per_second()
     << " sample_format: " << sample_format()
     << " bytes_per_frame: " << bytes_per_frame()
     << " seek_preroll: " << seek_preroll().InMilliseconds() << "ms"
     << " codec_delay: " << codec_delay() << " has extra data? "
     << (extra_data().empty() ? "false" : "true") << " encrypted? "
     << (is_encrypted() ? "true" : "false");
   return s.str();
 }
 
+void AudioDecoderConfig::SetChannelsForDiscrete(int channels) {
+  DCHECK(channel_layout_ == CHANNEL_LAYOUT_DISCRETE ||
+         channels == ChannelLayoutToChannelCount(channel_layout_));
+  channels_ = channels;
+  bytes_per_frame_ = channels_ * bytes_per_channel_;
+}
+
 void AudioDecoderConfig::SetIsEncrypted(bool is_encrypted) {
   if (!is_encrypted) {
     DCHECK(encryption_scheme_.is_encrypted()) << "Config is already clear.";
     encryption_scheme_ = Unencrypted();
   } else {
     DCHECK(!encryption_scheme_.is_encrypted())
         << "Config is already encrypted.";
     // TODO(xhwang): This is only used to guide decoder selection, so set
     // a common encryption scheme that should be supported by all decrypting
     // decoders. We should be able to remove this when we support switching
     // decoders at run time. See http://crbug.com/695595
     encryption_scheme_ = AesCtrEncryptionScheme();
   }
 }
 
 }  // namespace media