diff options
author | Colin Cross <ccross@android.com> | 2016-09-22 17:53:02 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-09-22 17:53:02 +0000 |
commit | d651f40d73b49e1573ca3f3aff0be74e4e757c44 (patch) | |
tree | 4f2a9c7a4135d4df2f784c5325ced68ce88ea13a /camera | |
parent | bfe562839b446ddf9fdd630857348fdf60f9566e (diff) | |
parent | ce52d752d421805ce4800a50f597438335cf6fa8 (diff) | |
download | bullhead-d651f40d73b49e1573ca3f3aff0be74e4e757c44.tar.gz |
Fix format warnings in device/lge/bullhead/camera am: 38e4b678e9
am: ce52d752d4
Change-Id: I50bf052b2a5c8565dfd3a2e19aa588500595e6c7
Diffstat (limited to 'camera')
-rw-r--r-- | camera/QCamera2/HAL/QCamera2HWI.cpp | 2 | ||||
-rw-r--r-- | camera/QCamera2/HAL/QCamera2HWICallbacks.cpp | 2 | ||||
-rw-r--r-- | camera/QCamera2/HAL/QCameraParameters.cpp | 5 | ||||
-rw-r--r-- | camera/QCamera2/HAL/QCameraStream.cpp | 6 | ||||
-rw-r--r-- | camera/QCamera2/HAL3/QCamera3Stream.cpp | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/camera/QCamera2/HAL/QCamera2HWI.cpp b/camera/QCamera2/HAL/QCamera2HWI.cpp index 104412c..1d75233 100644 --- a/camera/QCamera2/HAL/QCamera2HWI.cpp +++ b/camera/QCamera2/HAL/QCamera2HWI.cpp @@ -1977,7 +1977,7 @@ QCameraHeapMemory *QCamera2HardwareInterface::allocateStreamInfoBuf( mParameters.getHfrFps(pFpsRange); streamInfo->user_buf_info.frameInterval = (long)((1000/pFpsRange.video_max_fps) * 1000); - CDBG_HIGH("%s: Video Batch Count = %d, interval = %d", __func__, + CDBG_HIGH("%s: Video Batch Count = %d, interval = %ld", __func__, streamInfo->user_buf_info.frame_buf_cnt, streamInfo->user_buf_info.frameInterval); } diff --git a/camera/QCamera2/HAL/QCamera2HWICallbacks.cpp b/camera/QCamera2/HAL/QCamera2HWICallbacks.cpp index c73ff13..c2523d5 100644 --- a/camera/QCamera2/HAL/QCamera2HWICallbacks.cpp +++ b/camera/QCamera2/HAL/QCamera2HWICallbacks.cpp @@ -2193,7 +2193,7 @@ void QCamera2HardwareInterface::dumpFrameToFile(QCameraStream *stream, } } - CDBG_HIGH("%s: written number of bytes %ld\n", + CDBG_HIGH("%s: written number of bytes %zd\n", __func__, written_len); close(file_fd); } else { diff --git a/camera/QCamera2/HAL/QCameraParameters.cpp b/camera/QCamera2/HAL/QCameraParameters.cpp index 4d93682..88f21d2 100644 --- a/camera/QCamera2/HAL/QCameraParameters.cpp +++ b/camera/QCamera2/HAL/QCameraParameters.cpp @@ -5078,7 +5078,7 @@ int32_t QCameraParameters::initDefaultParameters() m_pCapability->hfr_tbl, m_pCapability->hfr_tbl_cnt); set(KEY_QC_SUPPORTED_HFR_SIZES, hfrSizeValues.string()); - CDBG("HFR values %s HFR Sizes = %d", hfrValues.string(), hfrSizeValues.string()); + CDBG("HFR values %s HFR Sizes = %s", hfrValues.string(), hfrSizeValues.string()); setHighFrameRate(CAM_HFR_MODE_OFF); // Set Focus algorithms @@ -5884,7 +5884,7 @@ int32_t QCameraParameters::setFocusPosition(const char *typeStr, const char *po } } - ALOGE("%s, invalid params, type:%d, pos: %d", __func__, type, pos); + ALOGE("%s, invalid params, type:%d, pos: %f", __func__, type, pos); return BAD_VALUE; } @@ -8836,6 +8836,7 @@ int32_t QCameraParameters::getStreamFormat(cam_stream_type_t streamType, format = m_pCapability->analysis_recommended_format; } else { ALOGE("%s:%d invalid analysis_recommended_format %d\n", + __func__, __LINE__, m_pCapability->analysis_recommended_format); format = mPreviewFormat; } diff --git a/camera/QCamera2/HAL/QCameraStream.cpp b/camera/QCamera2/HAL/QCameraStream.cpp index 80e9831..2d197ca 100644 --- a/camera/QCamera2/HAL/QCameraStream.cpp +++ b/camera/QCamera2/HAL/QCameraStream.cpp @@ -117,7 +117,7 @@ int32_t QCameraStream::get_bufs_deffered( *initial_reg_flag = stream->mRegFlags; *num_bufs = stream->mNumBufs; *bufs = stream->mBufDefs; - CDBG_HIGH("%s: stream type: %d, mRegFlags: 0x%x, numBufs: %d", + CDBG_HIGH("%s: stream type: %d, mRegFlags: %p, numBufs: %d", __func__, stream->getMyType(), stream->mRegFlags, stream->mNumBufs); return NO_ERROR; } @@ -1211,8 +1211,8 @@ int32_t QCameraStream::getBufs(cam_frame_len_offset_t *offset, *num_bufs = mNumBufs; *initial_reg_flag = regFlags; *bufs = mBufDefs; - CDBG_HIGH("%s: stream type: %d, mRegFlags: 0x%x, numBufs: %d", - __func__, mStreamInfo->stream_type, regFlags, mBufDefs); + CDBG_HIGH("%s: stream type: %d, mRegFlags: %p, numBufs: %d", + __func__, mStreamInfo->stream_type, regFlags, mNumBufs); if (mNumBufsNeedAlloc > 0) { pthread_mutex_lock(&m_lock); diff --git a/camera/QCamera2/HAL3/QCamera3Stream.cpp b/camera/QCamera2/HAL3/QCamera3Stream.cpp index efd00e5..399e73d 100644 --- a/camera/QCamera2/HAL3/QCamera3Stream.cpp +++ b/camera/QCamera2/HAL3/QCamera3Stream.cpp @@ -699,7 +699,7 @@ int32_t QCamera3Stream::bufRelease(int32_t index) mBufDefs[index].mem_info = NULL; } else { - ALOGE("%s: Buffer at index %d not registered", __func__); + ALOGE("%s: Buffer at index %d not registered", __func__, index); return BAD_INDEX; } |