diff options
author | Wei Jia <wjia@google.com> | 2014-12-05 02:53:21 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-05 02:53:21 +0000 |
commit | 25bad49ce75758b2f68b278f54d7272b1cf4d08c (patch) | |
tree | 8bb5fe9cb0061af9733cd41626bbafbc1d113872 /media/libstagefright/mpeg2ts/ESQueue.cpp | |
parent | 561f50de82ce47f11ba8d4f25db1ca1d8467b2a7 (diff) | |
parent | 852dc963a53487f2e2f197ab095299aed9c60a5e (diff) | |
download | frameworks_av-25bad49ce75758b2f68b278f54d7272b1cf4d08c.zip frameworks_av-25bad49ce75758b2f68b278f54d7272b1cf4d08c.tar.gz frameworks_av-25bad49ce75758b2f68b278f54d7272b1cf4d08c.tar.bz2 |
am 852dc963: Merge "avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer." into lmp-mr1-dev
* commit '852dc963a53487f2e2f197ab095299aed9c60a5e':
avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer.
Diffstat (limited to 'media/libstagefright/mpeg2ts/ESQueue.cpp')
-rw-r--r-- | media/libstagefright/mpeg2ts/ESQueue.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libstagefright/mpeg2ts/ESQueue.cpp b/media/libstagefright/mpeg2ts/ESQueue.cpp index db5d23e..042f4e6 100644 --- a/media/libstagefright/mpeg2ts/ESQueue.cpp +++ b/media/libstagefright/mpeg2ts/ESQueue.cpp @@ -346,12 +346,13 @@ status_t ElementaryStreamQueue::appendData( } if (frameLength != size - startOffset) { - ALOGW("got ADTS AAC frame length %zd instead of %zd", + ALOGW("First ADTS AAC frame length is %zd bytes, " + "while the buffer size is %zd bytes.", frameLength, size - startOffset); } data = &ptr[startOffset]; - size = frameLength; + size -= startOffset; #endif break; } |