diff options
| author | Tyler Luu <tluu@ti.com> | 2012-05-31 20:11:09 -0500 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-11-26 18:22:45 +0200 |
| commit | b24efeafb4207d00fe666785e51062789da2fa3f (patch) | |
| tree | 4ac176f4f1dd0b5c4faee2aba6f4a81485af5f08 /camera/BufferSourceAdapter.cpp | |
| parent | 9e824fcae87184ffdbf772e07348ba3c90f31f45 (diff) | |
| download | hardware_ti_omap4-b24efeafb4207d00fe666785e51062789da2fa3f.tar.gz hardware_ti_omap4-b24efeafb4207d00fe666785e51062789da2fa3f.tar.bz2 hardware_ti_omap4-b24efeafb4207d00fe666785e51062789da2fa3f.zip | |
Camera HAL: BSA: Move mLock in handleFrameCallback
Move mLock to protect mBuffers check in handleFrameCallback.
need to protect the check in case mBuffers is freed.
Change-Id: I1849cca245c2ed57380e615cd916db2d7d9400b4
Signed-off-by: Tyler Luu <tluu@ti.com>
Signed-off-by: Vladimir Petrov <vppetrov@mm-sol.com>
Diffstat (limited to 'camera/BufferSourceAdapter.cpp')
| -rw-r--r-- | camera/BufferSourceAdapter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/camera/BufferSourceAdapter.cpp b/camera/BufferSourceAdapter.cpp index c542741..b34f8cb 100644 --- a/camera/BufferSourceAdapter.cpp +++ b/camera/BufferSourceAdapter.cpp @@ -672,13 +672,13 @@ void BufferSourceAdapter::handleFrameCallback(CameraFrame* frame) int i; android::GraphicBufferMapper &mapper = android::GraphicBufferMapper::get(); + android::AutoMutex lock(mLock); + if (!mBuffers || !frame->mBuffer) { CAMHAL_LOGEA("Adapter sent BufferSourceAdapter a NULL frame?"); return; } - android::AutoMutex lock(mLock); - for ( i = 0; i < mBufferCount; i++ ) { if (frame->mBuffer == &mBuffers[i]) { break; |