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

am 90d1d104: Merge "This code in CameraSource really should hold the lock." into gingerbread

Browse Source 
Merge commit '90d1d104272954042d5440f248980e4348e97686' into gingerbread-plus-aosp

* commit '90d1d104272954042d5440f248980e4348e97686':
  This code in CameraSource really should hold the lock.
This commit is contained in:
Andreas Huber
2010-08-11 13:28:51 -07:00
committed by Android Git Automerger
parent 79cb9a5d2d 90d1d10427
commit 136d8336b6
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/libstagefright/CameraSource.cpp
View File

@@ -244,6 +244,7 @@ void CameraSource::releaseOneRecordingFrame(const sp<IMemory>& frame) {
void CameraSource::signalBufferReturned(MediaBuffer *buffer) {
LOGV("signalBufferReturned: %p", buffer->data());
Mutex::Autolock autoLock(mLock);
for (List<sp<IMemory> >::iterator it = mFramesBeingEncoded.begin();
it != mFramesBeingEncoded.end(); ++it) {
if ((*it)->pointer() == buffer->data()) {
@@ -312,6 +313,7 @@ status_t CameraSource::read(
(*buffer)->setObserver(this);
(*buffer)->add_ref();
(*buffer)->meta_data()->setInt64(kKeyTime, frameTime);
return OK;
}
}