diff options
| author | Chong Zhang <chz@google.com> | 2014-06-26 19:55:23 -0700 |
|---|---|---|
| committer | Chong Zhang <chz@google.com> | 2014-07-08 10:18:33 -0700 |
| commit | 862f8455eaacc1ffb5d8911f0bc7ecc3cf7ec46c (patch) | |
| tree | 27f7ae818997dde8df89fac5b65fd21180b21911 /media/libmediaplayerservice/nuplayer | |
| parent | e8f2c6cfe9afc5b303ab6b0fb51e18ddce512b54 (diff) | |
| download | frameworks_av-862f8455eaacc1ffb5d8911f0bc7ecc3cf7ec46c.zip frameworks_av-862f8455eaacc1ffb5d8911f0bc7ecc3cf7ec46c.tar.gz frameworks_av-862f8455eaacc1ffb5d8911f0bc7ecc3cf7ec46c.tar.bz2 | |
handle emulation_prevention_three_bytes for AVC
bug: 15917805
Change-Id: I824fe7eea807f8faba6b149c31890b7a5df87825
Diffstat (limited to 'media/libmediaplayerservice/nuplayer')
| -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; |