commit 56223b96c2f6de5998496fac9d6703f06adc1dca
author Andreas Huber <andih@google.com> Wed Aug 11 12:34:32 2010 -0700
committer Andreas Huber <andih@google.com> Wed Aug 11 12:34:32 2010 -0700
tree b62362142b689dde3c98df42ff7763c72b91e9aa
parent 701019013dfd15745abf245449c3e17d78bd9570

This code in CameraSource really should hold the lock.

Change-Id: I349520a14776bb83b7edb23fc62052b487246d9a

media/libstagefright/CameraSource.cpp

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::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 @@
                 (*buffer)->setObserver(this);
                 (*buffer)->add_ref();
                 (*buffer)->meta_data()->setInt64(kKeyTime, frameTime);
+
                 return OK;
             }
         }