diff options
| author | Andreas Huber <andih@google.com> | 2011-01-26 16:40:04 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-26 16:40:04 -0800 |
| commit | 05b8794654688079247c5d1d5b59dd0d288fd436 (patch) | |
| tree | 2b2ce6b211a5849d8fae263fb99668b2e400d3c1 /media | |
| parent | c39aa13da5600571affee13ea8ef3936cc39cbb5 (diff) | |
| parent | 97a38b4f1be201bbbfa23d298bb779fffd624a3d (diff) | |
| download | frameworks_av-05b8794654688079247c5d1d5b59dd0d288fd436.zip frameworks_av-05b8794654688079247c5d1d5b59dd0d288fd436.tar.gz frameworks_av-05b8794654688079247c5d1d5b59dd0d288fd436.tar.bz2 | |
am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
* commit '2dce338e01678620db0734fc3d84bcb3f2512d62':
DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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 @@ sp<ABuffer> AMPEG4AudioAssembler::removeLATMFraming(const sp<ABuffer> &buffer) { } } - 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; } |