summaryrefslogtreecommitdiffstats
path: root/camera/AppCallbackNotifier.cpp
diff options
context:
space:
mode:
authorPrasanna Kumar M.R <prasanna.kumarmr@ti.com>2012-01-05 17:09:21 -0600
committerDaniel Levin <dendy@ti.com>2012-07-25 08:55:38 -0500
commit2a617994cf34a50361b68127c564e3324c411c12 (patch)
treef154b776b60db6643e32c9e6c98873d565ac11b9 /camera/AppCallbackNotifier.cpp
parent587429a4c4c03ac97aa40218133369178f47b3a7 (diff)
downloadhardware_ti_omap4-2a617994cf34a50361b68127c564e3324c411c12.zip
hardware_ti_omap4-2a617994cf34a50361b68127c564e3324c411c12.tar.gz
hardware_ti_omap4-2a617994cf34a50361b68127c564e3324c411c12.tar.bz2
CameraHAL : Propogate no memory error to Mediaserver
During Video Rotation use cases, we encounter TILER Out of memory scenario. This error is not propogated to mediaserver and hence the Memory is not freed. This patch allows us to communiate this error which inturn results in restarting mediaserver and Camera can be reused again. Change-Id: Iea2340f1ab89d0eff73360c6aa59e951d6dcf735 Signed-off-by: Sathya Prakash M R <a0393677@ti.com> Signed-off-by: Prasanna Kumar M R <x0118059@ti.com>
Diffstat (limited to 'camera/AppCallbackNotifier.cpp')
-rw-r--r--camera/AppCallbackNotifier.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/camera/AppCallbackNotifier.cpp b/camera/AppCallbackNotifier.cpp
index 943f79e..629dee5 100644
--- a/camera/AppCallbackNotifier.cpp
+++ b/camera/AppCallbackNotifier.cpp
@@ -246,7 +246,9 @@ void AppCallbackNotifier::errorNotify(int error)
CAMHAL_LOGEB("AppCallbackNotifier received error %d", error);
// If it is a fatal error abort here!
- if((error == CAMERA_ERROR_FATAL) || (error == CAMERA_ERROR_HARD)) {
+ // If TILER is Out of memory we notify Mediaserver so that Memory is cleared and we can restart usecase
+ if((error == CAMERA_ERROR_FATAL) || (error == CAMERA_ERROR_HARD) || (error == -ENOMEM))
+ {
//We kill media server if we encounter these errors as there is
//no point continuing and apps also don't handle errors other
//than media server death always.