diff options
| author | Andreas Huber <andih@google.com> | 2011-01-26 15:50:04 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-26 15:50:04 -0800 |
| commit | 8ce64ddc2828f74704a6473c4b934de16c0e3bd1 (patch) | |
| tree | d88da128f80d8254ee92202fa835c5c5e31669c8 /media | |
| parent | f26fec6212dcada2a1ffb642afe25429d1005aa4 (diff) | |
| parent | 9202cca86e9017cc5ce30970c92a91ab32a0835e (diff) | |
| download | frameworks_av-8ce64ddc2828f74704a6473c4b934de16c0e3bd1.zip frameworks_av-8ce64ddc2828f74704a6473c4b934de16c0e3bd1.tar.gz frameworks_av-8ce64ddc2828f74704a6473c4b934de16c0e3bd1.tar.bz2 | |
Merge "This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes." into honeycomb
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; } |