From 2f96e71a7aea2499e67771f10ed70fd38a8662b2 Mon Sep 17 00:00:00 2001 From: wanghongen Date: Tue, 5 Aug 2025 15:02:34 +0800 Subject: [PATCH 1/8] =?UTF-8?q?0805=E5=91=8A=E8=AD=A6=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanghongen --- .../server/src/hdf_audio_server_manager.c | 2 +- .../primary_impl/vdi_src/audio_adapter_vdi.c | 1 + .../src/device_manager/sensor_controller.cpp | 18 +++++++++--------- .../camera_host/camera_host_usb_vdi_impl.cpp | 2 +- .../v4l2/src/stream_operator/stream_base.cpp | 2 +- sensor/hal/src/sensor_controller.c | 5 +++++ 6 files changed, 18 insertions(+), 12 deletions(-) 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 5964b25bf1..11b1259fd9 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=%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 4ea05bc5fa..fc65a964e6 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 82abdedca2..ac05c83f6b 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 [%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 [%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 [%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 [%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 [%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 [%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 [%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 [%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 [%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 069d149f62..04033a8153 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 @@ -162,7 +162,7 @@ int32_t CameraHostVdiImpl::OpenCamera(const std::string &cameraId, const sptrsecond.get()); + CAMERA_LOGI("OpenCamera cameraId find success. %{public}p", (void*)itr->second.get()); 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 6ab001d97b..f66a2b393a 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 dd2db89487..d71b88c951 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("{public}s: Sensor write id fail!", __func__); + HdfSbufRecycle(msg); + return; + } CHECK_NULL_PTR_RETURN_VALUE(reply, SENSOR_NULL_PTR); if (!HdfSbufWriteInt32(msg, sensorId)) { -- Gitee From 68c80bfb669f86ac0cdd30ec99167d193afaca19 Mon Sep 17 00:00:00 2001 From: wanghongenaf Date: Tue, 5 Aug 2025 07:41:05 +0000 Subject: [PATCH 2/8] update sensor/hal/src/sensor_controller.c. Signed-off-by: wanghongenaf --- sensor/hal/src/sensor_controller.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sensor/hal/src/sensor_controller.c b/sensor/hal/src/sensor_controller.c index d71b88c951..4811793bbd 100644 --- a/sensor/hal/src/sensor_controller.c +++ b/sensor/hal/src/sensor_controller.c @@ -436,7 +436,7 @@ 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) } { + if (reply == NULL) { HDF_LOGE("{public}s: Sensor write id fail!", __func__); HdfSbufRecycle(msg); return; @@ -445,12 +445,12 @@ static int32_t ReadData(int32_t sensorId, struct SensorEvents *event) if (!HdfSbufWriteInt32(msg, sensorId)) { HDF_LOGE("%{public}s: Sensor write id failed", __func__); - goto ERROR; + goto Error; } if (!HdfSbufWriteInt32(msg, SENSOR_OPS_IO_CMD_READ_DATA)) { HDF_LOGE("%{public}s: Sensor write readData failed", __func__); - goto ERROR; + goto Error; } int32_t ret = SendSensorMsg(sensorId, msg, reply); @@ -464,14 +464,14 @@ static int32_t ReadData(int32_t sensorId, struct SensorEvents *event) ret = GetSensorEvent(reply, event); if (ret != SENSOR_SUCCESS) { HDF_LOGE("%{public}s: Sensor get data from reply failed", __func__); - goto ERROR; + goto Error; } HdfSbufRecycle(reply); HdfSbufRecycle(msg); return HDF_SUCCESS; -ERROR: +Error: HdfSbufRecycle(reply); HdfSbufRecycle(msg); return HDF_FAILURE; -- Gitee From a1a52e26134ccc4b2732e2fb6fa50958b5dc402c Mon Sep 17 00:00:00 2001 From: wanghongenaf Date: Tue, 5 Aug 2025 07:43:04 +0000 Subject: [PATCH 3/8] update sensor/hal/src/sensor_controller.c. Signed-off-by: wanghongenaf --- sensor/hal/src/sensor_controller.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sensor/hal/src/sensor_controller.c b/sensor/hal/src/sensor_controller.c index 4811793bbd..b4eb206bcc 100644 --- a/sensor/hal/src/sensor_controller.c +++ b/sensor/hal/src/sensor_controller.c @@ -445,12 +445,12 @@ static int32_t ReadData(int32_t sensorId, struct SensorEvents *event) if (!HdfSbufWriteInt32(msg, sensorId)) { HDF_LOGE("%{public}s: Sensor write id failed", __func__); - goto Error; + goto ERROR; } if (!HdfSbufWriteInt32(msg, SENSOR_OPS_IO_CMD_READ_DATA)) { HDF_LOGE("%{public}s: Sensor write readData failed", __func__); - goto Error; + goto ERROR; } int32_t ret = SendSensorMsg(sensorId, msg, reply); @@ -464,14 +464,14 @@ static int32_t ReadData(int32_t sensorId, struct SensorEvents *event) ret = GetSensorEvent(reply, event); if (ret != SENSOR_SUCCESS) { HDF_LOGE("%{public}s: Sensor get data from reply failed", __func__); - goto Error; + goto ERROR; } HdfSbufRecycle(reply); HdfSbufRecycle(msg); return HDF_SUCCESS; -Error: +ERROR: HdfSbufRecycle(reply); HdfSbufRecycle(msg); return HDF_FAILURE; -- Gitee From 24a3b7795125686f32293edd1a3d72d767aad5cc Mon Sep 17 00:00:00 2001 From: wanghongenaf Date: Tue, 5 Aug 2025 09:22:45 +0000 Subject: [PATCH 4/8] update sensor/hal/src/sensor_controller.c. Signed-off-by: wanghongenaf --- sensor/hal/src/sensor_controller.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sensor/hal/src/sensor_controller.c b/sensor/hal/src/sensor_controller.c index b4eb206bcc..1c167fec63 100644 --- a/sensor/hal/src/sensor_controller.c +++ b/sensor/hal/src/sensor_controller.c @@ -437,7 +437,7 @@ static int32_t ReadData(int32_t sensorId, struct SensorEvents *event) CHECK_NULL_PTR_RETURN_VALUE(msg, SENSOR_NULL_PTR); struct HdfSBuf *reply = HdfSbufObtain(HDF_SENSOR_EVENT_MAX_SIZE); if (reply == NULL) { - HDF_LOGE("{public}s: Sensor write id fail!", __func__); + HDF_LOGE("%s: Sensor write id fail!", __func__); HdfSbufRecycle(msg); return; } -- Gitee From 368ed8706fa547a6a9f10b05173b29a7543322a5 Mon Sep 17 00:00:00 2001 From: wanghongenaf Date: Tue, 5 Aug 2025 10:12:22 +0000 Subject: [PATCH 5/8] update sensor/hal/src/sensor_controller.c. Signed-off-by: wanghongenaf --- sensor/hal/src/sensor_controller.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sensor/hal/src/sensor_controller.c b/sensor/hal/src/sensor_controller.c index 1c167fec63..34741622f6 100644 --- a/sensor/hal/src/sensor_controller.c +++ b/sensor/hal/src/sensor_controller.c @@ -439,7 +439,7 @@ static int32_t ReadData(int32_t sensorId, struct SensorEvents *event) if (reply == NULL) { HDF_LOGE("%s: Sensor write id fail!", __func__); HdfSbufRecycle(msg); - return; + return SENSOR_FAILURE; } CHECK_NULL_PTR_RETURN_VALUE(reply, SENSOR_NULL_PTR); -- Gitee From 79ccbcb52fc5f4c800738e5a15d7bd925e5c9544 Mon Sep 17 00:00:00 2001 From: wanghongenaf Date: Wed, 6 Aug 2025 02:44:58 +0000 Subject: [PATCH 6/8] update camera/vdi_base/common/adapter/platform/v4l2/src/device_manager/sensor_controller.cpp. Signed-off-by: wanghongenaf --- .../src/device_manager/sensor_controller.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 ac05c83f6b..c21dfb5356 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 [%u]", 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 [%u]", 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 [%u]", 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 [%d]", 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 [%d]", 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 [%u]", 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 [%u]", 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 [%u]", 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 [%u]", 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); -- Gitee From d00a87f340322d7145436676d21dd8669d3b4caf Mon Sep 17 00:00:00 2001 From: wanghongenaf Date: Wed, 6 Aug 2025 03:07:23 +0000 Subject: [PATCH 7/8] update camera/vdi_base/usb_camera/vdi_impl/src/camera_host/camera_host_usb_vdi_impl.cpp. Signed-off-by: wanghongenaf --- .../vdi_impl/src/camera_host/camera_host_usb_vdi_impl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 04033a8153..1e391d4ba1 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) { -- Gitee From 4043be4ed638966d246d66a9c2875893a969f11f Mon Sep 17 00:00:00 2001 From: wanghongenaf Date: Wed, 6 Aug 2025 11:26:50 +0000 Subject: [PATCH 8/8] update audio/hal/hdi_binder/server/src/hdf_audio_server_manager.c. Signed-off-by: wanghongenaf --- audio/hal/hdi_binder/server/src/hdf_audio_server_manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 11b1259fd9..07a7a0aed8 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: num=%d", num); + HDF_LOGE("Invaild parameters: num=%{public}d", num); return HDF_FAILURE; } struct AudioInfoInAdapter *adapterManage = g_renderAndCaptureManage; -- Gitee