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

Merge change 23356 into eclair

Browse Source 
* changes:
  Temporarily unlock our mutex while fetching a buffer from the upstream source.
This commit is contained in:
Android (Google) Code Review
2009-08-31 16:44:46 -07:00
parent 450ff8a48c 6db4aad623
commit bf1071c079
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/libstagefright/OMXCodec.cpp
View File

@@ -1321,6 +1321,10 @@ void OMXCodec::drainInputBuffer(BufferInfo *info) {
return; return;
} }
// We're going to temporarily give up the lock while reading data
// from the source. A certain client unfortunately chose to have the
// thread supplying input data and reading output data be the same...
MediaBuffer *srcBuffer; MediaBuffer *srcBuffer;
status_t err; status_t err;
if (mSeekTimeUs >= 0) { if (mSeekTimeUs >= 0) {
@@ -1328,10 +1332,13 @@ void OMXCodec::drainInputBuffer(BufferInfo *info) {
options.setSeekTo(mSeekTimeUs); options.setSeekTo(mSeekTimeUs);
mSeekTimeUs = -1; mSeekTimeUs = -1;
mLock.unlock();
err = mSource->read(&srcBuffer, &options); err = mSource->read(&srcBuffer, &options);
} else { } else {
mLock.unlock();
err = mSource->read(&srcBuffer); err = mSource->read(&srcBuffer);
} }
mLock.lock();
OMX_U32 flags = OMX_BUFFERFLAG_ENDOFFRAME; OMX_U32 flags = OMX_BUFFERFLAG_ENDOFFRAME;
OMX_TICKS timestamp = 0; OMX_TICKS timestamp = 0;