MiPad4/android_device_xiaomi_clover
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clover: camera: String8::string() => String8::c_str()

Browse source 
camera: Use Strings8/16 c_str
Also change an isEmpty() to empty().
David Marble <drmarble1@gmail.com>

Change-Id: Ia6f6ac100296b8bea4804fa60f4b0e807a1b48d0

Co-authored-by: David Marble <drmarble1@gmail.com>
This commit is contained in:
Yumi Yukimura 2024-03-13 00:23:09 +08:00 committed by CakesTwix
parent 5df4106439
commit a67ca0f8e4
8 changed files with 65 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
camera/QCamera2/HAL/CameraParameters.cpp
View file

@ -204,7 +204,7 @@ String8 CameraParameters::flatten() const
void CameraParameters::unflatten(const String8 &params) void CameraParameters::unflatten(const String8 &params)
{ {
const char *a = params.string(); const char *a = params.c_str();
const char *b; const char *b;
mMap.clear(); mMap.clear();
@ -270,7 +270,7 @@ const char *CameraParameters::get(const char *key) const
String8 v = mMap.valueFor(String8(key)); String8 v = mMap.valueFor(String8(key));
if (v.length() == 0) if (v.length() == 0)
return 0; return 0;
return v.string(); return v.c_str();
} }
int CameraParameters::getInt(const char *key) const int CameraParameters::getInt(const char *key) const
@ -462,7 +462,7 @@ void CameraParameters::dump() const
String8 k, v; String8 k, v;
k = mMap.keyAt(i); k = mMap.keyAt(i);
v = mMap.valueAt(i); v = mMap.valueAt(i);
ALOGD("%s: %s\n", k.string(), v.string()); ALOGD("%s: %s\n", k.c_str(), v.c_str());
} }
} }
@ -477,10 +477,10 @@ status_t CameraParameters::dump(int fd, const Vector<String16>& /*args*/) const
String8 k, v; String8 k, v;
k = mMap.keyAt(i); k = mMap.keyAt(i);
v = mMap.valueAt(i); v = mMap.valueAt(i);
snprintf(buffer, 255, "\t%s: %s\n", k.string(), v.string()); snprintf(buffer, 255, "\t%s: %s\n", k.c_str(), v.c_str());
result.append(buffer); result.append(buffer);
} }
write(fd, result.string(), result.size()); write(fd, result.c_str(), result.size());
return NO_ERROR; return NO_ERROR;
} }

20
camera/QCamera2/HAL/QCamera2HWI.cpp
View file

@ -4827,11 +4827,11 @@ int32_t QCamera2HardwareInterface::configureHDRBracketing()
tmp.append(","); tmp.append(",");
} }
if( !tmp.isEmpty() && if( !tmp.empty() &&
( MAX_EXP_BRACKETING_LENGTH > tmp.length() ) ) { ( MAX_EXP_BRACKETING_LENGTH > tmp.length() ) ) {
//Trim last comma //Trim last comma
memset(aeBracket.values, '\0', MAX_EXP_BRACKETING_LENGTH); memset(aeBracket.values, '\0', MAX_EXP_BRACKETING_LENGTH);
memcpy(aeBracket.values, tmp.string(), tmp.length() - 1); memcpy(aeBracket.values, tmp.c_str(), tmp.length() - 1);
} }
LOGH("HDR config values %s", LOGH("HDR config values %s",
@ -6625,8 +6625,8 @@ int QCamera2HardwareInterface::dump(int fd)
dprintf(fd, "\n Camera HAL information Begin \n"); dprintf(fd, "\n Camera HAL information Begin \n");
dprintf(fd, "Camera ID: %d \n", mCameraId); dprintf(fd, "Camera ID: %d \n", mCameraId);
dprintf(fd, "StoreMetaDataInFrame: %d \n", mStoreMetaDataInFrame); dprintf(fd, "StoreMetaDataInFrame: %d \n", mStoreMetaDataInFrame);
dprintf(fd, "\n Configuration: %s", mParameters.dump().string()); dprintf(fd, "\n Configuration: %s", mParameters.dump().c_str());
dprintf(fd, "\n State Information: %s", m_stateMachine.dump().string()); dprintf(fd, "\n State Information: %s", m_stateMachine.dump().c_str());
dprintf(fd, "\n Camera HAL information End \n"); dprintf(fd, "\n Camera HAL information End \n");
/* send UPDATE_DEBUG_LEVEL to the backend so that they can read the /* send UPDATE_DEBUG_LEVEL to the backend so that they can read the
@ -10552,17 +10552,17 @@ QCameraExif *QCamera2HardwareInterface::getExifData()
rc = mParameters.getExifDateTime(dateTime, subSecTime); rc = mParameters.getExifDateTime(dateTime, subSecTime);
if(rc == NO_ERROR) { if(rc == NO_ERROR) {
exif->addEntry(EXIFTAGID_DATE_TIME, EXIF_ASCII, exif->addEntry(EXIFTAGID_DATE_TIME, EXIF_ASCII,
(uint32_t)(dateTime.length() + 1), (void *)dateTime.string()); (uint32_t)(dateTime.length() + 1), (void *)dateTime.c_str());
exif->addEntry(EXIFTAGID_EXIF_DATE_TIME_ORIGINAL, EXIF_ASCII, exif->addEntry(EXIFTAGID_EXIF_DATE_TIME_ORIGINAL, EXIF_ASCII,
(uint32_t)(dateTime.length() + 1), (void *)dateTime.string()); (uint32_t)(dateTime.length() + 1), (void *)dateTime.c_str());
exif->addEntry(EXIFTAGID_EXIF_DATE_TIME_DIGITIZED, EXIF_ASCII, exif->addEntry(EXIFTAGID_EXIF_DATE_TIME_DIGITIZED, EXIF_ASCII,
(uint32_t)(dateTime.length() + 1), (void *)dateTime.string()); (uint32_t)(dateTime.length() + 1), (void *)dateTime.c_str());
exif->addEntry(EXIFTAGID_SUBSEC_TIME, EXIF_ASCII, exif->addEntry(EXIFTAGID_SUBSEC_TIME, EXIF_ASCII,
(uint32_t)(subSecTime.length() + 1), (void *)subSecTime.string()); (uint32_t)(subSecTime.length() + 1), (void *)subSecTime.c_str());
exif->addEntry(EXIFTAGID_SUBSEC_TIME_ORIGINAL, EXIF_ASCII, exif->addEntry(EXIFTAGID_SUBSEC_TIME_ORIGINAL, EXIF_ASCII,
(uint32_t)(subSecTime.length() + 1), (void *)subSecTime.string()); (uint32_t)(subSecTime.length() + 1), (void *)subSecTime.c_str());
exif->addEntry(EXIFTAGID_SUBSEC_TIME_DIGITIZED, EXIF_ASCII, exif->addEntry(EXIFTAGID_SUBSEC_TIME_DIGITIZED, EXIF_ASCII,
(uint32_t)(subSecTime.length() + 1), (void *)subSecTime.string()); (uint32_t)(subSecTime.length() + 1), (void *)subSecTime.c_str());
} else { } else {
LOGW("getExifDateTime failed"); LOGW("getExifDateTime failed");
} }

6
camera/QCamera2/HAL/QCamera2HWICallbacks.cpp
View file

@ -2999,7 +2999,7 @@ void QCamera2HardwareInterface::dumpMetadataToFile(QCameraStream *stream,
String8 filePath(timeBuf); String8 filePath(timeBuf);
snprintf(buf, sizeof(buf), "%um_%s_%d.bin", dumpFrmCnt, type, frame->frame_idx); snprintf(buf, sizeof(buf), "%um_%s_%d.bin", dumpFrmCnt, type, frame->frame_idx);
filePath.append(buf); filePath.append(buf);
int file_fd = open(filePath.string(), O_RDWR | O_CREAT, 0777); int file_fd = open(filePath.c_str(), O_RDWR | O_CREAT, 0777);
if (file_fd >= 0) { if (file_fd >= 0) {
ssize_t written_len = 0; ssize_t written_len = 0;
metadata->tuning_params.tuning_data_version = TUNING_DATA_VERSION; metadata->tuning_params.tuning_data_version = TUNING_DATA_VERSION;
@ -3213,7 +3213,7 @@ void QCamera2HardwareInterface::dumpFrameToFile(QCameraStream *stream,
} }
filePath.append(buf); filePath.append(buf);
int file_fd = open(filePath.string(), O_RDWR | O_CREAT, 0777); int file_fd = open(filePath.c_str(), O_RDWR | O_CREAT, 0777);
ssize_t written_len = 0; ssize_t written_len = 0;
if (file_fd >= 0) { if (file_fd >= 0) {
void *data = NULL; void *data = NULL;
@ -3249,7 +3249,7 @@ void QCamera2HardwareInterface::dumpFrameToFile(QCameraStream *stream,
LOGE("fail to open file for image dumping"); LOGE("fail to open file for image dumping");
} }
if (true == m_bIntRawEvtPending) { if (true == m_bIntRawEvtPending) {
strlcpy(m_BackendFileName, filePath.string(), QCAMERA_MAX_FILEPATH_LENGTH); strlcpy(m_BackendFileName, filePath.c_str(), QCAMERA_MAX_FILEPATH_LENGTH);
mBackendFileSize = (size_t)written_len; mBackendFileSize = (size_t)written_len;
} else { } else {
dumpFrmCnt++; dumpFrmCnt++;

68
camera/QCamera2/HAL/QCameraParameters.cpp
View file

@ -5926,8 +5926,8 @@ int32_t QCameraParameters::initDefaultParameters()
m_pCapability->preview_sizes_tbl_cnt <= MAX_SIZES_CNT) { m_pCapability->preview_sizes_tbl_cnt <= MAX_SIZES_CNT) {
String8 previewSizeValues = createSizesString( String8 previewSizeValues = createSizesString(
m_pCapability->preview_sizes_tbl, m_pCapability->preview_sizes_tbl_cnt); m_pCapability->preview_sizes_tbl, m_pCapability->preview_sizes_tbl_cnt);
set(KEY_SUPPORTED_PREVIEW_SIZES, previewSizeValues.string()); set(KEY_SUPPORTED_PREVIEW_SIZES, previewSizeValues.c_str());
LOGH("supported preview sizes: %s", previewSizeValues.string()); LOGH("supported preview sizes: %s", previewSizeValues.c_str());
// Set default preview size // Set default preview size
CameraParameters::setPreviewSize(m_pCapability->preview_sizes_tbl[0].width, CameraParameters::setPreviewSize(m_pCapability->preview_sizes_tbl[0].width,
m_pCapability->preview_sizes_tbl[0].height); m_pCapability->preview_sizes_tbl[0].height);
@ -5940,15 +5940,15 @@ int32_t QCameraParameters::initDefaultParameters()
m_pCapability->video_sizes_tbl_cnt <= MAX_SIZES_CNT) { m_pCapability->video_sizes_tbl_cnt <= MAX_SIZES_CNT) {
String8 videoSizeValues = createSizesString( String8 videoSizeValues = createSizesString(
m_pCapability->video_sizes_tbl, m_pCapability->video_sizes_tbl_cnt); m_pCapability->video_sizes_tbl, m_pCapability->video_sizes_tbl_cnt);
set(KEY_SUPPORTED_VIDEO_SIZES, videoSizeValues.string()); set(KEY_SUPPORTED_VIDEO_SIZES, videoSizeValues.c_str());
LOGH("supported video sizes: %s", videoSizeValues.string()); LOGH("supported video sizes: %s", videoSizeValues.c_str());
// Set default video size // Set default video size
CameraParameters::setVideoSize(m_pCapability->video_sizes_tbl[0].width, CameraParameters::setVideoSize(m_pCapability->video_sizes_tbl[0].width,
m_pCapability->video_sizes_tbl[0].height); m_pCapability->video_sizes_tbl[0].height);
//Set preferred Preview size for video //Set preferred Preview size for video
String8 vSize = createSizesString(&m_pCapability->preview_sizes_tbl[0], 1); String8 vSize = createSizesString(&m_pCapability->preview_sizes_tbl[0], 1);
set(KEY_PREFERRED_PREVIEW_SIZE_FOR_VIDEO, vSize.string()); set(KEY_PREFERRED_PREVIEW_SIZE_FOR_VIDEO, vSize.c_str());
} else { } else {
LOGW("supported video sizes cnt is 0 or exceeds max!!!"); LOGW("supported video sizes cnt is 0 or exceeds max!!!");
} }
@ -5958,8 +5958,8 @@ int32_t QCameraParameters::initDefaultParameters()
m_pCapability->picture_sizes_tbl_cnt <= MAX_SIZES_CNT) { m_pCapability->picture_sizes_tbl_cnt <= MAX_SIZES_CNT) {
String8 pictureSizeValues = createSizesString( String8 pictureSizeValues = createSizesString(
m_pCapability->picture_sizes_tbl, m_pCapability->picture_sizes_tbl_cnt); m_pCapability->picture_sizes_tbl, m_pCapability->picture_sizes_tbl_cnt);
set(KEY_SUPPORTED_PICTURE_SIZES, pictureSizeValues.string()); set(KEY_SUPPORTED_PICTURE_SIZES, pictureSizeValues.c_str());
LOGH("supported pic sizes: %s", pictureSizeValues.string()); LOGH("supported pic sizes: %s", pictureSizeValues.c_str());
// Set default picture size to the smallest resolution // Set default picture size to the smallest resolution
CameraParameters::setPictureSize( CameraParameters::setPictureSize(
m_pCapability->picture_sizes_tbl[m_pCapability->picture_sizes_tbl_cnt-1].width, m_pCapability->picture_sizes_tbl[m_pCapability->picture_sizes_tbl_cnt-1].width,
@ -5980,8 +5980,8 @@ int32_t QCameraParameters::initDefaultParameters()
cam_dimension_t *totalSizeTbl = m_reprocScaleParam.getTotalSizeTbl(); cam_dimension_t *totalSizeTbl = m_reprocScaleParam.getTotalSizeTbl();
size_t totalSizeCnt = m_reprocScaleParam.getTotalSizeTblCnt(); size_t totalSizeCnt = m_reprocScaleParam.getTotalSizeTblCnt();
String8 pictureSizeValues = createSizesString(totalSizeTbl, totalSizeCnt); String8 pictureSizeValues = createSizesString(totalSizeTbl, totalSizeCnt);
set(KEY_SUPPORTED_PICTURE_SIZES, pictureSizeValues.string()); set(KEY_SUPPORTED_PICTURE_SIZES, pictureSizeValues.c_str());
LOGH("scaled supported pic sizes: %s", pictureSizeValues.string()); LOGH("scaled supported pic sizes: %s", pictureSizeValues.c_str());
}else{ }else{
m_reprocScaleParam.setScaleEnable(false); m_reprocScaleParam.setScaleEnable(false);
LOGW("reset scaled picture size table failed."); LOGW("reset scaled picture size table failed.");
@ -5994,7 +5994,7 @@ int32_t QCameraParameters::initDefaultParameters()
String8 thumbnailSizeValues = createSizesString( String8 thumbnailSizeValues = createSizesString(
THUMBNAIL_SIZES_MAP, THUMBNAIL_SIZES_MAP,
PARAM_MAP_SIZE(THUMBNAIL_SIZES_MAP)); PARAM_MAP_SIZE(THUMBNAIL_SIZES_MAP));
set(KEY_SUPPORTED_JPEG_THUMBNAIL_SIZES, thumbnailSizeValues.string()); set(KEY_SUPPORTED_JPEG_THUMBNAIL_SIZES, thumbnailSizeValues.c_str());
// Set default thumnail size // Set default thumnail size
set(KEY_JPEG_THUMBNAIL_WIDTH, THUMBNAIL_SIZES_MAP[0].width); set(KEY_JPEG_THUMBNAIL_WIDTH, THUMBNAIL_SIZES_MAP[0].width);
set(KEY_JPEG_THUMBNAIL_HEIGHT, THUMBNAIL_SIZES_MAP[0].height); set(KEY_JPEG_THUMBNAIL_HEIGHT, THUMBNAIL_SIZES_MAP[0].height);
@ -6005,8 +6005,8 @@ int32_t QCameraParameters::initDefaultParameters()
String8 liveSnpashotSizeValues = createSizesString( String8 liveSnpashotSizeValues = createSizesString(
m_pCapability->livesnapshot_sizes_tbl, m_pCapability->livesnapshot_sizes_tbl,
m_pCapability->livesnapshot_sizes_tbl_cnt); m_pCapability->livesnapshot_sizes_tbl_cnt);
set(KEY_QC_SUPPORTED_LIVESNAPSHOT_SIZES, liveSnpashotSizeValues.string()); set(KEY_QC_SUPPORTED_LIVESNAPSHOT_SIZES, liveSnpashotSizeValues.c_str());
LOGD("supported live snapshot sizes: %s", liveSnpashotSizeValues.string()); LOGD("supported live snapshot sizes: %s", liveSnpashotSizeValues.c_str());
m_LiveSnapshotSize = m_LiveSnapshotSize =
m_pCapability->livesnapshot_sizes_tbl[m_pCapability->livesnapshot_sizes_tbl_cnt-1]; m_pCapability->livesnapshot_sizes_tbl[m_pCapability->livesnapshot_sizes_tbl_cnt-1];
} }
@ -6017,7 +6017,7 @@ int32_t QCameraParameters::initDefaultParameters()
m_pCapability->supported_preview_fmt_cnt, m_pCapability->supported_preview_fmt_cnt,
PREVIEW_FORMATS_MAP, PREVIEW_FORMATS_MAP,
PARAM_MAP_SIZE(PREVIEW_FORMATS_MAP)); PARAM_MAP_SIZE(PREVIEW_FORMATS_MAP));
set(KEY_SUPPORTED_PREVIEW_FORMATS, previewFormatValues.string()); set(KEY_SUPPORTED_PREVIEW_FORMATS, previewFormatValues.c_str());
// Set default preview format // Set default preview format
CameraParameters::setPreviewFormat(PIXEL_FORMAT_YUV420SP); CameraParameters::setPreviewFormat(PIXEL_FORMAT_YUV420SP);
@ -6032,12 +6032,12 @@ int32_t QCameraParameters::initDefaultParameters()
m_pCapability->supported_raw_fmt_cnt, m_pCapability->supported_raw_fmt_cnt,
PICTURE_TYPES_MAP, PICTURE_TYPES_MAP,
PARAM_MAP_SIZE(PICTURE_TYPES_MAP)); PARAM_MAP_SIZE(PICTURE_TYPES_MAP));
if (str.string() != NULL) { if (str.c_str() != NULL) {
pictureTypeValues.append(","); pictureTypeValues.append(",");
pictureTypeValues.append(str); pictureTypeValues.append(str);
} }
set(KEY_SUPPORTED_PICTURE_FORMATS, pictureTypeValues.string()); set(KEY_SUPPORTED_PICTURE_FORMATS, pictureTypeValues.c_str());
// Set default picture Format // Set default picture Format
CameraParameters::setPictureFormat(PIXEL_FORMAT_JPEG); CameraParameters::setPictureFormat(PIXEL_FORMAT_JPEG);
// Set raw image size // Set raw image size
@ -6059,7 +6059,7 @@ int32_t QCameraParameters::initDefaultParameters()
String8 fpsRangeValues = createFpsRangeString(m_pCapability->fps_ranges_tbl, String8 fpsRangeValues = createFpsRangeString(m_pCapability->fps_ranges_tbl,
m_pCapability->fps_ranges_tbl_cnt, m_pCapability->fps_ranges_tbl_cnt,
default_fps_index); default_fps_index);
set(KEY_SUPPORTED_PREVIEW_FPS_RANGE, fpsRangeValues.string()); set(KEY_SUPPORTED_PREVIEW_FPS_RANGE, fpsRangeValues.c_str());
int min_fps = int min_fps =
int(m_pCapability->fps_ranges_tbl[default_fps_index].min_fps * 1000); int(m_pCapability->fps_ranges_tbl[default_fps_index].min_fps * 1000);
@ -6071,8 +6071,8 @@ int32_t QCameraParameters::initDefaultParameters()
// Set legacy preview fps // Set legacy preview fps
String8 fpsValues = createFpsString(m_pCapability->fps_ranges_tbl[default_fps_index]); String8 fpsValues = createFpsString(m_pCapability->fps_ranges_tbl[default_fps_index]);
set(KEY_SUPPORTED_PREVIEW_FRAME_RATES, fpsValues.string()); set(KEY_SUPPORTED_PREVIEW_FRAME_RATES, fpsValues.c_str());
LOGH("supported fps rates: %s", fpsValues.string()); LOGH("supported fps rates: %s", fpsValues.c_str());
CameraParameters::setPreviewFrameRate(int(m_pCapability->fps_ranges_tbl[default_fps_index].max_fps)); CameraParameters::setPreviewFrameRate(int(m_pCapability->fps_ranges_tbl[default_fps_index].max_fps));
} else { } else {
LOGW("supported fps ranges cnt is 0 or exceeds max!!!"); LOGW("supported fps ranges cnt is 0 or exceeds max!!!");
@ -6161,7 +6161,7 @@ int32_t QCameraParameters::initDefaultParameters()
manualFocusModes.append(","); manualFocusModes.append(",");
manualFocusModes.append(KEY_QC_FOCUS_DIOPTER_MODE); manualFocusModes.append(KEY_QC_FOCUS_DIOPTER_MODE);
} }
set(KEY_QC_SUPPORTED_MANUAL_FOCUS_MODES, manualFocusModes.string()); set(KEY_QC_SUPPORTED_MANUAL_FOCUS_MODES, manualFocusModes.c_str());
// Set Saturation // Set Saturation
set(KEY_QC_MIN_SATURATION, m_pCapability->saturation_ctrl.min_value); set(KEY_QC_MIN_SATURATION, m_pCapability->saturation_ctrl.min_value);
@ -6199,7 +6199,7 @@ int32_t QCameraParameters::initDefaultParameters()
m_pCapability->supported_aec_modes_cnt, m_pCapability->supported_aec_modes_cnt,
AUTO_EXPOSURE_MAP, AUTO_EXPOSURE_MAP,
PARAM_MAP_SIZE(AUTO_EXPOSURE_MAP)); PARAM_MAP_SIZE(AUTO_EXPOSURE_MAP));
set(KEY_QC_SUPPORTED_AUTO_EXPOSURE, autoExposureValues.string()); set(KEY_QC_SUPPORTED_AUTO_EXPOSURE, autoExposureValues.c_str());
setAutoExposure(AUTO_EXPOSURE_CENTER_WEIGHTED); setAutoExposure(AUTO_EXPOSURE_CENTER_WEIGHTED);
// Set Exposure Compensation // Set Exposure Compensation
@ -6214,7 +6214,7 @@ int32_t QCameraParameters::initDefaultParameters()
m_pCapability->supported_instant_aec_modes_cnt, m_pCapability->supported_instant_aec_modes_cnt,
INSTANT_AEC_MODES_MAP, INSTANT_AEC_MODES_MAP,
PARAM_MAP_SIZE(INSTANT_AEC_MODES_MAP)); PARAM_MAP_SIZE(INSTANT_AEC_MODES_MAP));
set(KEY_QC_INSTANT_AEC_SUPPORTED_MODES, instantAECModes.string()); set(KEY_QC_INSTANT_AEC_SUPPORTED_MODES, instantAECModes.c_str());
// Set Instant Capture modes // Set Instant Capture modes
String8 instantCaptureModes = createValuesString( String8 instantCaptureModes = createValuesString(
@ -6222,7 +6222,7 @@ int32_t QCameraParameters::initDefaultParameters()
m_pCapability->supported_instant_aec_modes_cnt, m_pCapability->supported_instant_aec_modes_cnt,
INSTANT_CAPTURE_MODES_MAP, INSTANT_CAPTURE_MODES_MAP,
PARAM_MAP_SIZE(INSTANT_CAPTURE_MODES_MAP)); PARAM_MAP_SIZE(INSTANT_CAPTURE_MODES_MAP));
set(KEY_QC_INSTANT_CAPTURE_SUPPORTED_MODES, instantCaptureModes.string()); set(KEY_QC_INSTANT_CAPTURE_SUPPORTED_MODES, instantCaptureModes.c_str());
// Set Antibanding // Set Antibanding
@ -6279,7 +6279,7 @@ int32_t QCameraParameters::initDefaultParameters()
manualWBModes.append(","); manualWBModes.append(",");
manualWBModes.append(KEY_QC_WB_GAIN_MODE); manualWBModes.append(KEY_QC_WB_GAIN_MODE);
} }
set(KEY_QC_SUPPORTED_MANUAL_WB_MODES, manualWBModes.string()); set(KEY_QC_SUPPORTED_MANUAL_WB_MODES, manualWBModes.c_str());
// Set Flash mode // Set Flash mode
if(m_pCapability->supported_flash_modes_cnt > 0) { if(m_pCapability->supported_flash_modes_cnt > 0) {
@ -6376,7 +6376,7 @@ int32_t QCameraParameters::initDefaultParameters()
manualExpModes.append(KEY_QC_USER_SETTING); manualExpModes.append(KEY_QC_USER_SETTING);
} }
//finally set supported manual exposure modes //finally set supported manual exposure modes
set(KEY_QC_SUPPORTED_MANUAL_EXPOSURE_MODES, manualExpModes.string()); set(KEY_QC_SUPPORTED_MANUAL_EXPOSURE_MODES, manualExpModes.c_str());
// Set HFR // Set HFR
String8 hfrValues = createHfrValuesString( String8 hfrValues = createHfrValuesString(
@ -6384,14 +6384,14 @@ int32_t QCameraParameters::initDefaultParameters()
m_pCapability->hfr_tbl_cnt, m_pCapability->hfr_tbl_cnt,
HFR_MODES_MAP, HFR_MODES_MAP,
PARAM_MAP_SIZE(HFR_MODES_MAP)); PARAM_MAP_SIZE(HFR_MODES_MAP));
set(KEY_QC_SUPPORTED_VIDEO_HIGH_FRAME_RATE_MODES, hfrValues.string()); set(KEY_QC_SUPPORTED_VIDEO_HIGH_FRAME_RATE_MODES, hfrValues.c_str());
set(KEY_QC_VIDEO_HIGH_SPEED_RECORDING, "off"); set(KEY_QC_VIDEO_HIGH_SPEED_RECORDING, "off");
set(KEY_QC_VIDEO_HIGH_FRAME_RATE, "off"); set(KEY_QC_VIDEO_HIGH_FRAME_RATE, "off");
String8 hfrSizeValues = createHfrSizesString( String8 hfrSizeValues = createHfrSizesString(
m_pCapability->hfr_tbl, m_pCapability->hfr_tbl,
m_pCapability->hfr_tbl_cnt); m_pCapability->hfr_tbl_cnt);
set(KEY_QC_SUPPORTED_HFR_SIZES, hfrSizeValues.string()); set(KEY_QC_SUPPORTED_HFR_SIZES, hfrSizeValues.c_str());
LOGD("HFR values = %s HFR Sizes = %s", hfrValues.string(), hfrSizeValues.string()); LOGD("HFR values = %s HFR Sizes = %s", hfrValues.c_str(), hfrSizeValues.c_str());
setHighFrameRate(CAM_HFR_MODE_OFF); setHighFrameRate(CAM_HFR_MODE_OFF);
// Set Focus algorithms // Set Focus algorithms
@ -6522,7 +6522,7 @@ int32_t QCameraParameters::initDefaultParameters()
if ((m_pCapability->qcom_supported_feature_mask & CAM_QCOM_FEATURE_DENOISE2D) > 0){ if ((m_pCapability->qcom_supported_feature_mask & CAM_QCOM_FEATURE_DENOISE2D) > 0){
String8 denoiseValues = createValuesStringFromMap( String8 denoiseValues = createValuesStringFromMap(
DENOISE_ON_OFF_MODES_MAP, PARAM_MAP_SIZE(DENOISE_ON_OFF_MODES_MAP)); DENOISE_ON_OFF_MODES_MAP, PARAM_MAP_SIZE(DENOISE_ON_OFF_MODES_MAP));
set(KEY_QC_SUPPORTED_DENOISE, denoiseValues.string()); set(KEY_QC_SUPPORTED_DENOISE, denoiseValues.c_str());
#ifdef DEFAULT_DENOISE_MODE_ON #ifdef DEFAULT_DENOISE_MODE_ON
setWaveletDenoise(DENOISE_ON); setWaveletDenoise(DENOISE_ON);
#else #else
@ -6742,7 +6742,7 @@ int32_t QCameraParameters::initDefaultParameters()
if (m_pCapability->qcom_supported_feature_mask & CAM_QCOM_FEATURE_ROTATION) { if (m_pCapability->qcom_supported_feature_mask & CAM_QCOM_FEATURE_ROTATION) {
videoRotationValues = createValuesStringFromMap(VIDEO_ROTATION_MODES_MAP, videoRotationValues = createValuesStringFromMap(VIDEO_ROTATION_MODES_MAP,
PARAM_MAP_SIZE(VIDEO_ROTATION_MODES_MAP)); PARAM_MAP_SIZE(VIDEO_ROTATION_MODES_MAP));
set(KEY_QC_SUPPORTED_VIDEO_ROTATION_VALUES, videoRotationValues.string()); set(KEY_QC_SUPPORTED_VIDEO_ROTATION_VALUES, videoRotationValues.c_str());
} else { } else {
set(KEY_QC_SUPPORTED_VIDEO_ROTATION_VALUES, VIDEO_ROTATION_0); set(KEY_QC_SUPPORTED_VIDEO_ROTATION_VALUES, VIDEO_ROTATION_0);
} }
@ -6756,7 +6756,7 @@ int32_t QCameraParameters::initDefaultParameters()
// Set min max values for Blur values (min: 0, max: 100, step: 1) // Set min max values for Blur values (min: 0, max: 100, step: 1)
if (isDualCamAvailable()) { if (isDualCamAvailable()) {
String8 minMaxValues = createMinMaxValuesString(MIN_BLUR, MAX_BLUR, BLUR_STEP); String8 minMaxValues = createMinMaxValuesString(MIN_BLUR, MAX_BLUR, BLUR_STEP);
set(KEY_QC_SUPPORTED_DEGREES_OF_BLUR, minMaxValues.string()); set(KEY_QC_SUPPORTED_DEGREES_OF_BLUR, minMaxValues.c_str());
set(KEY_QC_IS_BOKEH_MODE_SUPPORTED, 1); set(KEY_QC_IS_BOKEH_MODE_SUPPORTED, 1);
set(KEY_QC_IS_BOKEH_MPO_SUPPORTED, 1); set(KEY_QC_IS_BOKEH_MPO_SUPPORTED, 1);
set(KEY_QC_BOKEH_MODE, 0); set(KEY_QC_BOKEH_MODE, 0);
@ -6764,7 +6764,7 @@ int32_t QCameraParameters::initDefaultParameters()
set(KEY_QC_BOKEH_MPO_MODE, 0); set(KEY_QC_BOKEH_MPO_MODE, 0);
} else { } else {
String8 minMaxValues = createMinMaxValuesString(0, 0, 0); String8 minMaxValues = createMinMaxValuesString(0, 0, 0);
set(KEY_QC_SUPPORTED_DEGREES_OF_BLUR, minMaxValues.string()); set(KEY_QC_SUPPORTED_DEGREES_OF_BLUR, minMaxValues.c_str());
set(KEY_QC_IS_BOKEH_MODE_SUPPORTED, 0); set(KEY_QC_IS_BOKEH_MODE_SUPPORTED, 0);
set(KEY_QC_IS_BOKEH_MPO_SUPPORTED, 0); set(KEY_QC_IS_BOKEH_MPO_SUPPORTED, 0);
set(KEY_QC_BOKEH_MODE, 0); set(KEY_QC_BOKEH_MODE, 0);
@ -11235,7 +11235,7 @@ char* QCameraParameters::getParameters()
strParams = (char *)malloc(sizeof(char)*(str.length()+1)); strParams = (char *)malloc(sizeof(char)*(str.length()+1));
if(strParams != NULL){ if(strParams != NULL){
memset(strParams, 0, sizeof(char)*(str.length()+1)); memset(strParams, 0, sizeof(char)*(str.length()+1));
strlcpy(strParams, str.string(), str.length()+1); strlcpy(strParams, str.c_str(), str.length()+1);
strParams[str.length()] = 0; strParams[str.length()] = 0;
} }
@ -12194,8 +12194,8 @@ int32_t QCameraParameters::updateFocusDistances(cam_focus_distances_info_t *focu
str.append(buffer); str.append(buffer);
} }
} }
LOGH("setting KEY_FOCUS_DISTANCES as %s", __FUNCTION__, str.string()); LOGH("setting KEY_FOCUS_DISTANCES as %s", __FUNCTION__, str.c_str());
set(QCameraParameters::KEY_FOCUS_DISTANCES, str.string()); set(QCameraParameters::KEY_FOCUS_DISTANCES, str.c_str());
return NO_ERROR; return NO_ERROR;
} }

2
camera/QCamera2/HAL/QCameraPostProc.cpp
View file

@ -1855,7 +1855,7 @@ void QCameraPostProcessor::releaseNotifyData(void *user_data,
String8 unlinkPath((const char *) app_cb->release_data.data->data, String8 unlinkPath((const char *) app_cb->release_data.data->data,
app_cb->release_data.data->size); app_cb->release_data.data->size);
int rc = unlink(unlinkPath.string()); int rc = unlink(unlinkPath.c_str());
LOGH("Unlinking stored file rc = %d", LOGH("Unlinking stored file rc = %d",
rc); rc);
} }

2
camera/QCamera2/HAL3/QCamera3HWI.cpp
View file

@ -11046,7 +11046,7 @@ void QCamera3HardwareInterface::dumpMetadataToFile(tuning_params_t &meta,
type, type,
frameNumber); frameNumber);
filePath.append(buf); filePath.append(buf);
int file_fd = open(filePath.string(), O_RDWR | O_CREAT, 0777); int file_fd = open(filePath.c_str(), O_RDWR | O_CREAT, 0777);
if (file_fd >= 0) { if (file_fd >= 0) {
ssize_t written_len = 0; ssize_t written_len = 0;
meta.tuning_data_version = TUNING_DATA_VERSION; meta.tuning_data_version = TUNING_DATA_VERSION;

12
camera/QCamera2/HAL3/QCamera3PostProc.cpp
View file

@ -4000,17 +4000,17 @@ QCamera3Exif *QCamera3PostProcessor::getExifData(metadata_buffer_t *metadata,
rc = getExifDateTime(dateTime, subsecTime); rc = getExifDateTime(dateTime, subsecTime);
if (rc == NO_ERROR) { if (rc == NO_ERROR) {
exif->addEntry(EXIFTAGID_DATE_TIME, EXIF_ASCII, exif->addEntry(EXIFTAGID_DATE_TIME, EXIF_ASCII,
(uint32_t)(dateTime.length() + 1), (void *)dateTime.string()); (uint32_t)(dateTime.length() + 1), (void *)dateTime.c_str());
exif->addEntry(EXIFTAGID_EXIF_DATE_TIME_ORIGINAL, EXIF_ASCII, exif->addEntry(EXIFTAGID_EXIF_DATE_TIME_ORIGINAL, EXIF_ASCII,
(uint32_t)(dateTime.length() + 1), (void *)dateTime.string()); (uint32_t)(dateTime.length() + 1), (void *)dateTime.c_str());
exif->addEntry(EXIFTAGID_EXIF_DATE_TIME_DIGITIZED, EXIF_ASCII, exif->addEntry(EXIFTAGID_EXIF_DATE_TIME_DIGITIZED, EXIF_ASCII,
(uint32_t)(dateTime.length() + 1), (void *)dateTime.string()); (uint32_t)(dateTime.length() + 1), (void *)dateTime.c_str());
exif->addEntry(EXIFTAGID_SUBSEC_TIME, EXIF_ASCII, exif->addEntry(EXIFTAGID_SUBSEC_TIME, EXIF_ASCII,
(uint32_t)(subsecTime.length() + 1), (void *)subsecTime.string()); (uint32_t)(subsecTime.length() + 1), (void *)subsecTime.c_str());
exif->addEntry(EXIFTAGID_SUBSEC_TIME_ORIGINAL, EXIF_ASCII, exif->addEntry(EXIFTAGID_SUBSEC_TIME_ORIGINAL, EXIF_ASCII,
(uint32_t)(subsecTime.length() + 1), (void *)subsecTime.string()); (uint32_t)(subsecTime.length() + 1), (void *)subsecTime.c_str());
exif->addEntry(EXIFTAGID_SUBSEC_TIME_DIGITIZED, EXIF_ASCII, exif->addEntry(EXIFTAGID_SUBSEC_TIME_DIGITIZED, EXIF_ASCII,
(uint32_t)(subsecTime.length() + 1), (void *)subsecTime.string()); (uint32_t)(subsecTime.length() + 1), (void *)subsecTime.c_str());
} else { } else {
LOGW("getExifDateTime failed"); LOGW("getExifDateTime failed");
} }

10
camera/QCamera2/util/QCameraBokeh.cpp
View file

@ -699,8 +699,8 @@ int32_t QCameraBokeh::doBokehProcess(
auxiliaryStrideY, auxiliaryStrideVU, auxiliaryStrideY, auxiliaryStrideVU,
pDepthMap, depthStride, pDepthMap, depthStride,
goodRoi.left, goodRoi.top, goodRoi.width,goodRoi.height, goodRoi.left, goodRoi.top, goodRoi.width,goodRoi.height,
inParams.sMainReprocessInfo.string(), inParams.sAuxReprocessInfo.string(), inParams.sMainReprocessInfo.c_str(), inParams.sAuxReprocessInfo.c_str(),
inParams.sCalibData.string(), focalLengthPrimaryCamera, config, ddmMode); inParams.sCalibData.c_str(), focalLengthPrimaryCamera, config, ddmMode);
if (!status.ok()) { if (!status.ok()) {
LOGE("depth map generation failed: %s, errorcode %d", LOGE("depth map generation failed: %s, errorcode %d",
@ -960,10 +960,10 @@ String8 QCameraBokeh::extractCalibrationData()
calibData.appendFormat(CALIB_FMT_STRINGS[11], calibData.appendFormat(CALIB_FMT_STRINGS[11],
buildCommaSeparatedString(calib_data.relative_rotation_matrix, buildCommaSeparatedString(calib_data.relative_rotation_matrix,
RELCAM_CALIB_ROT_MATRIX_MAX).string()); RELCAM_CALIB_ROT_MATRIX_MAX).c_str());
calibData.appendFormat(CALIB_FMT_STRINGS[12], calibData.appendFormat(CALIB_FMT_STRINGS[12],
buildCommaSeparatedString(calib_data.relative_geometric_surface_parameters, buildCommaSeparatedString(calib_data.relative_geometric_surface_parameters,
RELCAM_CALIB_SURFACE_PARMS_MAX).string()); RELCAM_CALIB_SURFACE_PARMS_MAX).c_str());
calibData.appendFormat(CALIB_FMT_STRINGS[13], calib_data.relative_principle_point_x_offset); calibData.appendFormat(CALIB_FMT_STRINGS[13], calib_data.relative_principle_point_x_offset);
calibData.appendFormat(CALIB_FMT_STRINGS[14], calib_data.relative_principle_point_y_offset); calibData.appendFormat(CALIB_FMT_STRINGS[14], calib_data.relative_principle_point_y_offset);
@ -990,7 +990,7 @@ void QCameraBokeh::dumpInputParams(const char* file, String8 str, uint32_t idx)
int file_fd = open(filename, O_RDWR | O_CREAT, 0777); int file_fd = open(filename, O_RDWR | O_CREAT, 0777);
if (file_fd > 0) { if (file_fd > 0) {
fchmod(file_fd, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); fchmod(file_fd, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
write(file_fd, str.string(), str.size()); write(file_fd, str.c_str(), str.size());
close(file_fd); close(file_fd);
} }
} }