diff options
| author | Suman Mukherjee <sumam@codeaurora.org> | 2017-04-21 12:03:10 +0530 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2018-01-19 14:09:16 +0100 |
| commit | 5f5ed49477e4dc100e699e932d3f7db2186fb1c2 (patch) | |
| tree | 4044e9dcb282e0e4341ffaa85aa369e57968a5c9 /camera/QCamera2 | |
| parent | ea6860b04efe5f4752b84c24db0fa595223ee9bb (diff) | |
msm8996-common: QCamera2: Fixed compilation error for AOSP upgrade
Fixed compilation error for O
Change-Id: I119310169015f5713ff78df090935777a8350795
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Diffstat (limited to 'camera/QCamera2')
| -rw-r--r-- | camera/QCamera2/Android.mk | 2 | ||||
| -rw-r--r-- | camera/QCamera2/HAL/QCamera2HWI.cpp | 5 | ||||
| -rw-r--r-- | camera/QCamera2/HAL3/QCamera3Channel.cpp | 1 | ||||
| -rw-r--r-- | camera/QCamera2/stack/mm-camera-test/src/mm_qcamera_preview.c | 2 | ||||
| -rw-r--r-- | camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk | 4 |
5 files changed, 8 insertions, 6 deletions
diff --git a/camera/QCamera2/Android.mk b/camera/QCamera2/Android.mk index 44eca2f..7217d4c 100644 --- a/camera/QCamera2/Android.mk +++ b/camera/QCamera2/Android.mk @@ -25,7 +25,7 @@ LOCAL_SRC_FILES += \ HAL3/QCamera3CropRegionMapper.cpp \ HAL3/QCamera3StreamMem.cpp -LOCAL_CFLAGS := -Wall -Wextra -Werror +LOCAL_CFLAGS := -Wall -Wextra -Werror -Wno-unused-parameter -Wno-unused-variable #HAL 1.0 source diff --git a/camera/QCamera2/HAL/QCamera2HWI.cpp b/camera/QCamera2/HAL/QCamera2HWI.cpp index e1e1611..1e6f310 100644 --- a/camera/QCamera2/HAL/QCamera2HWI.cpp +++ b/camera/QCamera2/HAL/QCamera2HWI.cpp @@ -6538,6 +6538,8 @@ int32_t QCamera2HardwareInterface::processPrepSnapshotDoneEvent( int32_t QCamera2HardwareInterface::processASDUpdate( __unused cam_asd_decision_t asd_decision) { + +#ifndef VANILLA_HAL if ( msgTypeEnabled(CAMERA_MSG_META_DATA) ) { size_t data_len = sizeof(cam_auto_scene_t); size_t buffer_len = 1 *sizeof(int) //meta type @@ -6556,7 +6558,6 @@ int32_t QCamera2HardwareInterface::processASDUpdate( return UNKNOWN_ERROR; } -#ifndef VANILLA_HAL pASDData[0] = CAMERA_META_DATA_ASD; pASDData[1] = (int)data_len; pASDData[2] = asd_decision.detected_scene; @@ -6574,8 +6575,8 @@ int32_t QCamera2HardwareInterface::processASDUpdate( LOGE("fail sending notification"); asdBuffer->release(asdBuffer); } -#endif } +#endif return NO_ERROR; } diff --git a/camera/QCamera2/HAL3/QCamera3Channel.cpp b/camera/QCamera2/HAL3/QCamera3Channel.cpp index 54c92d6..e1f6b63 100644 --- a/camera/QCamera2/HAL3/QCamera3Channel.cpp +++ b/camera/QCamera2/HAL3/QCamera3Channel.cpp @@ -38,6 +38,7 @@ #include <stdlib.h> #include "hardware/gralloc.h" #include <utils/Timers.h> +#include <sys/stat.h> // Camera dependencies #include "QCamera3Channel.h" diff --git a/camera/QCamera2/stack/mm-camera-test/src/mm_qcamera_preview.c b/camera/QCamera2/stack/mm-camera-test/src/mm_qcamera_preview.c index b20c95d..9734986 100644 --- a/camera/QCamera2/stack/mm-camera-test/src/mm_qcamera_preview.c +++ b/camera/QCamera2/stack/mm-camera-test/src/mm_qcamera_preview.c @@ -410,7 +410,7 @@ static void mm_app_zsl_notify_cb(mm_camera_super_buf_t *bufs, /* App will free the metadata */ pme->metadata = malloc(sizeof(metadata_buffer_t)); if (!pme->metadata) { - ALOGE("not enough memory\n"); + LOGE("not enough memory\n"); return; } } diff --git a/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk b/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk index a15c158..77b5ee8 100644 --- a/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk +++ b/camera/QCamera2/stack/mm-jpeg-interface/test/Android.mk @@ -37,7 +37,7 @@ LOCAL_SRC_FILES := mm_jpeg_test.c LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) LOCAL_MODULE := mm-jpeg-interface-test LOCAL_PRELINK_MODULE := false -LOCAL_SHARED_LIBRARIES := libcutils libdl libmmjpeg_interface +LOCAL_SHARED_LIBRARIES := libcutils libdl libmmjpeg_interface liblog include $(BUILD_EXECUTABLE) @@ -80,7 +80,7 @@ LOCAL_SRC_FILES := mm_jpegdec_test.c LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY) LOCAL_MODULE := mm-jpegdec-interface-test LOCAL_PRELINK_MODULE := false -LOCAL_SHARED_LIBRARIES := libcutils libdl libmmjpeg_interface +LOCAL_SHARED_LIBRARIES := libcutils libdl libmmjpeg_interface liblog include $(BUILD_EXECUTABLE) |