Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 136d8336 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

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

Merge commit '90d1d104' into gingerbread-plus-aosp

* commit '90d1d104':
  This code in CameraSource really should hold the lock.
parents 79cb9a5d 90d1d104

media/libstagefright/CameraSource.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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;

            }

        }