QCamera2: Port HAL for 64 bit platforms
- Added -Wextra compiler warning level.
- Avoiding implicit datatype conversions
and also pointer to integer conversions,
including literals.
- Avoiding pointer conversions between different types
other than (void*).
- Using 'size_t' to store memory size and indexes.
- Removed some unused variables.
- Changed datatype of some iterators to match their
corresponding limiter types.
- Using double instead of float where possible.
- Changed bitmasks to unsigned types.
- Updated printf/scanf format string specifiers to match
actual type of arguments.
- Using 'String8' instead of 'char[]' where possible
at QCameraParameters.
- Checking result of QCameraMemory::getSize().
- Fixes build errors and warnings.
CRs-Fixed: 641033
Change-Id: Ief2157b32e447af422456165552ee170a82d2652
diff --git a/QCamera2/HAL/QCameraStateMachine.cpp b/QCamera2/HAL/QCameraStateMachine.cpp
index 1765197..1936527 100644
--- a/QCamera2/HAL/QCameraStateMachine.cpp
+++ b/QCamera2/HAL/QCameraStateMachine.cpp
@@ -323,7 +323,7 @@
break;
case QCAMERA_SM_EVT_ENABLE_MSG_TYPE:
{
- rc = m_parent->enableMsgType(int32_t(payload));
+ rc = m_parent->enableMsgType(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -332,7 +332,7 @@
break;
case QCAMERA_SM_EVT_DISABLE_MSG_TYPE:
{
- rc = m_parent->disableMsgType(int32_t(payload));
+ rc = m_parent->disableMsgType(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -341,7 +341,7 @@
break;
case QCAMERA_SM_EVT_MSG_TYPE_ENABLED:
{
- int enabled = m_parent->msgTypeEnabled(int32_t(payload));
+ int enabled = m_parent->msgTypeEnabled(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_ENABLE_FLAG;
@@ -461,7 +461,7 @@
break;
case QCAMERA_SM_EVT_STORE_METADATA_IN_BUFS:
{
- rc = m_parent->storeMetaDataInBuffers(int(payload));
+ rc = m_parent->storeMetaDataInBuffers(*((int *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -470,7 +470,7 @@
break;
case QCAMERA_SM_EVT_DUMP:
{
- rc = m_parent->dump((int)payload);
+ rc = m_parent->dump(*((int *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -542,7 +542,7 @@
case QCAMERA_SM_EVT_THERMAL_NOTIFY:
{
rc = m_parent->updateThermalLevel(
- *(qcamera_thermal_level_enum_t *)&payload);
+ *((qcamera_thermal_level_enum_t *)payload));
}
break;
case QCAMERA_SM_EVT_EVT_NOTIFY:
@@ -641,7 +641,7 @@
break;
case QCAMERA_SM_EVT_ENABLE_MSG_TYPE:
{
- rc = m_parent->enableMsgType(int32_t(payload));
+ rc = m_parent->enableMsgType(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -650,7 +650,7 @@
break;
case QCAMERA_SM_EVT_DISABLE_MSG_TYPE:
{
- rc = m_parent->disableMsgType(int32_t(payload));
+ rc = m_parent->disableMsgType(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -659,7 +659,7 @@
break;
case QCAMERA_SM_EVT_MSG_TYPE_ENABLED:
{
- int enabled = m_parent->msgTypeEnabled(int32_t(payload));
+ int enabled = m_parent->msgTypeEnabled(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_ENABLE_FLAG;
@@ -757,7 +757,7 @@
break;
case QCAMERA_SM_EVT_STORE_METADATA_IN_BUFS:
{
- rc = m_parent->storeMetaDataInBuffers(int(payload));
+ rc = m_parent->storeMetaDataInBuffers(*((int *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -766,7 +766,7 @@
break;
case QCAMERA_SM_EVT_DUMP:
{
- rc = m_parent->dump((int)payload);
+ rc = m_parent->dump(*((int *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -925,7 +925,7 @@
break;
case QCAMERA_SM_EVT_ENABLE_MSG_TYPE:
{
- rc = m_parent->enableMsgType(int32_t(payload));
+ rc = m_parent->enableMsgType(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -934,7 +934,7 @@
break;
case QCAMERA_SM_EVT_DISABLE_MSG_TYPE:
{
- rc = m_parent->disableMsgType(int32_t(payload));
+ rc = m_parent->disableMsgType(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -943,7 +943,7 @@
break;
case QCAMERA_SM_EVT_MSG_TYPE_ENABLED:
{
- int enabled = m_parent->msgTypeEnabled(int32_t(payload));
+ int enabled = m_parent->msgTypeEnabled(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_ENABLE_FLAG;
@@ -1048,7 +1048,7 @@
break;
case QCAMERA_SM_EVT_STORE_METADATA_IN_BUFS:
{
- rc = m_parent->storeMetaDataInBuffers(int(payload));
+ rc = m_parent->storeMetaDataInBuffers(*((int *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -1057,7 +1057,7 @@
break;
case QCAMERA_SM_EVT_DUMP:
{
- rc = m_parent->dump((int)payload);
+ rc = m_parent->dump(*((int *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -1259,7 +1259,7 @@
case QCAMERA_SM_EVT_THERMAL_NOTIFY:
{
rc = m_parent->updateThermalLevel(
- *(qcamera_thermal_level_enum_t *)&payload);
+ *((qcamera_thermal_level_enum_t *)payload));
}
break;
case QCAMERA_SM_EVT_SNAPSHOT_DONE:
@@ -1467,7 +1467,7 @@
break;
case QCAMERA_SM_EVT_ENABLE_MSG_TYPE:
{
- rc = m_parent->enableMsgType(int32_t(payload));
+ rc = m_parent->enableMsgType(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -1476,7 +1476,7 @@
break;
case QCAMERA_SM_EVT_DISABLE_MSG_TYPE:
{
- rc = m_parent->disableMsgType(int32_t(payload));
+ rc = m_parent->disableMsgType(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -1485,7 +1485,7 @@
break;
case QCAMERA_SM_EVT_MSG_TYPE_ENABLED:
{
- int enabled = m_parent->msgTypeEnabled(int32_t(payload));
+ int enabled = m_parent->msgTypeEnabled(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_ENABLE_FLAG;
@@ -1559,7 +1559,7 @@
break;
case QCAMERA_SM_EVT_STORE_METADATA_IN_BUFS:
{
- rc = m_parent->storeMetaDataInBuffers(int(payload));
+ rc = m_parent->storeMetaDataInBuffers(*((int *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -1568,7 +1568,7 @@
break;
case QCAMERA_SM_EVT_DUMP:
{
- rc = m_parent->dump((int)payload);
+ rc = m_parent->dump(*((int *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -1766,7 +1766,7 @@
case QCAMERA_SM_EVT_THERMAL_NOTIFY:
{
rc = m_parent->updateThermalLevel(
- *(qcamera_thermal_level_enum_t *)&payload);
+ *((qcamera_thermal_level_enum_t *)payload));
}
break;
default:
@@ -1829,7 +1829,7 @@
break;
case QCAMERA_SM_EVT_ENABLE_MSG_TYPE:
{
- rc = m_parent->enableMsgType(int32_t(payload));
+ rc = m_parent->enableMsgType(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -1838,7 +1838,7 @@
break;
case QCAMERA_SM_EVT_DISABLE_MSG_TYPE:
{
- rc = m_parent->disableMsgType(int32_t(payload));
+ rc = m_parent->disableMsgType(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -1847,7 +1847,7 @@
break;
case QCAMERA_SM_EVT_MSG_TYPE_ENABLED:
{
- int enabled = m_parent->msgTypeEnabled(int32_t(payload));
+ int enabled = m_parent->msgTypeEnabled(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_ENABLE_FLAG;
@@ -1916,7 +1916,7 @@
break;
case QCAMERA_SM_EVT_STORE_METADATA_IN_BUFS:
{
- rc = m_parent->storeMetaDataInBuffers(int(payload));
+ rc = m_parent->storeMetaDataInBuffers(*((int *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -1925,7 +1925,7 @@
break;
case QCAMERA_SM_EVT_DUMP:
{
- rc = m_parent->dump((int)payload);
+ rc = m_parent->dump(*((int *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -2107,7 +2107,7 @@
case QCAMERA_SM_EVT_THERMAL_NOTIFY:
{
rc = m_parent->updateThermalLevel(
- *(qcamera_thermal_level_enum_t *)&payload);
+ *((qcamera_thermal_level_enum_t *)payload));
}
break;
case QCAMERA_SM_EVT_SNAPSHOT_DONE:
@@ -2179,7 +2179,7 @@
break;
case QCAMERA_SM_EVT_ENABLE_MSG_TYPE:
{
- rc = m_parent->enableMsgType(int32_t(payload));
+ rc = m_parent->enableMsgType(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -2188,7 +2188,7 @@
break;
case QCAMERA_SM_EVT_DISABLE_MSG_TYPE:
{
- rc = m_parent->disableMsgType(int32_t(payload));
+ rc = m_parent->disableMsgType(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -2197,7 +2197,7 @@
break;
case QCAMERA_SM_EVT_MSG_TYPE_ENABLED:
{
- int enabled = m_parent->msgTypeEnabled(int32_t(payload));
+ int enabled = m_parent->msgTypeEnabled(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_ENABLE_FLAG;
@@ -2266,7 +2266,7 @@
break;
case QCAMERA_SM_EVT_STORE_METADATA_IN_BUFS:
{
- rc = m_parent->storeMetaDataInBuffers(int(payload));
+ rc = m_parent->storeMetaDataInBuffers(*((int *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -2275,7 +2275,7 @@
break;
case QCAMERA_SM_EVT_DUMP:
{
- rc = m_parent->dump((int)payload);
+ rc = m_parent->dump(*((int *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -2461,7 +2461,7 @@
case QCAMERA_SM_EVT_THERMAL_NOTIFY:
{
rc = m_parent->updateThermalLevel(
- *(qcamera_thermal_level_enum_t *)&payload);
+ *((qcamera_thermal_level_enum_t *)payload));
}
break;
default:
@@ -2511,7 +2511,7 @@
break;
case QCAMERA_SM_EVT_ENABLE_MSG_TYPE:
{
- rc = m_parent->enableMsgType(int32_t(payload));
+ rc = m_parent->enableMsgType(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -2520,7 +2520,7 @@
break;
case QCAMERA_SM_EVT_DISABLE_MSG_TYPE:
{
- rc = m_parent->disableMsgType(int32_t(payload));
+ rc = m_parent->disableMsgType(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -2529,7 +2529,7 @@
break;
case QCAMERA_SM_EVT_MSG_TYPE_ENABLED:
{
- int enabled = m_parent->msgTypeEnabled(int32_t(payload));
+ int enabled = m_parent->msgTypeEnabled(*((int32_t *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_ENABLE_FLAG;
@@ -2612,7 +2612,7 @@
break;
case QCAMERA_SM_EVT_STORE_METADATA_IN_BUFS:
{
- rc = m_parent->storeMetaDataInBuffers(int(payload));
+ rc = m_parent->storeMetaDataInBuffers(*((int *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -2621,7 +2621,7 @@
break;
case QCAMERA_SM_EVT_DUMP:
{
- rc = m_parent->dump((int)payload);
+ rc = m_parent->dump(*((int *)payload));
result.status = rc;
result.request_api = evt;
result.result_type = QCAMERA_API_RESULT_TYPE_DEF;
@@ -2859,7 +2859,7 @@
case QCAMERA_SM_EVT_THERMAL_NOTIFY:
{
rc = m_parent->updateThermalLevel(
- *(qcamera_thermal_level_enum_t *)&payload);
+ *((qcamera_thermal_level_enum_t *)payload));
}
break;
default: