summaryrefslogtreecommitdiffstats
path: root/media/mp4/aac.h
diff options
context:
space:
mode:
authorstrobe@google.com <strobe@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-29 04:24:17 +0000
committerstrobe@google.com <strobe@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-29 04:24:17 +0000
commitd1c8bb00d18fb44a7aa6acd604409b83896be1a5 (patch)
tree8185c7c15d12eb1eb5391eb4daa3739044a41313 /media/mp4/aac.h
parente963af50ea8b125c18ea850c81022f7d12da2490 (diff)
downloadchromium_src-d1c8bb00d18fb44a7aa6acd604409b83896be1a5.zip
chromium_src-d1c8bb00d18fb44a7aa6acd604409b83896be1a5.tar.gz
chromium_src-d1c8bb00d18fb44a7aa6acd604409b83896be1a5.tar.bz2
Fix encrypted AAC in BMFF by adding subsample info.
AAC audio is sent to the Source Buffer in ADTS format, which requires adding a header to each media sample. Encrypted subsample information was not being adjusted to compensate for the extra clear bytes. TEST=Manual, pending audio decryption support in decoder BUG=132351 Review URL: https://chromiumcodereview.appspot.com/10886022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153854 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/mp4/aac.h')
-rw-r--r--media/mp4/aac.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/mp4/aac.h b/media/mp4/aac.h
index 73464ee..e12b6a4 100644
--- a/media/mp4/aac.h
+++ b/media/mp4/aac.h
@@ -46,6 +46,9 @@ class MEDIA_EXPORT AAC {
// unchanged.
bool ConvertEsdsToADTS(std::vector<uint8>* buffer) const;
+ // Size in bytes of the ADTS header added by ConvertEsdsToADTS().
+ static const size_t kADTSHeaderSize = 7;
+
private:
bool SkipDecoderGASpecificConfig(BitReader* bit_reader) const;
bool SkipErrorSpecificConfig() const;