Add AAC codec specific data for MSE on android

media/mp4/aac.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/mp4/aac.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "media/base/bit_reader.h"
@@ skipping 171 matching lines @@
   adts[2] = ((profile_ - 1) << 6) + (frequency_index_ << 2) +
       (channel_config_ >> 2);
   adts[3] = ((channel_config_ & 0x3) << 6) + (size >> 11);
   adts[4] = (size & 0x7ff) >> 3;
   adts[5] = ((size & 7) << 5) + 0x1f;
   adts[6] = 0xfc;
 
   return true;
 }
 
+#if defined(OS_ANDROID)
+std::vector<uint8> AAC::GetCodecSpecificData() const {
+  std::vector<uint8> csd;

[acolwell GONE FROM CHROMIUM, 2013/05/29 22:37:25]

I don't believe this is sufficient for all cases. I think you really should just
store a copy of the vector passed to Parse() and return that.

[qinmin, 2013/05/30 03:07:55]

Done.

+  csd.push_back(profile_ << 3 | frequency_index_ >> 1);
+  csd.push_back((frequency_index_ & 0x01) << 7 | channel_config_ << 3);
+  return csd;
+}
+#endif
+
 // Currently this function only support GASpecificConfig defined in
 // ISO 14496 Part 3 Table 4.1 - Syntax of GASpecificConfig()
 bool AAC::SkipDecoderGASpecificConfig(BitReader* bit_reader) const {
   switch (profile_) {
     case 1:
     case 2:
     case 3:
     case 4:
     case 6:
     case 7:
@@ skipping 61 matching lines @@
 
     RCHECK(bit_reader->ReadBits(1, &dummy));  // extensionFlag3
   }
 
   return true;
 }
 
 }  // namespace mp4
 
 }  // namespace media