diff options
| author | Yamit Mehta <ymehta@codeaurora.org> | 2015-07-13 11:49:05 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:24:02 -0600 |
| commit | 02d7869783899e432b2592d76a4d5c69cd597b5a (patch) | |
| tree | 40cd70baeb1a3955a14dceb264375e2513bfcd80 /media/libstagefright/MPEG4Extractor.cpp | |
| parent | f462de9dac6a858ab42447a67ba5077e3effb04e (diff) | |
| download | frameworks_av-02d7869783899e432b2592d76a4d5c69cd597b5a.zip frameworks_av-02d7869783899e432b2592d76a4d5c69cd597b5a.tar.gz frameworks_av-02d7869783899e432b2592d76a4d5c69cd597b5a.tar.bz2 | |
libstagefright: Add check for bits avail to read
- If number of bits available to read from ABitReader
is zero,do not call getBits.
Change-Id: I4b7332b03ed6ee1d7b6711e5b4c5dce396151b03
CRs-Fixed: 777657
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
| -rwxr-xr-x | media/libstagefright/MPEG4Extractor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 38ae6f3..e88e90f 100755 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -3123,7 +3123,7 @@ status_t MPEG4Extractor::updateAudioTrackInfoFromESDS_MPEG4Audio( extensionFlag, objectType); } - if (numChannels == 0) { + if (numChannels == 0 && (br.numBitsLeft() > 0)) { int32_t channelsEffectiveNum = 0; int32_t channelsNum = 0; if (br.numBitsLeft() < 32) { |