commit d415bebbcaeb3faebc9d7f058d9f1e6a371d9fb1
author Shuzhen Wang <shuzhenw@codeaurora.org> Fri Feb 08 10:28:16 2013 -0800
committer Shuzhen Wang <shuzhenw@codeaurora.org> Wed Feb 13 15:16:29 2013 -0800
tree 84148151e3cb5d636033e0c617301a5824c73779
parent 3acad5d59e8d8701464100b514cc5d28ed302585

Camera2: Enable frameskip for thermal mitigation

Use system property to switch between fps adjustment
and isp frameskip.

For FPS adjustment, when maximum adjustment is needed,
instead of applying minimum fps range, apply minimum
fps for the minimum range.

Change-Id: I1704d6b8ccd590f95ae06bbdcd37869d18b554e0

QCamera2/HAL/QCameraStateMachine.cpp

diff --git a/QCamera2/HAL/QCameraStateMachine.cpp b/QCamera2/HAL/QCameraStateMachine.cpp
index 8bc0ede..1e119dd 100644
--- a/QCamera2/HAL/QCameraStateMachine.cpp
+++ b/QCamera2/HAL/QCameraStateMachine.cpp
@@ -1062,7 +1062,8 @@
         break;
     case QCAMERA_SM_EVT_THERMAL_NOTIFY:
         {
-            rc = m_parent->updateThermalFPS((cam_fps_range_t *) payload);
+            rc = m_parent->updateThermalLevel(
+                    *(qcamera_thermal_level_enum_t *)&payload);
         }
         break;
     case QCAMERA_SM_EVT_JPEG_EVT_NOTIFY:
@@ -1607,7 +1608,8 @@
         break;
     case QCAMERA_SM_EVT_THERMAL_NOTIFY:
         {
-            rc = m_parent->updateThermalFPS((cam_fps_range_t *) payload);
+            rc = m_parent->updateThermalLevel(
+                    *(qcamera_thermal_level_enum_t *)&payload);
         }
         break;
     case QCAMERA_SM_EVT_JPEG_EVT_NOTIFY:
@@ -1890,7 +1892,8 @@
         break;
     case QCAMERA_SM_EVT_THERMAL_NOTIFY:
         {
-            rc = m_parent->updateThermalFPS((cam_fps_range_t *) payload);
+            rc = m_parent->updateThermalLevel(
+                    *(qcamera_thermal_level_enum_t *)&payload);
         }
         break;
     default:
@@ -2187,7 +2190,8 @@
         break;
     case QCAMERA_SM_EVT_THERMAL_NOTIFY:
         {
-            rc = m_parent->updateThermalFPS((cam_fps_range_t *) payload);
+            rc = m_parent->updateThermalLevel(
+                    *(qcamera_thermal_level_enum_t *)&payload);
         }
         break;
     default: