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

am 81002eb9: am bf1071c0: Merge change 23356 into eclair

Browse Source 
Merge commit '81002eb9ccd60e936b8960ddd3ce92af81dd2c14'

* commit '81002eb9ccd60e936b8960ddd3ce92af81dd2c14':
  Temporarily unlock our mutex while fetching a buffer from the upstream source.
This commit is contained in:
Andreas Huber
2009-08-31 16:56:46 -07:00
committed by Android Git Automerger
parent 61e06289bb 81002eb9cc
commit cf68d5b82a
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;
}
// 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;
status_t err;
if (mSeekTimeUs >= 0) {
@@ -1328,10 +1332,13 @@ void OMXCodec::drainInputBuffer(BufferInfo *info) {
options.setSeekTo(mSeekTimeUs);
mSeekTimeUs = -1;
mLock.unlock();
err = mSource->read(&srcBuffer, &options);
} else {
mLock.unlock();
err = mSource->read(&srcBuffer);
}
mLock.lock();
OMX_U32 flags = OMX_BUFFERFLAG_ENDOFFRAME;
OMX_TICKS timestamp = 0;