Merge "Camera2: change histogram data type naming"
diff --git a/QCamera2/HAL/QCamera2HWI.cpp b/QCamera2/HAL/QCamera2HWI.cpp
index 38d725b..a9c3539 100644
--- a/QCamera2/HAL/QCamera2HWI.cpp
+++ b/QCamera2/HAL/QCamera2HWI.cpp
@@ -3241,7 +3241,7 @@
* NO_ERROR -- success
* none-zero failure code
*==========================================================================*/
-int32_t QCamera2HardwareInterface::processHistogramStats(cam_stats_data_t &stats_data)
+int32_t QCamera2HardwareInterface::processHistogramStats(cam_hist_stats_t &stats_data)
{
if (!mParameters.isHistogramEnabled()) {
ALOGD("%s: Histogram not enabled, no ops here", __func__);
diff --git a/QCamera2/HAL/QCamera2HWI.h b/QCamera2/HAL/QCamera2HWI.h
index ca35d52..947d1a9 100644
--- a/QCamera2/HAL/QCamera2HWI.h
+++ b/QCamera2/HAL/QCamera2HWI.h
@@ -228,7 +228,7 @@
QCameraChannel *getChannelByHandle(uint32_t channelHandle);
mm_camera_buf_def_t *getSnapshotFrame(mm_camera_super_buf_t *recvd_frame);
int32_t processFaceDetectionResult(cam_face_detection_data_t *fd_data);
- int32_t processHistogramStats(cam_stats_data_t &stats_data);
+ int32_t processHistogramStats(cam_hist_stats_t &stats_data);
int32_t setHistogram(bool histogram_en);
int32_t setFaceDetection(bool enabled);
int32_t prepareHardwareForSnapshot();
diff --git a/QCamera2/stack/common/cam_types.h b/QCamera2/stack/common/cam_types.h
index 3260b1d..c068e6b 100644
--- a/QCamera2/stack/common/cam_types.h
+++ b/QCamera2/stack/common/cam_types.h
@@ -553,7 +553,7 @@
cam_bayer_hist_stats_t bayer_stats;
cam_histogram_data_t yuv_stats;
};
-} cam_stats_data_t;
+} cam_hist_stats_t;
enum cam_focus_distance_index{
CAM_FOCUS_DISTANCE_NEAR_INDEX, /* 0 */
@@ -597,7 +597,7 @@
typedef struct {
uint8_t is_stats_valid; /* if histgram data is valid */
- cam_stats_data_t stats_data; /* histogram data */
+ cam_hist_stats_t stats_data; /* histogram data */
uint8_t is_faces_valid; /* if face detection data is valid */
cam_face_detection_data_t faces_data; /* face detection result */