diff options
| author | James Dong <jdong@google.com> | 2011-03-02 14:00:56 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-02 14:00:56 -0800 |
| commit | d08f27ee5b0bd6dee4942bbefd02dc4add09d742 (patch) | |
| tree | 9a37624266c1edbe87db6c06de373ffb10b32d06 /media | |
| parent | 971ec7a65ba9523651643aabfdafff7eb0734734 (diff) | |
| parent | c096a1308e4637ce75f993719cbe651ad90af40f (diff) | |
| download | frameworks_base-d08f27ee5b0bd6dee4942bbefd02dc4add09d742.zip frameworks_base-d08f27ee5b0bd6dee4942bbefd02dc4add09d742.tar.gz frameworks_base-d08f27ee5b0bd6dee4942bbefd02dc4add09d742.tar.bz2 | |
Merge "PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp b/media/libstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp index 8b0250a..d443b7c 100644 --- a/media/libstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp +++ b/media/libstagefright/codecs/mp3dec/src/pvmp3_decode_header.cpp @@ -121,9 +121,11 @@ ERROR_CODE pvmp3_decode_header(tmp3Bits *inputStream, uint32 temp; /* - * Verify that at least the header is complete + * Verify that at least the header is complete + * Note that SYNC_WORD_LNGTH is in unit of bits, but inputBufferCurrentLength + * is in unit of bytes. */ - if (inputStream->inputBufferCurrentLength < (SYNC_WORD_LNGTH + 21)) + if (inputStream->inputBufferCurrentLength < ((SYNC_WORD_LNGTH + 21) >> 3)) { return NO_ENOUGH_MAIN_DATA_ERROR; } |