Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1049241 - [MADAI][Multimedia] Cannot play some RTSP link due to error in MP4A-LATM assembler. r=sworkman

Browse Source
This commit is contained in:
Ethan Tseng 2014-09-03 10:54:54 +08:00
parent da624ae685
commit aed1b15db2
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
netwerk/protocol/rtsp/rtsp/AMPEG4AudioAssembler.cpp
View File

@ -381,7 +381,11 @@ sp<ABuffer> AMPEG4AudioAssembler::removeLATMFraming(const sp<ABuffer> &buffer) {
unsigned muxSlotLengthBytes = 0;
unsigned tmp;
do {
CHECK_LT(offset, buffer->size());
if (offset >= buffer->size()) {
LOGI("Malformed packet found in removeLATMFraming");
mAccessUnitDamaged = true;
return out;
}
tmp = ptr[offset++];
muxSlotLengthBytes += tmp;
} while (tmp == 0xff);
@ -407,7 +411,11 @@ sp<ABuffer> AMPEG4AudioAssembler::removeLATMFraming(const sp<ABuffer> &buffer) {
}
}
CHECK_LE(offset + payloadLength, buffer->size());
if ((offset + payloadLength) > buffer->size()) {
LOGI("Malformed packet found in removeLATMFraming");
mAccessUnitDamaged = true;
return out;
}
memcpy(out->data() + out->size(), &ptr[offset], payloadLength);
out->setRange(0, out->size() + payloadLength);
@ -552,17 +560,13 @@ void AMPEG4AudioAssembler::submitAccessUnit() {
memcpy((uint8_t *)accessUnit->data() + offset,
unit->data(), unit->size());
offset += unit->size();
++it;
}
accessUnit = removeLATMFraming(accessUnit);
CopyTimes(accessUnit, *mPackets.begin());
#if 0
printf(mAccessUnitDamaged ? "X" : ".");
fflush(stdout);
#endif
if (mAccessUnitDamaged) {
accessUnit->meta()->setInt32("damaged", true);
}