diff options
| author | Andreas Huber <andih@google.com> | 2011-01-26 15:40:56 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2011-01-26 16:03:33 -0800 |
| commit | 97a38b4f1be201bbbfa23d298bb779fffd624a3d (patch) | |
| tree | 8670ca8035b00d491260ae70d9c5e8397cb2618f | |
| parent | bfa2f13fd3f463dbceea4d3a18c3124e70df0a05 (diff) | |
| download | frameworks_av-97a38b4f1be201bbbfa23d298bb779fffd624a3d.zip frameworks_av-97a38b4f1be201bbbfa23d298bb779fffd624a3d.tar.gz frameworks_av-97a38b4f1be201bbbfa23d298bb779fffd624a3d.tar.bz2 | |
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
| -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; } |