diff options
| author | xiaomings@google.com <xiaomings@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 19:43:45 +0000 |
|---|---|---|
| committer | xiaomings@google.com <xiaomings@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-19 19:43:45 +0000 |
| commit | 279a07fae05681f3d40f1466e3c4aa8e3e67028b (patch) | |
| tree | 1081535465632787800ab0fd933e69dd88f2c051 /media/mp4/box_definitions.h | |
| parent | 968ff687d1cd2608cfbe8af26b8f352587074f40 (diff) | |
| download | chromium_src-279a07fae05681f3d40f1466e3c4aa8e3e67028b.zip chromium_src-279a07fae05681f3d40f1466e3c4aa8e3e67028b.tar.gz chromium_src-279a07fae05681f3d40f1466e3c4aa8e3e67028b.tar.bz2 | |
Add HE AAC support to ISO BMFF.
Was https://chromiumcodereview.appspot.com/10753005/.
The original cl also includes abstraction of BitReader class used by H264Parser. It includes bugs that break the H264Parser.
In this cl I removed the abstraction and make the BitReader used by H264Parser independent to the one used by esds parser because of:
1. The original cl introduce bugs.
2. Even if we fix the bugs, we may not be able to make the generalized class as fast as the old one while keeping the abstraction.
3. The H264 bit stream use very special syntax on escaping and trailing zero bits, which might not be a good candidate for abstraction.
BUG=134445
TEST=BitReaderTest, AACTest
Review URL: https://chromiumcodereview.appspot.com/10780026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/mp4/box_definitions.h')
| -rw-r--r-- | media/mp4/box_definitions.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/media/mp4/box_definitions.h b/media/mp4/box_definitions.h index 7f7384b..0b19a5c 100644 --- a/media/mp4/box_definitions.h +++ b/media/mp4/box_definitions.h @@ -11,6 +11,7 @@ #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" @@ -184,6 +185,13 @@ struct MEDIA_EXPORT VideoSampleEntry : Box { AVCDecoderConfigurationRecord avcc; }; +struct MEDIA_EXPORT ElementaryStreamDescriptor : Box { + DECLARE_BOX_METHODS(ElementaryStreamDescriptor); + + uint8 object_type; + AAC aac; +}; + struct MEDIA_EXPORT AudioSampleEntry : Box { DECLARE_BOX_METHODS(AudioSampleEntry); @@ -194,6 +202,7 @@ struct MEDIA_EXPORT AudioSampleEntry : Box { uint32 samplerate; ProtectionSchemeInfo sinf; + ElementaryStreamDescriptor esds; }; struct MEDIA_EXPORT SampleDescription : Box { |