diff options
| author | Andreas Huber <andih@google.com> | 2010-08-11 13:28:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-11 13:28:51 -0700 |
| commit | 1dc1938c477249c0c1adc59043da64386eea4c2d (patch) | |
| tree | ff4e6d511759318b7f8af71cecb712469d1805dc /media/libstagefright/CameraSource.cpp | |
| parent | 9c5945d0fdd6783d8bd393e4444140e76eced518 (diff) | |
| parent | 4d074e81e8a8b3b057d31adcb64a088acad6d15c (diff) | |
| download | frameworks_av-1dc1938c477249c0c1adc59043da64386eea4c2d.zip frameworks_av-1dc1938c477249c0c1adc59043da64386eea4c2d.tar.gz frameworks_av-1dc1938c477249c0c1adc59043da64386eea4c2d.tar.bz2 | |
am 90d1d104: Merge "This code in CameraSource really should hold the lock." into gingerbread
Merge commit '90d1d104272954042d5440f248980e4348e97686' into gingerbread-plus-aosp
* commit '90d1d104272954042d5440f248980e4348e97686':
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 9c48daf..3e31d61 100644 --- a/media/libstagefright/CameraSource.cpp +++ b/media/libstagefright/CameraSource.cpp @@ -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; } } |