diff --git a/audio/hal/hdi_binder/server/src/hdf_audio_server_manager.c b/audio/hal/hdi_binder/server/src/hdf_audio_server_manager.c index 5964b25bf10d580336a9ee3702e18ca04584ec26..07a7a0aed82130554a81d2994562a6fc57b6761d 100644 --- a/audio/hal/hdi_binder/server/src/hdf_audio_server_manager.c +++ b/audio/hal/hdi_binder/server/src/hdf_audio_server_manager.c @@ -103,7 +103,7 @@ int32_t AdapterManageInit(const struct AudioAdapterDescriptor *descs, int32_t nu { int32_t index = 0; if (descs == NULL || num <= 0) { - HDF_LOGE("Invaild parameters: descs=%p, num=%d", descs, num); + HDF_LOGE("Invaild parameters: num=%{public}d", num); return HDF_FAILURE; } struct AudioInfoInAdapter *adapterManage = g_renderAndCaptureManage; diff --git a/audio/hdi_service/primary_impl/vdi_src/audio_adapter_vdi.c b/audio/hdi_service/primary_impl/vdi_src/audio_adapter_vdi.c index 4ea05bc5fa3d9b7127c908652e14e7795d99feb3..fc65a964e624d5a712aacbb29a88b1644a1f7305 100644 --- a/audio/hdi_service/primary_impl/vdi_src/audio_adapter_vdi.c +++ b/audio/hdi_service/primary_impl/vdi_src/audio_adapter_vdi.c @@ -593,6 +593,7 @@ static int32_t AudioUpdateAudioRouteVdi(struct IAudioAdapter *adapter, } EXIT: + AudioCommonFreeVdiRouteVdi(&vdiRoute); pthread_rwlock_unlock(&g_rwAdapterLock); return ret; } diff --git a/camera/vdi_base/common/adapter/platform/v4l2/src/device_manager/sensor_controller.cpp b/camera/vdi_base/common/adapter/platform/v4l2/src/device_manager/sensor_controller.cpp index 82abdedca2f4d89d2f72890f95d5fa07704fd90e..c21dfb5356d5e3422ccb371a2a4f6a6cfe445177 100644 --- a/camera/vdi_base/common/adapter/platform/v4l2/src/device_manager/sensor_controller.cpp +++ b/camera/vdi_base/common/adapter/platform/v4l2/src/device_manager/sensor_controller.cpp @@ -355,7 +355,7 @@ void SensorController::GetFocusMode(SensorController *sensorController, } uint8_t focusMode = value; - CAMERA_LOGI("Get CMD_FOCUS_MODE [%{public}]", focusMode); + CAMERA_LOGI("Get CMD_FOCUS_MODE [%{public}u]", focusMode); std::lock_guard lock(sensorController->metaDataFlaglock_); sensorController->metaDataFlag_ = true; meta->addEntry(OHOS_CONTROL_FOCUS_MODE, &focusMode, 1); @@ -371,7 +371,7 @@ void SensorController::GetFocusState(SensorController *sensorController, } uint8_t focusState = value; - CAMERA_LOGI("Get CMD_FOCUS_SATE [%{public}]", focusState); + CAMERA_LOGI("Get CMD_FOCUS_SATE [%{public}u]", focusState); std::lock_guard lock(sensorController->metaDataFlaglock_); sensorController->metaDataFlag_ = true; meta->addEntry(OHOS_CONTROL_FOCUS_STATE, &focusState, 1); @@ -386,7 +386,7 @@ void SensorController::GetExposureMode(SensorController *sensorController, } uint8_t exposureMode = value; - CAMERA_LOGI("Get CMD_FEXPOSURE_MODE [%{public}]", exposureMode); + CAMERA_LOGI("Get CMD_FEXPOSURE_MODE [%{public}u]", exposureMode); std::lock_guard lock(sensorController->metaDataFlaglock_); sensorController->metaDataFlag_ = true; meta->addEntry(OHOS_CONTROL_EXPOSURE_MODE, &exposureMode, 1); @@ -401,7 +401,7 @@ void SensorController::GetExposureTime(SensorController *sensorController, } int64_t exposureTime = value; - CAMERA_LOGI("Get CMD_FEXPOSURE_TIME [%{public}]", exposureTime); + CAMERA_LOGI("Get CMD_FEXPOSURE_TIME [%{public}d]", exposureTime); std::lock_guard lock(sensorController->metaDataFlaglock_); sensorController->metaDataFlag_ = true; meta->addEntry(OHOS_SENSOR_EXPOSURE_TIME, &exposureTime, 1); @@ -416,7 +416,7 @@ void SensorController::GetExposureCompensation(SensorController *sensorControlle } int32_t exposureCompensation = value; constexpr uint32_t DATA_COUNT = 1; - CAMERA_LOGI("Get CMD_FEXPOSURE_COMPENSATION [%{public}]", exposureCompensation); + CAMERA_LOGI("Get CMD_FEXPOSURE_COMPENSATION [%{public}d]", exposureCompensation); std::lock_guard lock(sensorController->metaDataFlaglock_); sensorController->metaDataFlag_ = true; meta->addEntry(OHOS_CONTROL_AE_EXPOSURE_COMPENSATION, &exposureCompensation, DATA_COUNT); @@ -435,7 +435,7 @@ void SensorController::GetMeterMode(SensorController *sensorController, } uint8_t meterMode = value; - CAMERA_LOGI("Get CMD_METER_MODE [%{public}]", meterMode); + CAMERA_LOGI("Get CMD_METER_MODE [%{public}u]", meterMode); std::lock_guard lock(sensorController->metaDataFlaglock_); sensorController->metaDataFlag_ = true; meta->addEntry(OHOS_CONTROL_METER_MODE, &meterMode, 1); @@ -450,7 +450,7 @@ void SensorController::GetExposureState(SensorController *sensorController, } uint8_t exposureState = value; - CAMERA_LOGI("Get CMD_EXPOSURE_STATE [%{public}]", exposureState); + CAMERA_LOGI("Get CMD_EXPOSURE_STATE [%{public}u]", exposureState); std::lock_guard lock(sensorController->metaDataFlaglock_); sensorController->metaDataFlag_ = true; meta->addEntry(OHOS_CONTROL_EXPOSURE_STATE, &exposureState, 1); @@ -465,7 +465,7 @@ void SensorController::GetFlashMode(SensorController *sensorController, } uint8_t flashMode = value; - CAMERA_LOGI("Get CMD_FLASH_MODE [%{public}]", flashMode); + CAMERA_LOGI("Get CMD_FLASH_MODE [%{public}u]", flashMode); std::lock_guard lock(sensorController->metaDataFlaglock_); sensorController->metaDataFlag_ = true; meta->addEntry(OHOS_CONTROL_FLASH_MODE, &flashMode, 1); @@ -480,7 +480,7 @@ void SensorController::GetCaptureMirror(SensorController *sensorController, } uint8_t captureMirror = value; - CAMERA_LOGI("Get CMD_CAPTURE_MIRROR [%{public}]", captureMirror); + CAMERA_LOGI("Get CMD_CAPTURE_MIRROR [%{public}u]", captureMirror); std::lock_guard lock(sensorController->metaDataFlaglock_); sensorController->metaDataFlag_ = true; meta->addEntry(OHOS_CONTROL_CAPTURE_MIRROR, &captureMirror, 1); diff --git a/camera/vdi_base/usb_camera/vdi_impl/src/camera_host/camera_host_usb_vdi_impl.cpp b/camera/vdi_base/usb_camera/vdi_impl/src/camera_host/camera_host_usb_vdi_impl.cpp index 069d149f621ba09c26e002f7bbf956b5669a6601..1e391d4ba156f3766abaa968b4513535c901480e 100644 --- a/camera/vdi_base/usb_camera/vdi_impl/src/camera_host/camera_host_usb_vdi_impl.cpp +++ b/camera/vdi_base/usb_camera/vdi_impl/src/camera_host/camera_host_usb_vdi_impl.cpp @@ -1,4 +1,4 @@ -/* +/* * Copyright (c) 2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -162,7 +162,7 @@ int32_t CameraHostVdiImpl::OpenCamera(const std::string &cameraId, const sptrsecond.get()); + CAMERA_LOGI("OpenCamera cameraId find success."); std::shared_ptr cameraDevice = itr->second; if (cameraDevice == nullptr) { diff --git a/camera/vdi_base/v4l2/src/stream_operator/stream_base.cpp b/camera/vdi_base/v4l2/src/stream_operator/stream_base.cpp index 6ab001d97b23a31753ff08504f63222b31223a29..f66a2b393a9d23912fe73c7ec124dcd4d6be5fe3 100644 --- a/camera/vdi_base/v4l2/src/stream_operator/stream_base.cpp +++ b/camera/vdi_base/v4l2/src/stream_operator/stream_base.cpp @@ -66,7 +66,7 @@ RetCode StreamBase::ConfigStream(StreamConfiguration& config) if (tunnel_ != nullptr) { streamConfig_.tunnelMode = true; } - streamConfig_.bufferCount = static_cast(GetBufferCount()); + streamConfig_.bufferCount = static_cast(GetBufferCount()); streamConfig_.maxBatchCaptureCount = 1; streamConfig_.maxCaptureCount = 1; // get device cappability to override configuration diff --git a/sensor/hal/src/sensor_controller.c b/sensor/hal/src/sensor_controller.c index dd2db89487da2ee08256f2a40b5a3695c8a71019..34741622f6ea27ef68ad055abd9d978d6f00a04d 100644 --- a/sensor/hal/src/sensor_controller.c +++ b/sensor/hal/src/sensor_controller.c @@ -436,6 +436,11 @@ static int32_t ReadData(int32_t sensorId, struct SensorEvents *event) struct HdfSBuf *msg = HdfSbufObtainDefaultSize(); CHECK_NULL_PTR_RETURN_VALUE(msg, SENSOR_NULL_PTR); struct HdfSBuf *reply = HdfSbufObtain(HDF_SENSOR_EVENT_MAX_SIZE); + if (reply == NULL) { + HDF_LOGE("%s: Sensor write id fail!", __func__); + HdfSbufRecycle(msg); + return SENSOR_FAILURE; + } CHECK_NULL_PTR_RETURN_VALUE(reply, SENSOR_NULL_PTR); if (!HdfSbufWriteInt32(msg, sensorId)) {