diff options
| author | Andreas Huber <andih@google.com> | 2011-01-26 15:52:48 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-26 15:52:48 -0800 |
| commit | 0152b3345900679b79dff77e88b856016c10cb5b (patch) | |
| tree | 9cae663d55ebad2e257d0bcbc67cb90ba7086b7b /media | |
| parent | 84d3a304c835017cdc530eb9d8e92198021d3e4c (diff) | |
| parent | 8ce64ddc2828f74704a6473c4b934de16c0e3bd1 (diff) | |
| download | frameworks_av-0152b3345900679b79dff77e88b856016c10cb5b.zip frameworks_av-0152b3345900679b79dff77e88b856016c10cb5b.tar.gz frameworks_av-0152b3345900679b79dff77e88b856016c10cb5b.tar.bz2 | |
am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb
* commit '63b38e31aaea5a3e75c7bbe0c9e40e8bdb78ff73':
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; } |