diff options
| author | Jan Olof Svensson <janolof.svensson@sonyericsson.com> | 2012-09-26 09:08:11 +0200 |
|---|---|---|
| committer | Johan Redestig <johan.redestig@sonymobile.com> | 2012-11-19 10:44:31 +0100 |
| commit | 0fd2883dbe2841b7b35f1e7581e5d9d59e58ad97 (patch) | |
| tree | 069eb4a3fe1a0d0ddcd9f551533126012d8b80d2 /media/libstagefright/MPEG4Extractor.cpp | |
| parent | f0e3acd06af00c07bfb541090b5349618fa67507 (diff) | |
| download | frameworks_av-0fd2883dbe2841b7b35f1e7581e5d9d59e58ad97.zip frameworks_av-0fd2883dbe2841b7b35f1e7581e5d9d59e58ad97.tar.gz frameworks_av-0fd2883dbe2841b7b35f1e7581e5d9d59e58ad97.tar.bz2 | |
Handle large AVCC chunks
If enabling seq_scaling_matrix_present_flag = 1 the AVCC chunk can
be larger than the original buffer size. Changed to using ABuffer
instead.
Change-Id: Idacc14b45ea2634c5e608919f3ce567f23363135
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
| -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 dc8e4a3..07b5405 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; |