Skip to content

Commit 2dce338

Browse files
committed
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
And now we're just ignoring them. Yay standards. Change-Id: Ia8c0b9161e606152fb681f0dda3ba901954dc749 related-to-bug: 3353752
1 parent 1d07b5b commit 2dce338

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,10 @@ sp<ABuffer> AMPEG4AudioAssembler::removeLATMFraming(const sp<ABuffer> &buffer) {
359359
}
360360
}
361361

362-
CHECK_EQ(offset, buffer->size());
362+
if (offset < buffer->size()) {
363+
LOGI("ignoring %d bytes of trailing data", buffer->size() - offset);
364+
}
365+
CHECK_LE(offset, buffer->size());
363366

364367
return out;
365368
}

0 commit comments

Comments
 (0)