diff options
| author | Andreas Huber <andih@google.com> | 2012-11-20 09:24:25 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-20 09:24:25 -0800 |
| commit | 12407d6a5161226bf9c29057d187892498fc566c (patch) | |
| tree | bc1c3b480bfb9a1a29a3c9f0c4741648d340ea8f | |
| parent | fcc6d852b6efb93c1f189399446e4219578cc311 (diff) | |
| parent | 35c96b589ed8095a0d3a7dfd166b40180c0cf84c (diff) | |
| download | frameworks_av-12407d6a5161226bf9c29057d187892498fc566c.zip frameworks_av-12407d6a5161226bf9c29057d187892498fc566c.tar.gz frameworks_av-12407d6a5161226bf9c29057d187892498fc566c.tar.bz2 | |
am 7013209c: Merge "Handle large AVCC chunks"
* commit '7013209cdf393b3d958ddd46ed50394349378826':
Handle large AVCC chunks
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index cc71d4c..b2afec7 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -30,6 +30,7 @@ #include <string.h> #include <media/stagefright/foundation/ABitReader.h> +#include <media/stagefright/foundation/ABuffer.h> #include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/foundation/AMessage.h> #include <media/stagefright/DataSource.h> @@ -1221,18 +1222,15 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { case FOURCC('a', 'v', 'c', 'C'): { - char buffer[256]; - if (chunk_data_size > (off64_t)sizeof(buffer)) { - return ERROR_BUFFER_TOO_SMALL; - } + sp<ABuffer> buffer = new ABuffer(chunk_data_size); if (mDataSource->readAt( - data_offset, buffer, chunk_data_size) < chunk_data_size) { + data_offset, buffer->data(), chunk_data_size) < chunk_data_size) { return ERROR_IO; } mLastTrack->meta->setData( - kKeyAVCC, kTypeAVCC, buffer, chunk_data_size); + kKeyAVCC, kTypeAVCC, buffer->data(), chunk_data_size); *offset += chunk_size; break; |