diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-06 23:20:04 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-06 23:20:04 +0000 |
| commit | 81dc72e8975fc6f005b0f99707a45edf8b9eb5ce (patch) | |
| tree | 17063b7bc5c85c9eed8fc638807911b73f5b6af9 /media/mp4/box_definitions.h | |
| parent | bdf9c2c9f6c66ffc202eaad8738157a16e3409ad (diff) | |
| download | chromium_src-81dc72e8975fc6f005b0f99707a45edf8b9eb5ce.zip chromium_src-81dc72e8975fc6f005b0f99707a45edf8b9eb5ce.tar.gz chromium_src-81dc72e8975fc6f005b0f99707a45edf8b9eb5ce.tar.bz2 | |
Revert 145617 - Add HE AAC support to ISO BMFF.
1. Parse esds box to get HE AAC config.
2. Send audio config from AAC header to decoder instead of the one embedded in SampleDescription.
3. Convert raw audio data into ADTS before sending to decoder.
4. Abstract general bit stream code from H264BitReader into media::BitReader.
BUG=134445
TEST=BitReaderTest, AACTest
Review URL: https://chromiumcodereview.appspot.com/10710002
TBR=xiaomings@google.com
Review URL: https://chromiumcodereview.appspot.com/10693115
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145621 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, 0 insertions, 9 deletions
diff --git a/media/mp4/box_definitions.h b/media/mp4/box_definitions.h index 0b7e771..52a0e86 100644 --- a/media/mp4/box_definitions.h +++ b/media/mp4/box_definitions.h @@ -11,7 +11,6 @@ #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" @@ -185,13 +184,6 @@ struct VideoSampleEntry : Box { AVCDecoderConfigurationRecord avcc; }; -struct ElementaryStreamDescriptor : Box { - DECLARE_BOX_METHODS(ElementaryStreamDescriptor); - - uint8 object_type; - AAC aac; -}; - struct AudioSampleEntry : Box { DECLARE_BOX_METHODS(AudioSampleEntry); @@ -202,7 +194,6 @@ struct AudioSampleEntry : Box { uint32 samplerate; ProtectionSchemeInfo sinf; - ElementaryStreamDescriptor esds; }; struct SampleDescription : Box { |