Add HE AAC support to ISO BMFF.

media/mp4/box_definitions.h

 // 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.
 
 #ifndef MEDIA_MP4_BOX_DEFINITIONS_H_
 #define MEDIA_MP4_BOX_DEFINITIONS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "media/base/media_export.h"
+#include "media/mp4/aac.h"
 #include "media/mp4/avc.h"
 #include "media/mp4/box_reader.h"
 #include "media/mp4/fourccs.h"
 
 namespace media {
 namespace mp4 {
 
 enum TrackType {
   kInvalid = 0,
   kVideo,
@@ skipping 153 matching lines @@
   uint16 width;
   uint16 height;
 
   PixelAspectRatioBox pixel_aspect;
   ProtectionSchemeInfo sinf;
 
   // Currently expected to be present regardless of format.
   AVCDecoderConfigurationRecord avcc;
 };
 
+struct ElementaryStreamDescriptor : Box {
+  DECLARE_BOX_METHODS(ElementaryStreamDescriptor);
+
+  uint8 object_type;
+  AAC aac;
+};
+
 struct AudioSampleEntry : Box {
   DECLARE_BOX_METHODS(AudioSampleEntry);
 
   FourCC format;
   uint16 data_reference_index;
   uint16 channelcount;
   uint16 samplesize;
   uint32 samplerate;
 
   ProtectionSchemeInfo sinf;
+  ElementaryStreamDescriptor esds;
 };
 
 struct SampleDescription : Box {
   DECLARE_BOX_METHODS(SampleDescription);
 
   TrackType type;
   std::vector<VideoSampleEntry> video_entries;
   std::vector<AudioSampleEntry> audio_entries;
 };
 
@@ skipping 122 matching lines @@
   std::vector<TrackFragment> tracks;
   std::vector<ProtectionSystemSpecificHeader> pssh;
 };
 
 #undef DECLARE_BOX
 
 }  // namespace mp4
 }  // namespace media
 
 #endif  // MEDIA_MP4_BOX_DEFINITIONS_H_