diff options
| author | Andreas Huber <andih@google.com> | 2010-08-11 13:32:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-11 13:32:36 -0700 |
| commit | 030b888ef6a586a1f0fafe0adc4312f775878d2b (patch) | |
| tree | a191025ad3eb2a71013eda550f4ae3e5d6f3802c /media/libstagefright/CameraSource.cpp | |
| parent | ad2df1d0776066dc7c2e203390c336451238684a (diff) | |
| parent | 1dc1938c477249c0c1adc59043da64386eea4c2d (diff) | |
| download | frameworks_av-030b888ef6a586a1f0fafe0adc4312f775878d2b.zip frameworks_av-030b888ef6a586a1f0fafe0adc4312f775878d2b.tar.gz frameworks_av-030b888ef6a586a1f0fafe0adc4312f775878d2b.tar.bz2 | |
am 136d8336: am 90d1d104: Merge "This code in CameraSource really should hold the lock." into gingerbread
Merge commit '136d8336b6cb18067cd783185dacef34ae785519'
* commit '136d8336b6cb18067cd783185dacef34ae785519':
This code in CameraSource really should hold the lock.
Diffstat (limited to 'media/libstagefright/CameraSource.cpp')
| -rw-r--r-- | media/libstagefright/CameraSource.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp index 5e7dd5c..9ccd140 100644 --- a/media/libstagefright/CameraSource.cpp +++ b/media/libstagefright/CameraSource.cpp @@ -260,6 +260,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()) { @@ -327,6 +328,7 @@ status_t CameraSource::read( (*buffer)->setObserver(this); (*buffer)->add_ref(); (*buffer)->meta_data()->setInt64(kKeyTime, frameTime); + return OK; } } |