diff options
| author | James Dong <jdong@google.com> | 2010-08-10 13:27:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-10 13:27:09 -0700 |
| commit | 701019013dfd15745abf245449c3e17d78bd9570 (patch) | |
| tree | f102238ae54ca1e0ce1f3a0ab041c2e0422f2936 | |
| parent | 8aacc475f8ad4392740ff5be505d58ea713d4110 (diff) | |
| parent | db004e1c9ff995381e204135583c06758ba8f2a3 (diff) | |
| download | frameworks_av-701019013dfd15745abf245449c3e17d78bd9570.zip frameworks_av-701019013dfd15745abf245449c3e17d78bd9570.tar.gz frameworks_av-701019013dfd15745abf245449c3e17d78bd9570.tar.bz2 | |
Merge "Add input buffer size check for software video encoders" into gingerbread
| -rw-r--r-- | media/libstagefright/codecs/avc/enc/AVCEncoder.cpp | 10 | ||||
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp b/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp index 18320cf..6e74279 100644 --- a/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp +++ b/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp @@ -391,8 +391,18 @@ status_t AVCEncoder::read( if (err != OK) { LOGE("Failed to read input video frame: %d", err); outputBuffer->release(); + mInputBuffer->release(); + mInputBuffer = NULL; return err; } + + if (mInputBuffer->size() - ((mVideoWidth * mVideoHeight * 3) >> 1) != 0) { + outputBuffer->release(); + mInputBuffer->release(); + mInputBuffer = NULL; + return UNKNOWN_ERROR; + } + int64_t timeUs; CHECK(mInputBuffer->meta_data()->findInt64(kKeyTime, &timeUs)); outputBuffer->meta_data()->setInt64(kKeyTime, timeUs); diff --git a/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp b/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp index 5002442..1bef0e9 100644 --- a/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp +++ b/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp @@ -292,8 +292,18 @@ status_t M4vH263Encoder::read( if (OK != mSource->read(&mInputBuffer, options)) { LOGE("Failed to read from data source"); outputBuffer->release(); + mInputBuffer->release(); + mInputBuffer = NULL; return UNKNOWN_ERROR; } + + if (mInputBuffer->size() - ((mVideoWidth * mVideoHeight * 3) >> 1) != 0) { + outputBuffer->release(); + mInputBuffer->release(); + mInputBuffer = NULL; + return UNKNOWN_ERROR; + } + int64_t timeUs; CHECK(mInputBuffer->meta_data()->findInt64(kKeyTime, &timeUs)); if (mNextModTimeUs > timeUs) { |