diff options
| author | Chong Zhang <chz@google.com> | 2014-07-08 20:52:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-08 17:33:57 +0000 |
| commit | 718cee5f3ba7c0a055fbeced90f26296f8acb117 (patch) | |
| tree | c051432b32783dd4072bc460abd9fdc008d947c1 /media/libmediaplayerservice | |
| parent | e8eb7a885e574858ddfe3dfd836fbe9ce62f92b8 (diff) | |
| parent | 862f8455eaacc1ffb5d8911f0bc7ecc3cf7ec46c (diff) | |
| download | frameworks_av-718cee5f3ba7c0a055fbeced90f26296f8acb117.zip frameworks_av-718cee5f3ba7c0a055fbeced90f26296f8acb117.tar.gz frameworks_av-718cee5f3ba7c0a055fbeced90f26296f8acb117.tar.bz2 | |
Merge "handle emulation_prevention_three_bytes for AVC"
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp index 5abfb71..dd73cc4 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp @@ -674,9 +674,9 @@ bool NuPlayer::CCDecoder::extractFromSEI(const sp<ABuffer> &accessUnit) { bool hasCC = false; - ABitReader br(sei->data() + 1, sei->size() - 1); + NALBitReader br(sei->data() + 1, sei->size() - 1); // sei_message() - while (br.numBitsLeft() >= 16) { // at least 16-bit for sei_message() + while (br.atLeastNumBitsLeft(16)) { // at least 16-bit for sei_message() uint32_t payload_type = 0; size_t payload_size = 0; uint8_t last_byte; |