Add HE AAC support to ISO BMFF.

media/mp4/box_definitions.cc

Index: media/mp4/box_definitions.cc
diff --git a/media/mp4/box_definitions.cc b/media/mp4/box_definitions.cc
index c4e14e9309114fb9455a19becede28cc81775cca..6325836af89759568bd65b936851b1fe578206b8 100644
--- a/media/mp4/box_definitions.cc
+++ b/media/mp4/box_definitions.cc
@@ -389,6 +389,24 @@ bool VideoSampleEntry::Parse(BoxReader* reader) {
   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),
@@ -397,6 +415,7 @@ AudioSampleEntry::AudioSampleEntry()
       samplerate(0) {}
 
 AudioSampleEntry::~AudioSampleEntry() {}
+
 FourCC AudioSampleEntry::BoxType() const {
   DCHECK(false) << "AudioSampleEntry should be parsed according to the "
                 << "handler type recovered in its Media ancestor.";
@@ -419,6 +438,7 @@ bool AudioSampleEntry::Parse(BoxReader* reader) {
   if (format == FOURCC_ENCA) {
     RCHECK(reader->ReadChild(&sinf));
   }
+  RCHECK(reader->ReadChild(&esds));
   return true;
 }