diff options
| author | Andreas Huber <andih@google.com> | 2011-01-26 19:06:43 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-26 19:06:43 -0800 |
| commit | 94172b1f44c1b12f6ee814d9def6a5550663b716 (patch) | |
| tree | f736f52fc83552c870ee5ee6da9608125f91e470 /media | |
| parent | d7376cae7aba269dca143b94c3d6736d0ed02213 (diff) | |
| parent | 0152b3345900679b79dff77e88b856016c10cb5b (diff) | |
| download | frameworks_av-94172b1f44c1b12f6ee814d9def6a5550663b716.zip frameworks_av-94172b1f44c1b12f6ee814d9def6a5550663b716.tar.gz frameworks_av-94172b1f44c1b12f6ee814d9def6a5550663b716.tar.bz2 | |
am bba92023: am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb
* commit 'bba92023e55f46e8b4f8b81b3412e663a5e71ceb':
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; } |