Add HE AAC support to ISO BMFF.

media/mp4/box_definitions.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/box_definitions.h"
 
 #include "base/logging.h"
 #include "media/mp4/box_reader.h"
 #include "media/mp4/fourccs.h"
 #include "media/mp4/rcheck.h"
@@ skipping 371 matching lines @@
   // (http://crbug.com/132351)
   //
   //  if (format == FOURCC_AVC1 ||
   //      (format == FOURCC_ENCV &&
   //       sinf.format.format == FOURCC_AVC1)) {
     RCHECK(reader->ReadChild(&avcc));
   //  }
   return true;
 }
 
+ElementaryStreamDescriptor::ElementaryStreamDescriptor() {}
+
+ElementaryStreamDescriptor::~ElementaryStreamDescriptor() {}
+
+FourCC ElementaryStreamDescriptor::BoxType() const {
+  return FOURCC_ESDS;
+}
+
+bool ElementaryStreamDescriptor::Parse(BoxReader* reader) {
+  std::vector<uint8> data;
+
+  RCHECK(reader->ReadFullBoxHeader());
+  RCHECK(reader->ReadVec(&data, reader->size() - reader->pos()));
+  RCHECK(aac.Initialize(data));

[acolwell GONE FROM CHROMIUM, 2012/06/28 17:31:25]

What do you think about renaming this to Parse() to be consistent with the rest
of this code?

+
+  return true;
+}
+
 AudioSampleEntry::AudioSampleEntry()
     : format(FOURCC_NULL),
       data_reference_index(0),
       channelcount(0),
       samplesize(0),
       samplerate(0) {}
 
 AudioSampleEntry::~AudioSampleEntry() {}
+
 FourCC AudioSampleEntry::BoxType() const {
   DCHECK(false) << "AudioSampleEntry should be parsed according to the "
                 << "handler type recovered in its Media ancestor.";
   return FOURCC_NULL;
 }
 
 bool AudioSampleEntry::Parse(BoxReader* reader) {
   format = reader->type();
   RCHECK(reader->SkipBytes(6) &&
          reader->Read2(&data_reference_index) &&
          reader->SkipBytes(8) &&
          reader->Read2(&channelcount) &&
          reader->Read2(&samplesize) &&
          reader->SkipBytes(4) &&
          reader->Read4(&samplerate));
   // Convert from 16.16 fixed point to integer
   samplerate >>= 16;
 
   RCHECK(reader->ScanChildren());
   if (format == FOURCC_ENCA) {
     RCHECK(reader->ReadChild(&sinf));
   }
+  RCHECK(reader->ReadChild(&esds));
   return true;
 }
 
 MediaHeader::MediaHeader()
     : creation_time(0),
       modification_time(0),
       timescale(0),
       duration(0) {}
 MediaHeader::~MediaHeader() {}
 FourCC MediaHeader::BoxType() const { return FOURCC_MDHD; }
@@ skipping 262 matching lines @@
 bool MovieFragment::Parse(BoxReader* reader) {
   RCHECK(reader->ScanChildren() &&
          reader->ReadChild(&header) &&
          reader->ReadChildren(&tracks) &&
          reader->MaybeReadChildren(&pssh));
   return true;
 }
 
 }  // namespace mp4
 }  // namespace media