Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add input buffer size check for software video encoders" into gingerbread

Browse Source
This commit is contained in:
James Dong
2010-08-10 13:27:09 -07:00
committed by Android (Google) Code Review
parent 18f0174ff4 e6daea5940
commit 10ed3f7438
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media/libstagefright/codecs/avc/enc/AVCEncoder.cpp
View File

@@ -391,8 +391,18 @@ status_t AVCEncoder::read(
if (err != OK) { if (err != OK) {
LOGE("Failed to read input video frame: %d", err); LOGE("Failed to read input video frame: %d", err);
outputBuffer->release(); outputBuffer->release();
mInputBuffer->release();
mInputBuffer = NULL;
return err; return err;
} }
if (mInputBuffer->size() - ((mVideoWidth * mVideoHeight * 3) >> 1) != 0) {
outputBuffer->release();
mInputBuffer->release();
mInputBuffer = NULL;
return UNKNOWN_ERROR;
}
int64_t timeUs; int64_t timeUs;
CHECK(mInputBuffer->meta_data()->findInt64(kKeyTime, &timeUs)); CHECK(mInputBuffer->meta_data()->findInt64(kKeyTime, &timeUs));
outputBuffer->meta_data()->setInt64(kKeyTime, timeUs); outputBuffer->meta_data()->setInt64(kKeyTime, timeUs);

10
media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
View File

@@ -292,8 +292,18 @@ status_t M4vH263Encoder::read(
if (OK != mSource->read(&mInputBuffer, options)) { if (OK != mSource->read(&mInputBuffer, options)) {
LOGE("Failed to read from data source"); LOGE("Failed to read from data source");
outputBuffer->release(); outputBuffer->release();
mInputBuffer->release();
mInputBuffer = NULL;
return UNKNOWN_ERROR; return UNKNOWN_ERROR;
} }
if (mInputBuffer->size() - ((mVideoWidth * mVideoHeight * 3) >> 1) != 0) {
outputBuffer->release();
mInputBuffer->release();
mInputBuffer = NULL;
return UNKNOWN_ERROR;
}
int64_t timeUs; int64_t timeUs;
CHECK(mInputBuffer->meta_data()->findInt64(kKeyTime, &timeUs)); CHECK(mInputBuffer->meta_data()->findInt64(kKeyTime, &timeUs));
if (mNextModTimeUs > timeUs) { if (mNextModTimeUs > timeUs) {