diff options
| author | lidaw <lidaw@codeaurora.org> | 2016-04-18 18:40:15 -0700 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2018-01-19 14:09:16 +0100 |
| commit | b4d94a85376b8f8be92e76805df0952614e05fc5 (patch) | |
| tree | 8391ad489d245481b6faaacdbe7b0185dd422fb8 /camera | |
| parent | 68478ce3e332bcb008c55f793adb11b88f63ad03 (diff) | |
msm8996-common: HAL: Fixed compilation error for AOSP upgrade
Fixed compilation error for N
CRs-fixed: 1007835
Change-Id: I732ea715d4d1b73e2705116d2278a34f56806c64
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/QCamera2/HAL/QCamera2HWI.cpp | 6 | ||||
| -rw-r--r-- | camera/QCamera2/HAL/QCameraMuxer.cpp | 1 | ||||
| -rw-r--r-- | camera/QCamera2/QCamera2Factory.cpp | 1 | ||||
| -rw-r--r-- | camera/QCamera2/stack/mm-camera-interface/src/mm_camera_channel.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/camera/QCamera2/HAL/QCamera2HWI.cpp b/camera/QCamera2/HAL/QCamera2HWI.cpp index c7f9d44..e1e1611 100644 --- a/camera/QCamera2/HAL/QCamera2HWI.cpp +++ b/camera/QCamera2/HAL/QCamera2HWI.cpp @@ -412,7 +412,7 @@ void QCamera2HardwareInterface::stop_preview(struct camera_device *device) hw->getCameraId()); // Disable power Hint for preview - hw->m_perfLock.powerHint(POWER_HINT_CAM_PREVIEW, false); + hw->m_perfLock.powerHint(POWER_HINT_VIDEO_ENCODE, false); hw->m_perfLock.lock_acq(); hw->lockAPI(); @@ -3516,7 +3516,7 @@ int QCamera2HardwareInterface::startPreview() if (rc == NO_ERROR) { // Set power Hint for preview - m_perfLock.powerHint(POWER_HINT_CAM_PREVIEW, true); + m_perfLock.powerHint(POWER_HINT_VIDEO_ENCODE, true); } LOGI("X rc = %d", rc); @@ -3549,7 +3549,7 @@ int QCamera2HardwareInterface::stopPreview() mActiveAF = false; // Disable power Hint for preview - m_perfLock.powerHint(POWER_HINT_CAM_PREVIEW, false); + m_perfLock.powerHint(POWER_HINT_VIDEO_ENCODE, false); m_perfLock.lock_acq(); diff --git a/camera/QCamera2/HAL/QCameraMuxer.cpp b/camera/QCamera2/HAL/QCameraMuxer.cpp index e2ec989..bad7393 100644 --- a/camera/QCamera2/HAL/QCameraMuxer.cpp +++ b/camera/QCamera2/HAL/QCameraMuxer.cpp @@ -1910,7 +1910,6 @@ int QCameraMuxer::getCameraInfo(int camera_id, { int rc = NO_ERROR; LOGH("E, camera_id = %d", camera_id); - cam_sync_type_t cam_type = CAM_TYPE_MAIN; if (!m_nLogicalCameras || (camera_id >= m_nLogicalCameras) || !info || (camera_id < 0)) { diff --git a/camera/QCamera2/QCamera2Factory.cpp b/camera/QCamera2/QCamera2Factory.cpp index e54f7b1..33b051a 100644 --- a/camera/QCamera2/QCamera2Factory.cpp +++ b/camera/QCamera2/QCamera2Factory.cpp @@ -322,7 +322,6 @@ int QCamera2Factory::getNumberOfCameras() int QCamera2Factory::getCameraInfo(int camera_id, struct camera_info *info) { int rc; - cam_sync_type_t cam_type = CAM_TYPE_MAIN; if (!mNumOfCameras || camera_id >= mNumOfCameras || !info || (camera_id < 0)) { diff --git a/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_channel.c b/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_channel.c index 7807534..a0097dc 100644 --- a/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_channel.c +++ b/camera/QCamera2/stack/mm-camera-interface/src/mm_camera_channel.c @@ -2382,6 +2382,8 @@ int8_t mm_channel_validate_super_buf(mm_channel_t* ch_obj, struct cam_list *pos = NULL; mm_channel_queue_node_t* super_buf = NULL; + (void)ch_obj; + /* comp */ pthread_mutex_lock(&queue->que.lock); head = &queue->que.head.list; |