drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2

Browse Source
This commit is contained in:
Andreas Huber
2011-05-17 10:29:36 -07:00
committed by Android (Google) Code Review
parent a7f52d4665 b1071331c0
commit c56e81c887
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/libstagefright/matroska/MatroskaExtractor.cpp
View File

@ -660,7 +660,8 @@ static void addESDSFromAudioSpecificInfo(
// AudioSpecificInfo (with size prefix) follows // 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; size_t esdsSize = sizeof(kStaticESDS) + asiSize + 1;
uint8_t *esds = new uint8_t[esdsSize]; uint8_t *esds = new uint8_t[esdsSize];
memcpy(esds, kStaticESDS, sizeof(kStaticESDS)); memcpy(esds, kStaticESDS, sizeof(kStaticESDS));
@ -668,6 +669,11 @@ static void addESDSFromAudioSpecificInfo(
*ptr++ = asiSize; *ptr++ = asiSize;
memcpy(ptr, asi, 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); meta->setData(kKeyESDS, 0, esds, esdsSize);
delete[] esds; delete[] esds;