Add AAC codec specific data for MSE on android

media/mp4/mp4_stream_parser.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/mp4_stream_parser.h"
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/time.h"
@@ skipping 234 matching lines @@
         sample_format = kSampleFormatS16;
       } else if (entry.samplesize == 32) {
         sample_format = kSampleFormatS32;
       } else {
         LOG(ERROR) << "Unsupported sample size.";
         return false;
       }
 
       is_audio_track_encrypted_ = entry.sinf.info.track_encryption.is_encrypted;
       DVLOG(1) << "is_audio_track_encrypted_: " << is_audio_track_encrypted_;
+#if defined(OS_ANDROID)
+      if (ESDescriptor::IsAAC(audio_type)) {
+        std::vector<uint8> csd = aac.GetCodecSpecificData();

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

How about something like this instead?

std::vector<uint8> extra_data;
#if defined(OS_ANDROID)
if (ESDescriptor::IsAAC(audio_type))
  extra_data = aac.GetCodecSpecificData();
#endif
audio_config.Initialize(
  codec, sample_format, channel_layout, sample_per_second,
  extra_data.size() ? &extra_data[0] : NULL, extra_data.size(),
  is_audio_track_encrypted_, false);

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

Done.

+        CHECK_EQ(2u, csd.size());
+        audio_config.Initialize(
+            codec, sample_format,channel_layout,sample_per_second,
+            &csd[0], csd.size(), is_audio_track_encrypted_, false);
+      } else {
+#endif
       audio_config.Initialize(codec, sample_format,
                               channel_layout,
                               sample_per_second,
                               NULL, 0, is_audio_track_encrypted_, false);
+#if defined(OS_ANDROID)
+      }
+#endif
       has_audio_ = true;
       audio_track_id_ = track->header.track_id;
     }
     if (track->media.handler.type == kVideo && !video_config.IsValidConfig()) {
       RCHECK(!samp_descr.video_entries.empty());
       if (desc_idx >= samp_descr.video_entries.size())
         desc_idx = 0;
       const VideoSampleEntry& entry = samp_descr.video_entries[desc_idx];
 
       if (!(entry.format == FOURCC_AVC1 ||
@@ skipping 294 matching lines @@
   return !err;
 }
 
 void MP4StreamParser::ChangeState(State new_state) {
   DVLOG(2) << "Changing state: " << new_state;
   state_ = new_state;
 }
 
 }  // namespace mp4
 }  // namespace media