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

Merge "This code in CameraSource really should hold the lock." into gingerbread

Browse Source
This commit is contained in:
Andreas Huber
2010-08-11 13:20:59 -07:00
committed by Android (Google) Code Review
parent 9902196f98 22bd242478
commit 90d1d10427
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) { void CameraSource::signalBufferReturned(MediaBuffer *buffer) {
LOGV("signalBufferReturned: %p", buffer->data()); LOGV("signalBufferReturned: %p", buffer->data());
Mutex::Autolock autoLock(mLock);
for (List<sp<IMemory> >::iterator it = mFramesBeingEncoded.begin(); for (List<sp<IMemory> >::iterator it = mFramesBeingEncoded.begin();
it != mFramesBeingEncoded.end(); ++it) { it != mFramesBeingEncoded.end(); ++it) {
if ((*it)->pointer() == buffer->data()) { if ((*it)->pointer() == buffer->data()) {
@@ -312,6 +313,7 @@ status_t CameraSource::read(
(*buffer)->setObserver(this); (*buffer)->setObserver(this);
(*buffer)->add_ref(); (*buffer)->add_ref();
(*buffer)->meta_data()->setInt64(kKeyTime, frameTime); (*buffer)->meta_data()->setInt64(kKeyTime, frameTime);
return OK; return OK;
} }
} }