Fix channel layout reporting for implicit signalling of AAC parametric stereo

media/mp4/aac.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_MP4_AAC_H_
 #define MEDIA_MP4_AAC_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 20 matching lines @@
   // then it will parse the ElementaryStreamDescriptor to get audio stream
   // configurations.
   bool Parse(const std::vector<uint8>& data);
 
   // Gets the output sample rate for the AAC stream.
   // |sbr_in_mimetype| should be set to true if the SBR mode is
   // signalled in the mimetype. (ie mp4a.40.5 in the codecs parameter).
   // Returns the samples_per_second value that should used in an
   // AudioDecoderConfig.
   int GetOutputSamplesPerSecond(bool sbr_in_mimetype) const;
-  ChannelLayout channel_layout() const;
+
+  // Gets the channel layout for the AAC stream.
+  // |sbr_in_mimetype| should be set to true if the SBR mode is
+  // signalled in the mimetype. (ie mp4a.40.5 in the codecs parameter).
+  // Returns the channel_layout value that should used in an
+  // AudioDecoderConfig.
+  ChannelLayout GetChannelLayout(bool sbr_in_mimetype) const;
 
   // This function converts a raw AAC frame into an AAC frame with an ADTS
   // header. On success, the function returns true and stores the converted data
   // in the buffer. The function returns false on failure and leaves the buffer
   // unchanged.
   bool ConvertEsdsToADTS(std::vector<uint8>* buffer) const;
 
   // Size in bytes of the ADTS header added by ConvertEsdsToADTS().
   static const size_t kADTSHeaderSize = 7;
 
@@ skipping 15 matching lines @@
   int frequency_;
   int extension_frequency_;
   ChannelLayout channel_layout_;
 };
 
 }  // namespace mp4
 
 }  // namespace media
 
 #endif  // MEDIA_MP4_AAC_H_