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

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

Browse Source 
* commit 'a2616220d24b994e79fcbf33f7ce8a311fa9e8ac':
  Stagefright: Return error if codec takes too long to return a buffer.
This commit is contained in:
Jean-Baptiste Queru
2011-08-01 13:59:02 -07:00
committed by Android Git Automerger
parent f01b3cfa9a a2616220d2
commit 5bb3129c7e
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) {