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

Merge "The AMRSource failed to properly release a media buffer in case of error."

Browse Source
This commit is contained in:
Andreas Huber
2010-02-16 11:48:33 -08:00
committed by Android (Google) Code Review
parent bb50863c07 bc8342721d
commit cf06dd0a8a
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
media/libstagefright/AMRExtractor.cpp
View File

@@ -225,27 +225,32 @@ status_t AMRSource::read(
return ERROR_IO;
}
MediaBuffer *buffer;
status_t err = mGroup->acquire_buffer(&buffer);
if (err != OK) {
return err;
}
if (header & 0x83) {
// Padding bits must be 0.
LOGE("padding bits must be 0, header is 0x%02x", header);
return ERROR_MALFORMED;
}
unsigned FT = (header >> 3) & 0x0f;
if (FT > 8 || (!mIsWide && FT > 7)) {
LOGE("illegal AMR frame type %d", FT);
return ERROR_MALFORMED;
}
size_t frameSize = getFrameSize(mIsWide, FT);
CHECK_EQ(frameSize, mFrameSize);
MediaBuffer *buffer;
status_t err = mGroup->acquire_buffer(&buffer);
if (err != OK) {
return err;
}
n = mDataSource->readAt(mOffset, buffer->data(), frameSize);
if (n != (ssize_t)frameSize) {