commit | 9202cca86e9017cc5ce30970c92a91ab32a0835e | [log] [tgz] |
---|---|---|
author | Andreas Huber <andih@google.com> | Wed Jan 26 15:40:56 2011 -0800 |
committer | Andreas Huber <andih@google.com> | Wed Jan 26 15:40:56 2011 -0800 |
tree | 6611163219eccbc6adfaefe5f9cde414f54be9a6 | |
parent | 7757f5010a771fb8824b6fdf9788f588a1577e3f [diff] |
This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes. And now we're just ignoring them. Yay standards. Change-Id: I76529ad8d585f143d6f99621ff671d179caf7b35 related-to-bug: 3353752
diff --git a/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp b/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp index bbde516..8bfe285 100644 --- a/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp +++ b/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
@@ -359,7 +359,10 @@ } } - CHECK_EQ(offset, buffer->size()); + if (offset < buffer->size()) { + LOGI("ignoring %d bytes of trailing data", buffer->size() - offset); + } + CHECK_LE(offset, buffer->size()); return out; }