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

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

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2011-08-01 13:43:07 -07:00
committed by Android Code Review
parent 01caec8c41 e086ad8dd4
commit 5e57c2cf83
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( status_t OMXCodec::read(
MediaBuffer **buffer, const ReadOptions *options) { MediaBuffer **buffer, const ReadOptions *options) {
status_t wait_status = 0;
*buffer = NULL; *buffer = NULL;
Mutex::Autolock autoLock(mLock); Mutex::Autolock autoLock(mLock);
@@ -3084,12 +3086,20 @@ status_t OMXCodec::read(
} }
while (mSeekTimeUs >= 0) { 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()) { 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) { if (mState == ERROR) {