Add HE AAC support to ISO BMFF.

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"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/stream_parser_buffer.h"
 #include "media/base/video_decoder_config.h"
 #include "media/mp4/box_definitions.h"
 #include "media/mp4/box_reader.h"
+#include "media/mp4/es_descriptor.h"
 #include "media/mp4/rcheck.h"
 
 namespace media {
 namespace mp4 {
 
 MP4StreamParser::MP4StreamParser()
     : state_(kWaitingForInit),
       moof_head_(0),
       mdat_tail_(0),
       has_audio_(false),
@@ skipping 142 matching lines @@
     desc_idx -= 1;  // BMFF descriptor index is one-based
 
     if (track->media.handler.type == kAudio && !audio_config.IsValidConfig()) {
       RCHECK(!samp_descr.audio_entries.empty());
 
       // It is not uncommon to find otherwise-valid files with incorrect sample
       // description indices, so we fail gracefully in that case.
       if (static_cast<uint32>(desc_idx) >= samp_descr.audio_entries.size())
         desc_idx = 0;
       const AudioSampleEntry& entry = samp_descr.audio_entries[desc_idx];
+      const AAC& aac = entry.esds.aac;
 
       // TODO(strobe): We accept all format values, pending clarification on
       // the formats used for encrypted media (http://crbug.com/132351).
       //  RCHECK(entry.format == FOURCC_MP4A ||
       //         (entry.format == FOURCC_ENCA &&
       //          entry.sinf.format.format == FOURCC_MP4A));
 
-      const ChannelLayout layout =
-          AVC::ConvertAACChannelCountToChannelLayout(entry.channelcount);
-      audio_config.Initialize(kCodecAAC, entry.samplesize, layout,
-                              entry.samplerate, NULL, 0, false);
+      // Check if it is MPEG4 AAC defined in ISO 14496 Part 3.
+      RCHECK(entry.esds.object_type == kISO_14496_3);
+      audio_config.Initialize(kCodecAAC, entry.samplesize,
+                              aac.channel_layout(), aac.frequency(),
+                              NULL, 0, false);
+
       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 (static_cast<uint32>(desc_idx) >= samp_descr.video_entries.size())
         desc_idx = 0;
       const VideoSampleEntry& entry = samp_descr.video_entries[desc_idx];
 
       //  RCHECK(entry.format == FOURCC_AVC1 ||
@@ skipping 85 matching lines @@
 
   std::vector<uint8> frame_buf(buf, buf + runs_->sample_size());
   if (video) {
     const AVCDecoderConfigurationRecord& avc_config =
         runs_->video_description().avcc;
     RCHECK(AVC::ConvertToAnnexB(avc_config.length_size, &frame_buf));
     if (runs_->is_keyframe())
       RCHECK(AVC::InsertParameterSets(avc_config, &frame_buf));
   }
 
+  if (audio) {
+    const AAC& aac = runs_->audio_description().esds.aac;
+    RCHECK(aac.ConvertEsdsToADTS(&frame_buf));
+  }
+
   scoped_refptr<StreamParserBuffer> stream_buf =
     StreamParserBuffer::CopyFrom(&frame_buf[0], frame_buf.size(),
                                  runs_->is_keyframe());
 
   stream_buf->SetDuration(runs_->duration());
   stream_buf->SetTimestamp(runs_->cts());
   stream_buf->SetDecodeTimestamp(runs_->dts());
 
   DVLOG(3) << "Pushing frame: aud=" << audio
            << ", key=" << runs_->is_keyframe()
@@ skipping 52 matching lines @@
   return true;
 }
 
 void MP4StreamParser::ChangeState(State new_state) {
   DVLOG(2) << "Changing state: " << new_state;
   state_ = new_state;
 }
 
 }  // namespace mp4
 }  // namespace media