summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Levin <dendy@ti.com>2013-02-19 14:23:35 +0200
committerHashcode <hashcode0f@gmail.com>2015-02-03 13:39:18 -0800
commit5602082ce3b3922820e9c442f5b6c9284f3e2620 (patch)
tree546fb4e06236509548cbfe144c1fe64a9859da51
parenta603d727088717a2e442d71a6f09439e3bc09d0e (diff)
downloadhardware_ti_omap4-5602082ce3b3922820e9c442f5b6c9284f3e2620.zip
hardware_ti_omap4-5602082ce3b3922820e9c442f5b6c9284f3e2620.tar.gz
hardware_ti_omap4-5602082ce3b3922820e9c442f5b6c9284f3e2620.tar.bz2
CameraHal: Fix double OMX_Deinit() call
In case performCleanupAfterError() is called without further HAL crash OMX component will be in deinitialized state. Thus it must be marked as uninialized to avoid double deinitialization attempt in OMXCameraAdapter destructor. Change-Id: I65bf7e6ca0acef4b3740d967b6846b5e91136874 Signed-off-by: Daniel Levin <dendy@ti.com>
-rw-r--r--camera/OMXCameraAdapter/OMXCameraAdapter.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
index 47e245c..6166c1c 100644
--- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
+++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
@@ -408,6 +408,7 @@ void OMXCameraAdapter::performCleanupAfterError()
///De-init the OMX
OMX_Deinit();
mComponentState = OMX_StateInvalid;
+ mOmxInitialized = false;
}
OMXCameraAdapter::OMXCameraPortParameters *OMXCameraAdapter::getPortParams(CameraFrame::FrameType frameType)