diff options
author | Wei Jia <wjia@google.com> | 2014-12-03 14:10:16 -0800 |
---|---|---|
committer | Wei Jia <wjia@google.com> | 2014-12-04 15:14:08 -0800 |
commit | 15ebd70bdb7aeb3d5ce309710dbd64c0ea038113 (patch) | |
tree | a652122861b7fe962d95b4571d60da4be0cf7440 /media/libstagefright/mpeg2ts | |
parent | 814cbb4e33396fce559475270d6f6c0bd7c43fc5 (diff) | |
download | frameworks_av-15ebd70bdb7aeb3d5ce309710dbd64c0ea038113.zip frameworks_av-15ebd70bdb7aeb3d5ce309710dbd64c0ea038113.tar.gz frameworks_av-15ebd70bdb7aeb3d5ce309710dbd64c0ea038113.tar.bz2 |
avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer.
ESQueue: allow one PES playload contains multiple ADTS AAC frames.
Bug: 18532335
Change-Id: I1f42017cff139d5e932e0aaa3e7d33164d1a48e7
Diffstat (limited to 'media/libstagefright/mpeg2ts')
-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; } |