diff options
author | Andreas Huber <andih@google.com> | 2011-05-17 10:31:58 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-17 10:31:58 -0700 |
commit | bf81d4be0514265875d7deffe50c31a344f6eac5 (patch) | |
tree | f8b84c49de909b53e02c2a4890a9bed5f3f2a0c9 /media | |
parent | 21f1d49f0eac47c1ebbabf82f145dc60f988d069 (diff) | |
parent | c56e81c88706d79ce51a314b5bfd3e247ca6f86c (diff) | |
download | frameworks_base-bf81d4be0514265875d7deffe50c31a344f6eac5.zip frameworks_base-bf81d4be0514265875d7deffe50c31a344f6eac5.tar.gz frameworks_base-bf81d4be0514265875d7deffe50c31a344f6eac5.tar.bz2 |
am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
* commit 'c56e81c88706d79ce51a314b5bfd3e247ca6f86c':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/matroska/MatroskaExtractor.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp index 733de92..642835a 100644 --- a/media/libstagefright/matroska/MatroskaExtractor.cpp +++ b/media/libstagefright/matroska/MatroskaExtractor.cpp @@ -660,7 +660,8 @@ static void addESDSFromAudioSpecificInfo( // AudioSpecificInfo (with size prefix) follows }; - CHECK(asiSize < 128); + // Make sure all sizes can be coded in a single byte. + CHECK(asiSize + 22 - 2 < 128); size_t esdsSize = sizeof(kStaticESDS) + asiSize + 1; uint8_t *esds = new uint8_t[esdsSize]; memcpy(esds, kStaticESDS, sizeof(kStaticESDS)); @@ -668,6 +669,11 @@ static void addESDSFromAudioSpecificInfo( *ptr++ = asiSize; memcpy(ptr, asi, asiSize); + // Increment by codecPrivateSize less 2 bytes that are accounted for + // already in lengths of 22/17 + esds[1] += asiSize - 2; + esds[6] += asiSize - 2; + meta->setData(kKeyESDS, 0, esds, esdsSize); delete[] esds; |