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

Stagefright: Return error if codec takes too long to return a buffer.

Browse Source 
There are many scenarios where the codec may not return a valid buffer.
In such a case, the OMXCodec::read() call hangs indefitely. Therefore,
wait() call is replaced with waitRelative() so that it timesout after a
few seconds and we exit gracefully.

Change-Id: Ie03c5d1e979b71f6253efcaa0665aa5e541cebe2
Signed-off-by: Anu Sundararajan <sanuradha@ti.com>
This commit is contained in:
Anu Sundararajan
2011-04-14 17:09:35 -05:00
parent 08d9d9a462
commit e086ad8dd4
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
media/libstagefright/OMXCodec.cpp
View File

@@ -3015,6 +3015,8 @@ sp<MetaData> OMXCodec::getFormat() {
status_t OMXCodec::read(
MediaBuffer **buffer, const ReadOptions *options) {
status_t wait_status = 0;
*buffer = NULL;
Mutex::Autolock autoLock(mLock);
@@ -3084,12 +3086,20 @@ status_t OMXCodec::read(
}
while (mSeekTimeUs >= 0) {
mBufferFilled.wait(mLock);
wait_status = mBufferFilled.waitRelative(mLock, 3000000000);
if (wait_status) {
LOGE("Timed out waiting for the buffer! Line %d", __LINE__);
return UNKNOWN_ERROR;
}
}
}
while (mState != ERROR && !mNoMoreOutputData && mFilledBuffers.empty()) {
mBufferFilled.wait(mLock);
wait_status = mBufferFilled.waitRelative(mLock, 3000000000);
if (wait_status) {
LOGE("Timed out waiting for the buffer! Line %d", __LINE__);
return UNKNOWN_ERROR;
}
}
if (mState == ERROR) {