diff --git a/common/include/utils/distributed_hardware_log.h b/common/include/utils/distributed_hardware_log.h index 87940053b01ebc6b36a022771fe578ce5c266b85..e16d96ff7f9e17eff12bba759cbfb02c285b8f7a 100644 --- a/common/include/utils/distributed_hardware_log.h +++ b/common/include/utils/distributed_hardware_log.h @@ -16,32 +16,78 @@ #ifndef OHOS_DCAMERA_SA_LOG_H #define OHOS_DCAMERA_SA_LOG_H -#include - -#include "dh_log.h" +#include "hilog/log.h" +#include namespace OHOS { namespace DistributedHardware { +#undef LOG_TAG +#define LOG_TAG "DCAMERA" + #define DCAMERA_FILENAME (__builtin_strrchr(__FILE__, '/') ? __builtin_strrchr(__FILE__, '/') + 1 : __FILE__) #define _sl_(x) #x #define _strline_(x) _sl_(x) #define DCAMERA_STR_LINE _strline_(__LINE__) -#define DHLOGD(fmt, ...) DHLog(DH_LOG_DEBUG, \ - (std::string("[") + DH_LOG_TAG + "][" + __FUNCTION__ + "][" + DCAMERA_FILENAME + ":" + DCAMERA_STR_LINE + "]:" + \ - fmt).c_str(), ##__VA_ARGS__) +#define DHLOGD(fmt, ...) HILOG_DEBUG(LOG_CORE, "[%{public}s][%{public}s][%{public}s:%{public}s]:" fmt, \ + DH_LOG_TAG, __FUNCTION__, DCAMERA_FILENAME, DCAMERA_STR_LINE, ##__VA_ARGS__) + +#define DHLOGI(fmt, ...) HILOG_INFO(LOG_CORE, "[%{public}s][%{public}s][%{public}s:%{public}s]:" fmt, \ + DH_LOG_TAG, __FUNCTION__, DCAMERA_FILENAME, DCAMERA_STR_LINE, ##__VA_ARGS__) + +#define DHLOGW(fmt, ...) HILOG_WARN(LOG_CORE, "[%{public}s][%{public}s][%{public}s:%{public}s]:" fmt, \ + DH_LOG_TAG, __FUNCTION__, DCAMERA_FILENAME, DCAMERA_STR_LINE, ##__VA_ARGS__) + +#define DHLOGE(fmt, ...) HILOG_ERROR(LOG_CORE, "[%{public}s][%{public}s][%{public}s:%{public}s]:" fmt, \ + DH_LOG_TAG, __FUNCTION__, DCAMERA_FILENAME, DCAMERA_STR_LINE, ##__VA_ARGS__) + +#define CHECK_AND_RETURN_RET_LOG(cond, ret, fmt, ...) \ + do { \ + if ((cond)) { \ + DHLOGE(fmt, ##__VA_ARGS__); \ + return (ret); \ + } \ + } while (0) + +#define CHECK_AND_RETURN_LOG(cond, fmt, ...) \ + do { \ + if ((cond)) { \ + DHLOGE(fmt, ##__VA_ARGS__); \ + return; \ + } \ + } while (0) + +#define CHECK_AND_LOG(cond, fmt, ...) \ + do { \ + if ((cond)) { \ + DHLOGE(fmt, ##__VA_ARGS__); \ + } \ + } while (0) -#define DHLOGI(fmt, ...) DHLog(DH_LOG_INFO, \ - (std::string("[") + DH_LOG_TAG + "][" + __FUNCTION__ + "][" + DCAMERA_FILENAME + ":" + DCAMERA_STR_LINE + "]:" + \ - fmt).c_str(), ##__VA_ARGS__) +#define CHECK_NULL_RETURN(cond, ret, ...) \ + do { \ + if ((cond)) { \ + return (ret); \ + } \ + } while (0) -#define DHLOGW(fmt, ...) DHLog(DH_LOG_WARN, \ - (std::string("[") + DH_LOG_TAG + "][" + __FUNCTION__ + "][" + DCAMERA_FILENAME + ":" + DCAMERA_STR_LINE + "]:" + \ - fmt).c_str(), ##__VA_ARGS__) +#define CHECK_NULL_FREE_RETURN(ptr, ret, root, ...) \ + do { \ + if ((ptr) == nullptr) { \ + DHLOGE("Address pointer is null"); \ + cJSON_Delete((root)); \ + return (ret); \ + } \ + } while (0) -#define DHLOGE(fmt, ...) DHLog(DH_LOG_ERROR, \ - (std::string("[") + DH_LOG_TAG + "][" + __FUNCTION__ + "][" + DCAMERA_FILENAME + ":" + DCAMERA_STR_LINE + "]:" + \ - fmt).c_str(), ##__VA_ARGS__) +#define CHECK_AND_FREE_RETURN_RET_LOG(cond, ret, root, fmt, ...) \ + do { \ + if ((cond)) { \ + DHLOGE(fmt, ##__VA_ARGS__); \ + cJSON_Delete((root)); \ + return (ret); \ + } \ + } while (0) } // namespace DistributedHardware } // namespace OHOS #endif // OHOS_DCAMERA_SA_LOG_H diff --git a/common/src/utils/dcamera_buffer_handle.cpp b/common/src/utils/dcamera_buffer_handle.cpp index cb91f2c14fe7c4625ce256b11c9b287001dfc89e..3d6d40c1c99379adbe60f59a0485e10781e12e82 100644 --- a/common/src/utils/dcamera_buffer_handle.cpp +++ b/common/src/utils/dcamera_buffer_handle.cpp @@ -33,7 +33,7 @@ void* DCameraMemoryMap(const BufferHandle *buffer) void* virAddr = mmap(NULL, buffer->size, PROT_READ | PROT_WRITE, MAP_SHARED, buffer->fd, 0); if (virAddr == MAP_FAILED) { - DHLOGE("mmap failed errno %s, fd : %d", strerror(errno), buffer->fd); + DHLOGE("mmap failed errno %{public}s, fd : %{public}d", strerror(errno), buffer->fd); return nullptr; } return virAddr; @@ -48,7 +48,7 @@ void DCameraMemoryUnmap(BufferHandle *buffer) if (buffer->virAddr != nullptr) { int ret = munmap(buffer->virAddr, buffer->size); if (ret != 0) { - DHLOGE("munmap failed err: %s", strerror(errno)); + DHLOGE("munmap failed err: %{public}s", strerror(errno)); } } buffer->virAddr = nullptr; diff --git a/common/src/utils/dcamera_hisysevent_adapter.cpp b/common/src/utils/dcamera_hisysevent_adapter.cpp index 9fa839343e5c1d458ea897d7c55d45f9c00c1a59..3a3d2464afde0b68e2399091fd22cff892a293da 100644 --- a/common/src/utils/dcamera_hisysevent_adapter.cpp +++ b/common/src/utils/dcamera_hisysevent_adapter.cpp @@ -43,7 +43,7 @@ void ReportDcamerInitFail(const std::string& eventName, int32_t errCode, const s "ERRCODE", errCode, "MSG", errMsg); if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error ret %d, errMsg %s.", ret, errMsg.c_str()); + DHLOGE("Write HiSysEvent error ret %{public}d, errMsg %{public}s.", ret, errMsg.c_str()); } } @@ -71,7 +71,7 @@ void ReportDcamerOptFail(const std::string& eventName, int32_t errCode, const st "ERRCODE", errCode, "MSG", errMsg); if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error ret %d, errMsg %s.", ret, errMsg.c_str()); + DHLOGE("Write HiSysEvent error ret %{public}d, errMsg %{public}s.", ret, errMsg.c_str()); } } @@ -83,7 +83,7 @@ void ReportSaEvent(const std::string& eventName, int32_t saId, const std::string "SAID", saId, "MSG", errMsg); if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + DHLOGE("Write HiSysEvent error, ret:%{public}d, errMsg %{public}s.", ret, errMsg.c_str()); } } @@ -98,7 +98,7 @@ void ReportRegisterCameraEvent(const std::string& eventName, const std::string& "VERSION", version, "MSG", errMsg); if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + DHLOGE("Write HiSysEvent error, ret:%{public}d, errMsg %{public}s.", ret, errMsg.c_str()); } } @@ -112,7 +112,7 @@ void ReportCameraOperaterEvent(const std::string& eventName, const std::string& "DHID", dhId, "MSG", errMsg); if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + DHLOGE("Write HiSysEvent error, ret:%{public}d, errMsg %{public}s.", ret, errMsg.c_str()); } } @@ -129,7 +129,7 @@ void ReportStartCaptureEvent(const std::string& eventName, EventCaptureInfo& cap "STREAMTYPE", ENUM_STREAMTYPE_STRINGS[capture.type_], "MSG", errMsg); if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + DHLOGE("Write HiSysEvent error, ret:%{public}d, errMsg %{public}s.", ret, errMsg.c_str()); } } diff --git a/common/src/utils/dcamera_utils_tools.cpp b/common/src/utils/dcamera_utils_tools.cpp index cc90d44ad6e36b5710c3ada36f207d715b2f6642..1f1e390813aae4e289b93dbd28132fec1b9b63d7 100644 --- a/common/src/utils/dcamera_utils_tools.cpp +++ b/common/src/utils/dcamera_utils_tools.cpp @@ -44,7 +44,7 @@ int32_t GetLocalDeviceNetworkId(std::string& networkId) NodeBasicInfo basicInfo = { { 0 } }; int32_t ret = GetLocalNodeDeviceInfo(DCAMERA_PKG_NAME.c_str(), &basicInfo); if (ret != DCAMERA_OK) { - DHLOGE("GetLocalNodeDeviceInfo failed ret: %d", ret); + DHLOGE("GetLocalNodeDeviceInfo failed ret: %{public}d", ret); return ret; } diff --git a/common/test/unittest/common/utils/BUILD.gn b/common/test/unittest/common/utils/BUILD.gn index 0a5a52e37a2990cc1095de39e38d1b1c15e5261e..9f197d015096ee61d811c0b5f2ee0e3b81ca85e3 100644 --- a/common/test/unittest/common/utils/BUILD.gn +++ b/common/test/unittest/common/utils/BUILD.gn @@ -56,6 +56,7 @@ ohos_unittest("CommonUtilsTest") { "c_utils:utils", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "hdf_core:libhdi", + "hilog:libhilog", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn index 98a722d5d5bb5d9ec4363f05a43e57b04b8bd089..2938bb354c88942875e01c767b32ae85e8a6eaa6 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn @@ -54,6 +54,7 @@ ohos_shared_library("distributed_camera_sink_sdk") { external_deps = [ "c_utils:utils", "distributed_hardware_fwk:distributedhardwareutils", + "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/callback/dcamera_sink_callback.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/callback/dcamera_sink_callback.cpp index d9dd4060fd8ed169845b7d920561f137e0619ddd..4cac74bf2a3fed05780dc4e38a46cc50a86c0daf 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/callback/dcamera_sink_callback.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/callback/dcamera_sink_callback.cpp @@ -29,8 +29,8 @@ DCameraSinkCallback::~DCameraSinkCallback() int32_t DCameraSinkCallback::OnNotifyResourceInfo(const ResourceEventType &type, const std::string &subtype, const std::string &networkId, bool &isSensitive, bool &isSameAccout) { - DHLOGI("DCameraSinkCallback OnNotifyResourceInfo type: %d, subtype: %s, networkId: %s, " - "isSensitive: %d, isSameAccout: %d", (uint32_t)type, subtype.c_str(), + DHLOGI("DCameraSinkCallback OnNotifyResourceInfo type: %{public}d, subtype: %{public}s, networkId: %{public}s, " + "isSensitive: %{public}d, isSameAccout: %{public}d", (uint32_t)type, subtype.c_str(), GetAnonyString(networkId).c_str(), isSensitive, isSameAccout); int32_t ret = DCAMERA_OK; std::lock_guard lock(privacyResMutex_); diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/callback/dcamera_sink_callback_stub.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/callback/dcamera_sink_callback_stub.cpp index 49b5ede385e2c2c8f922dd612ee18e4fcef039e7..8d32f64d65d475cc5b0a3a0b37c9b48af805f203 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/callback/dcamera_sink_callback_stub.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/callback/dcamera_sink_callback_stub.cpp @@ -34,7 +34,7 @@ DCameraSinkCallbackStub::~DCameraSinkCallbackStub() int32_t DCameraSinkCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - DHLOGI("DCameraSinkCallbackStub OnRemoteRequest code: %u", code); + DHLOGI("DCameraSinkCallbackStub OnRemoteRequest code: %{public}u", code); std::u16string desc = DCameraSinkCallbackStub::GetDescriptor(); std::u16string remoteDesc = data.ReadInterfaceToken(); if (desc != remoteDesc) { diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp index 1daab07ca16ad5a8dd7c2ab3de7b72670b4c5efb..3b9a5a41e1db489973ff5f223febe014ef451427 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp @@ -68,7 +68,8 @@ int32_t DCameraSinkHandler::InitSink(const std::string& params) sptr loadCallback(new DCameraSinkLoadCallback(params)); int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, loadCallback); if (ret != DCAMERA_OK) { - DHLOGE("systemAbilityId: %d load filed, result code: %d.", DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, ret); + DHLOGE("systemAbilityId: %{public}d load filed, result code: %{public}d.", + DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, ret); return DCAMERA_INIT_ERR; } { @@ -82,7 +83,7 @@ int32_t DCameraSinkHandler::InitSink(const std::string& params) return DCAMERA_INIT_ERR; } } - DHLOGI("end, result: %d", ret); + DHLOGI("end, result: %{public}d", ret); return DCAMERA_OK; } @@ -102,7 +103,7 @@ void DCameraSinkHandler::FinishStartSA(const std::string& params) void DCameraSinkHandler::FinishStartSAFailed(const int32_t systemAbilityId) { - DHLOGI("SinkSA Start failed, systemAbilityId: %d.", systemAbilityId); + DHLOGI("SinkSA Start failed, systemAbilityId: %{public}d.", systemAbilityId); std::unique_lock lock(producerMutex_); state_ = DCAMERA_SA_STATE_STOP; producerCon_.notify_one(); @@ -120,7 +121,7 @@ int32_t DCameraSinkHandler::ReleaseSink() ReportSaEvent(RELEASE_SA_EVENT, DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, "release sink sa event."); int32_t ret = dCameraSinkSrv->ReleaseSink(); if (ret != DCAMERA_OK) { - DHLOGE("sink service release failed, ret: %d", ret); + DHLOGE("sink service release failed, ret: %{public}d", ret); return ret; } @@ -133,7 +134,7 @@ int32_t DCameraSinkHandler::ReleaseSink() int32_t DCameraSinkHandler::SubscribeLocalHardware(const std::string& dhId, const std::string& parameters) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DHLOGI("dhId: %{public}s", GetAnonyString(dhId).c_str()); sptr dCameraSinkSrv = DCameraSinkHandlerIpc::GetInstance().GetSinkLocalCamSrv(); if (dCameraSinkSrv == nullptr) { DHLOGE("get Service failed"); @@ -144,7 +145,7 @@ int32_t DCameraSinkHandler::SubscribeLocalHardware(const std::string& dhId, cons int32_t DCameraSinkHandler::UnsubscribeLocalHardware(const std::string& dhId) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DHLOGI("dhId: %{public}s", GetAnonyString(dhId).c_str()); sptr dCameraSinkSrv = DCameraSinkHandlerIpc::GetInstance().GetSinkLocalCamSrv(); if (dCameraSinkSrv == nullptr) { DHLOGE("get Service failed"); diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler_ipc.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler_ipc.cpp index ce9cb7769710ddb2a3494ebd6c066b3b404d067b..f18e120c2131b755ae45143fb1a5546b6112005b 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler_ipc.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler_ipc.cpp @@ -92,7 +92,7 @@ sptr DCameraSinkHandlerIpc::GetSinkLocalCamSrv() int32_t ret = object->AddDeathRecipient(sinkLocalRecipient_); sptr localSink = iface_cast(object); if (localSink == nullptr) { - DHLOGI("GetSinkLocalCamSrv failed, localSink is null ret: %d", ret); + DHLOGI("GetSinkLocalCamSrv failed, localSink is null ret: %{public}d", ret); return nullptr; } { @@ -102,7 +102,7 @@ sptr DCameraSinkHandlerIpc::GetSinkLocalCamSrv() } localSink_ = localSink; } - DHLOGI("GetSinkLocalCamSrv success, AddDeathRecipient ret: %d", ret); + DHLOGI("GetSinkLocalCamSrv success, AddDeathRecipient ret: %{public}d", ret); return localSink; } diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp index f7ea2632d70eb80331bed7cbb08747b4274f2c2b..6d064869f2c8540f93d53724f3b71e41bed65045 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp @@ -27,7 +27,7 @@ DCameraSinkLoadCallback::DCameraSinkLoadCallback(const std::string& params) : pa void DCameraSinkLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbilityId, const sptr& remoteObject) { - DHLOGI("OnLoadSystemAbilitySuccess systemAbilityId: %d, IRmoteObject result: %s", + DHLOGI("OnLoadSystemAbilitySuccess systemAbilityId: %{public}d, IRmoteObject result: %{public}s", systemAbilityId, (remoteObject != nullptr) ? "true" : "false"); if (systemAbilityId != DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID) { DHLOGE("start aystemabilityId is not sinkSAId!"); @@ -42,7 +42,7 @@ void DCameraSinkLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbilityId void DCameraSinkLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) { - DHLOGI("OnLoadSystemAbilityFail systemAbilityId: %d.", systemAbilityId); + DHLOGI("OnLoadSystemAbilityFail systemAbilityId: %{public}d.", systemAbilityId); if (systemAbilityId != DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID) { DHLOGE("start aystemabilityId is not sinkSAId!"); ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_SA_ERROR, diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/distributed_camera_sink_proxy.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/distributed_camera_sink_proxy.cpp index ecc6ebdbf3c4919bb76e50d15cc6659fdb12a403..cb4a59854aed3a702031d5220fb212ee2c57555a 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/distributed_camera_sink_proxy.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/distributed_camera_sink_proxy.cpp @@ -80,7 +80,7 @@ int32_t DistributedCameraSinkProxy::ReleaseSink() int32_t DistributedCameraSinkProxy::SubscribeLocalHardware(const std::string& dhId, const std::string& parameters) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DHLOGI("dhId: %{public}s", GetAnonyString(dhId).c_str()); if (parameters.empty() || parameters.size() > PARAM_MAX_SIZE || dhId.empty() || dhId.size() > DID_MAX_SIZE) { DHLOGE("params is invalid"); @@ -111,7 +111,7 @@ int32_t DistributedCameraSinkProxy::SubscribeLocalHardware(const std::string& dh int32_t DistributedCameraSinkProxy::UnsubscribeLocalHardware(const std::string& dhId) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DHLOGI("dhId: %{public}s", GetAnonyString(dhId).c_str()); if (dhId.empty() || dhId.size() > DID_MAX_SIZE) { DHLOGE("params is invalid"); return DCAMERA_BAD_VALUE; @@ -141,7 +141,7 @@ int32_t DistributedCameraSinkProxy::UnsubscribeLocalHardware(const std::string& int32_t DistributedCameraSinkProxy::StopCapture(const std::string& dhId) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DHLOGI("dhId: %{public}s", GetAnonyString(dhId).c_str()); if (dhId.empty() || dhId.size() > DID_MAX_SIZE) { DHLOGE("params is invalid"); return DCAMERA_BAD_VALUE; @@ -165,13 +165,13 @@ int32_t DistributedCameraSinkProxy::StopCapture(const std::string& dhId) } remote->SendRequest(static_cast(IDCameraSinkInterfaceCode::STOP_CAPTURE), data, reply, option); int32_t result = reply.ReadInt32(); - DHLOGI("async dhId: %s", GetAnonyString(dhId).c_str()); + DHLOGI("async dhId: %{public}s", GetAnonyString(dhId).c_str()); return result; } int32_t DistributedCameraSinkProxy::ChannelNeg(const std::string& dhId, std::string& channelInfo) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DHLOGI("dhId: %{public}s", GetAnonyString(dhId).c_str()); if (dhId.empty() || dhId.size() > DID_MAX_SIZE || channelInfo.empty() || channelInfo.size() > PARAM_MAX_SIZE) { DHLOGE("params is invalid"); @@ -201,7 +201,7 @@ int32_t DistributedCameraSinkProxy::ChannelNeg(const std::string& dhId, std::str int32_t DistributedCameraSinkProxy::GetCameraInfo(const std::string& dhId, std::string& cameraInfo) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DHLOGI("dhId: %{public}s", GetAnonyString(dhId).c_str()); if (dhId.empty() || dhId.size() > DID_MAX_SIZE) { DHLOGE("parmas is invalid"); return DCAMERA_BAD_VALUE; @@ -230,7 +230,7 @@ int32_t DistributedCameraSinkProxy::GetCameraInfo(const std::string& dhId, std:: int32_t DistributedCameraSinkProxy::OpenChannel(const std::string& dhId, std::string& openInfo) { - DHLOGI("DistributedCameraSinkProxy OpenChannel Begin,dhId: %s", GetAnonyString(dhId).c_str()); + DHLOGI("DistributedCameraSinkProxy OpenChannel Begin,dhId: %{public}s", GetAnonyString(dhId).c_str()); if (dhId.empty() || dhId.size() > DID_MAX_SIZE || openInfo.empty() || openInfo.size() > PARAM_MAX_SIZE) { DHLOGE("params is invalid"); @@ -255,13 +255,13 @@ int32_t DistributedCameraSinkProxy::OpenChannel(const std::string& dhId, std::st } remote->SendRequest(static_cast(IDCameraSinkInterfaceCode::OPEN_CHANNEL), data, reply, option); int32_t result = reply.ReadInt32(); - DHLOGI("DistributedCameraSinkProxy OpenChannel End,result: %d", result); + DHLOGI("DistributedCameraSinkProxy OpenChannel End,result: %{public}d", result); return result; } int32_t DistributedCameraSinkProxy::CloseChannel(const std::string& dhId) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DHLOGI("dhId: %{public}s", GetAnonyString(dhId).c_str()); if (dhId.empty() || dhId.size() > DID_MAX_SIZE) { DHLOGE("params is invalid"); return DCAMERA_BAD_VALUE; @@ -290,7 +290,7 @@ int32_t DistributedCameraSinkProxy::CloseChannel(const std::string& dhId) int32_t DistributedCameraSinkProxy::PauseDistributedHardware(const std::string &networkId) { - DHLOGI("networkId: %s", GetAnonyString(networkId).c_str()); + DHLOGI("networkId: %{public}s", GetAnonyString(networkId).c_str()); sptr remote = Remote(); if (remote == nullptr) { DHLOGE("remote service is null"); @@ -316,7 +316,7 @@ int32_t DistributedCameraSinkProxy::PauseDistributedHardware(const std::string & int32_t DistributedCameraSinkProxy::ResumeDistributedHardware(const std::string &networkId) { - DHLOGI("networkId: %s", GetAnonyString(networkId).c_str()); + DHLOGI("networkId: %{public}s", GetAnonyString(networkId).c_str()); sptr remote = Remote(); if (remote == nullptr) { DHLOGE("remote service is null"); @@ -342,7 +342,7 @@ int32_t DistributedCameraSinkProxy::ResumeDistributedHardware(const std::string int32_t DistributedCameraSinkProxy::StopDistributedHardware(const std::string &networkId) { - DHLOGI("networkId: %s", GetAnonyString(networkId).c_str()); + DHLOGI("networkId: %{public}s", GetAnonyString(networkId).c_str()); sptr remote = Remote(); if (remote == nullptr) { DHLOGE("remote service is null"); diff --git a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn index dbb822a5b0b6327d16e40600fce477f638678449..f08ad7ad6fb3235a4fcff0241db1e5b461e55859 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn @@ -54,6 +54,7 @@ ohos_shared_library("distributed_camera_source_sdk") { external_deps = [ "c_utils:utils", "distributed_hardware_fwk:distributedhardwareutils", + "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback.cpp index 117d29ee3b0d663bed150e9d087c39f42b562e38..deada283d5e222de275577d6a311dc0da7d4354d 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback.cpp @@ -30,18 +30,18 @@ DCameraSourceCallback::~DCameraSourceCallback() int32_t DCameraSourceCallback::OnNotifyRegResult(const std::string& devId, const std::string& dhId, const std::string& reqId, int32_t status, std::string& data) { - DHLOGI("DCameraSourceCallback OnNotifyRegResult devId: %s dhId: %s", + DHLOGI("DCameraSourceCallback OnNotifyRegResult devId: %{public}s dhId: %{public}s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); std::lock_guard lock(mapMutex_); auto iter = regCallbacks_.find(reqId); if (iter == regCallbacks_.end()) { - DHLOGE("DCameraSourceCallback OnNotifyRegResult not found devId: %s dhId: %s", + DHLOGE("DCameraSourceCallback OnNotifyRegResult not found devId: %{public}s dhId: %{public}s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return DCAMERA_NOT_FOUND; } int32_t ret = iter->second->OnRegisterResult(devId, dhId, status, data); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceCallback OnNotifyRegResult failed, devId: %s dhId: %s ret: %d", + DHLOGE("DCameraSourceCallback OnNotifyRegResult failed, devId: %{public}s dhId: %{public}s ret: %{public}d", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), ret); } regCallbacks_.erase(iter); @@ -51,18 +51,18 @@ int32_t DCameraSourceCallback::OnNotifyRegResult(const std::string& devId, const int32_t DCameraSourceCallback::OnNotifyUnregResult(const std::string& devId, const std::string& dhId, const std::string& reqId, int32_t status, std::string& data) { - DHLOGI("DCameraSourceCallback OnNotifyUnregResult devId: %s dhId: %s", + DHLOGI("DCameraSourceCallback OnNotifyUnregResult devId: %{public}s dhId: %{public}s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); std::lock_guard lock(mapMutex_); auto iter = unregCallbacks_.find(reqId); if (iter == unregCallbacks_.end()) { - DHLOGE("DCameraSourceCallback OnNotifyUnregResult not found devId: %s dhId: %s", + DHLOGE("DCameraSourceCallback OnNotifyUnregResult not found devId: %{public}s dhId: %{public}s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return DCAMERA_NOT_FOUND; } int32_t ret = iter->second->OnUnregisterResult(devId, dhId, status, data); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceCallback OnNotifyUnregResult failed, devId: %s dhId: %s ret: %d", + DHLOGE("DCameraSourceCallback OnNotifyUnregResult failed, devId: %{public}s dhId: %{public}s ret: %{public}d", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), ret); } unregCallbacks_.erase(iter); diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback_stub.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback_stub.cpp index fc004a820a1095db56f947e5ad10401351027d1c..4ee0e562b778e03ca0169bba9872df33da0416a8 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback_stub.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/callback/dcamera_source_callback_stub.cpp @@ -35,7 +35,7 @@ DCameraSourceCallbackStub::~DCameraSourceCallbackStub() int32_t DCameraSourceCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - DHLOGI("DCameraSourceCallbackStub OnRemoteRequest code: %d", code); + DHLOGI("DCameraSourceCallbackStub OnRemoteRequest code: %{public}d", code); std::u16string desc = DCameraSourceCallbackStub::GetDescriptor(); std::u16string remoteDesc = data.ReadInterfaceToken(); if (desc != remoteDesc) { diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp index 6c55b1d7169fe3dc0ec5d5f46f35ff86b72931ab..39cc7f1fac0d95f84df64425f5e37623240075e4 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp @@ -59,7 +59,8 @@ int32_t DCameraSourceHandler::InitSource(const std::string& params) sptr loadCallback(new DCameraSourceLoadCallback(params)); int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, loadCallback); if (ret != ERR_OK) { - DHLOGE("systemAbilityId: %d load failed, result code: %d.", DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, ret); + DHLOGE("systemAbilityId: %{public}d load failed, result code: %{public}d.", + DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, ret); return DCAMERA_INIT_ERR; } { @@ -73,7 +74,7 @@ int32_t DCameraSourceHandler::InitSource(const std::string& params) return DCAMERA_INIT_ERR; } } - DHLOGI("end, result: %d", ret); + DHLOGI("end, result: %{public}d", ret); return DCAMERA_OK; } @@ -94,7 +95,7 @@ void DCameraSourceHandler::FinishStartSA(const std::string ¶ms) void DCameraSourceHandler::FinishStartSAFailed(const int32_t systemAbilityId) { - DHLOGE("SourceSA Start failed, systemAbilityId: %d.", systemAbilityId); + DHLOGE("SourceSA Start failed, systemAbilityId: %{public}d.", systemAbilityId); std::unique_lock lock(producerMutex_); state_ = DCAMERA_SA_STATE_STOP; producerCon_.notify_one(); @@ -120,7 +121,7 @@ int32_t DCameraSourceHandler::ReleaseSource() int32_t DCameraSourceHandler::RegisterDistributedHardware(const std::string& devId, const std::string& dhId, const EnableParam& param, std::shared_ptr callback) { - DHLOGI("devId: %s dhId: %s", GetAnonyString(devId).c_str(), + DHLOGI("devId: %{public}s dhId: %{public}s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); if (callback == nullptr) { DHLOGI("RegisterCallback is null."); @@ -140,7 +141,7 @@ int32_t DCameraSourceHandler::RegisterDistributedHardware(const std::string& dev if (ret != DCAMERA_OK) { callback_->PopRegCallback(reqId); } - DHLOGI("end, ret: %d devId: %s dhId: %s version: %s", + DHLOGI("end, ret: %{public}d devId: %{public}s dhId: %{public}s version: %{public}s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.sinkVersion.c_str()); return ret; } @@ -148,7 +149,7 @@ int32_t DCameraSourceHandler::RegisterDistributedHardware(const std::string& dev int32_t DCameraSourceHandler::UnregisterDistributedHardware(const std::string& devId, const std::string& dhId, std::shared_ptr callback) { - DHLOGI("devId: %s dhId: %s", GetAnonyString(devId).c_str(), + DHLOGI("devId: %{public}s dhId: %{public}s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); if (callback == nullptr) { DHLOGI("UnregisterCallback is null."); @@ -168,7 +169,7 @@ int32_t DCameraSourceHandler::UnregisterDistributedHardware(const std::string& d if (ret != DCAMERA_OK) { callback_->PopUnregCallback(reqId); } - DHLOGI("end, ret: %d devId: %s dhId: %s", ret, + DHLOGI("end, ret: %{public}d devId: %{public}s dhId: %{public}s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return ret; } diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler_ipc.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler_ipc.cpp index fb8638d2e141876112bcf93bcee17846953f2738..36317d843ef941ed110a902c14b0299cd0a0be32 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler_ipc.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler_ipc.cpp @@ -92,7 +92,7 @@ sptr DCameraSourceHandlerIpc::GetSourceLocalCamSrv() int32_t ret = object->AddDeathRecipient(sourceLocalRecipient_); sptr localSource = iface_cast(object); if (localSource == nullptr) { - DHLOGI("GetSourceLocalCamSrv failed, localSource is null ret: %d", ret); + DHLOGI("GetSourceLocalCamSrv failed, localSource is null ret: %{public}d", ret); return nullptr; } { @@ -102,7 +102,7 @@ sptr DCameraSourceHandlerIpc::GetSourceLocalCamSrv() } localSource_ = localSource; } - DHLOGI("success, AddDeathRecipient ret: %d", ret); + DHLOGI("success, AddDeathRecipient ret: %{public}d", ret); return localSource; } diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp index d6e5243482f0897779132edc96f12ca56a9e64ce..5b6b2cd5964d5f2a103baf6e649c6777bea9a1c5 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp @@ -27,7 +27,7 @@ DCameraSourceLoadCallback::DCameraSourceLoadCallback(const std::string& params) void DCameraSourceLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbilityId, const sptr& remoteObject) { - DHLOGI("OnLoadSystemAbilitySuccess systemAbilityId: %d, IRmoteObject result: %s", + DHLOGI("OnLoadSystemAbilitySuccess systemAbilityId: %{public}d, IRmoteObject result: %{public}s", systemAbilityId, (remoteObject != nullptr) ? "true" : "false"); if (systemAbilityId != DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID) { DHLOGE("start systemabilityId is not sourceSAId!"); @@ -42,7 +42,7 @@ void DCameraSourceLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbility void DCameraSourceLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) { - DHLOGI("OnLoadSystemAbilityFail systemAbilityId: %d.", systemAbilityId); + DHLOGI("OnLoadSystemAbilityFail systemAbilityId: %{public}d.", systemAbilityId); if (systemAbilityId != DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID) { DHLOGE("start systemabilityId is not sourceSAId!"); ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_SA_ERROR, diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/distributed_camera_source_proxy.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/distributed_camera_source_proxy.cpp index eab9d98eb9dce690822a7b6b61983edc3d6644c4..bdd819c41827b8f50c9461945af9701dccac6a56 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/distributed_camera_source_proxy.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/distributed_camera_source_proxy.cpp @@ -84,7 +84,7 @@ int32_t DistributedCameraSourceProxy::ReleaseSource() int32_t DistributedCameraSourceProxy::RegisterDistributedHardware(const std::string& devId, const std::string& dhId, const std::string& reqId, const EnableParam& param) { - DHLOGI("devId: %s dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); + DHLOGI("devId: %{public}s dhId: %{public}s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); if (!CheckRegParams(devId, dhId, reqId, param)) { DHLOGE("input is invalid"); return DCAMERA_BAD_VALUE; @@ -140,7 +140,7 @@ bool DistributedCameraSourceProxy::CheckRegParams(const std::string& devId, cons int32_t DistributedCameraSourceProxy::UnregisterDistributedHardware(const std::string& devId, const std::string& dhId, const std::string& reqId) { - DHLOGI("devId: %s dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); + DHLOGI("devId: %{public}s dhId: %{public}s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); if (!CheckUnregParams(devId, dhId, reqId)) { DHLOGE("input is invalid"); return DCAMERA_BAD_VALUE; @@ -186,7 +186,7 @@ bool DistributedCameraSourceProxy::CheckUnregParams(const std::string& devId, co int32_t DistributedCameraSourceProxy::DCameraNotify(const std::string& devId, const std::string& dhId, std::string& events) { - DHLOGI("DCameraNotify devId: %s dhId: %s events: %s", + DHLOGI("DCameraNotify devId: %{public}s dhId: %{public}s events: %{public}s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), events.c_str()); if (!CheckNotifyParams(devId, dhId, events)) { DHLOGE("input is invalid"); diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/BUILD.gn b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/BUILD.gn index cac8bf94839196a64dcb3affd167aacdc8fb7654..9e5e51abdf0a045698ab73effcacddb6f1c72995 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/BUILD.gn @@ -51,6 +51,7 @@ ohos_unittest("DCameraSinkHandlerTest") { "access_token:libtoken_setproc", "c_utils:utils", "dsoftbus:softbus_client", + "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/BUILD.gn b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/BUILD.gn index 2c851de0b63473f5126f416a74cddf06da80bcae..a18ec9e7a15a6812b2a9321460653d6f9febca98 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/BUILD.gn @@ -50,6 +50,7 @@ ohos_unittest("DCameraSourceHandlerTest") { external_deps = [ "c_utils:utils", + "hilog:libhilog", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/services/cameraservice/cameraoperator/client/BUILD.gn b/services/cameraservice/cameraoperator/client/BUILD.gn index 665550997efce894c2d2c559ccd2ab8a50ea2a9b..cdc5a3fd7f166e4c3dbaa8149c257204281681f7 100644 --- a/services/cameraservice/cameraoperator/client/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/BUILD.gn @@ -75,6 +75,7 @@ ohos_shared_library("distributed_camera_client") { "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "drivers_peripheral_display:hdi_gralloc_client", "graphic_surface:surface", + "hilog:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/services/cameraservice/cameraoperator/client/src/callback/dcamera_input_callback.cpp b/services/cameraservice/cameraoperator/client/src/callback/dcamera_input_callback.cpp index 82bdd1e34027221662ed82005b9154ef6f8272c7..b2344d3e3bdafe43b7f67401610f22519221b981 100644 --- a/services/cameraservice/cameraoperator/client/src/callback/dcamera_input_callback.cpp +++ b/services/cameraservice/cameraoperator/client/src/callback/dcamera_input_callback.cpp @@ -27,7 +27,7 @@ DCameraInputCallback::DCameraInputCallback(const std::shared_ptr& void DCameraInputCallback::OnError(const int32_t errorType, const int32_t errorMsg) const { - DHLOGE("enter, errorType: %d, errorMsg: %d", errorType, errorMsg); + DHLOGE("enter, errorType: %{public}d, errorMsg: %{public}d", errorType, errorMsg); if (callback_ == nullptr) { DHLOGE("StateCallback is null"); return; diff --git a/services/cameraservice/cameraoperator/client/src/callback/dcamera_manager_callback.cpp b/services/cameraservice/cameraoperator/client/src/callback/dcamera_manager_callback.cpp index 6f90725e7b9bd526f81792ec77d7ad97997561ba..6d8a9e6e2c31d38f11ebcbdab88438b07ef49cc1 100644 --- a/services/cameraservice/cameraoperator/client/src/callback/dcamera_manager_callback.cpp +++ b/services/cameraservice/cameraoperator/client/src/callback/dcamera_manager_callback.cpp @@ -23,13 +23,13 @@ namespace OHOS { namespace DistributedHardware { void DCameraManagerCallback::OnCameraStatusChanged(const CameraStandard::CameraStatusInfo &cameraStatusInfo) const { - DHLOGI("enter, cameraStatus: %d", cameraStatusInfo.cameraStatus); + DHLOGI("enter, cameraStatus: %{public}d", cameraStatusInfo.cameraStatus); } void DCameraManagerCallback::OnFlashlightStatusChanged(const std::string &cameraID, const CameraStandard::FlashStatus flashStatus) const { - DHLOGI("enter, cameraID: %s, flashStatus: %d", GetAnonyString(cameraID).c_str(), flashStatus); + DHLOGI("enter, cameraID: %{public}s, flashStatus: %{public}d", GetAnonyString(cameraID).c_str(), flashStatus); } } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/services/cameraservice/cameraoperator/client/src/callback/dcamera_photo_callback.cpp b/services/cameraservice/cameraoperator/client/src/callback/dcamera_photo_callback.cpp index e6d06ba21123e20534fba7f3db88201bd5a5fbfe..85c633f79b1d95cb618855de3e2598a623bf86b3 100644 --- a/services/cameraservice/cameraoperator/client/src/callback/dcamera_photo_callback.cpp +++ b/services/cameraservice/cameraoperator/client/src/callback/dcamera_photo_callback.cpp @@ -26,27 +26,27 @@ DCameraPhotoCallback::DCameraPhotoCallback(const std::shared_ptr& void DCameraPhotoCallback::OnCaptureStarted(const int32_t captureID) const { - DHLOGI("enter, captureID: %d", captureID); + DHLOGI("enter, captureID: %{public}d", captureID); } void DCameraPhotoCallback::OnCaptureStarted(const int32_t captureID, uint32_t exposureTime) const { - DHLOGI("enter, captureID: %d, exposureTime: %u", captureID, exposureTime); + DHLOGI("enter, captureID: %{public}d, exposureTime: %{public}u", captureID, exposureTime); } void DCameraPhotoCallback::OnCaptureEnded(const int32_t captureID, const int32_t frameCount) const { - DHLOGI("enter, captureID: %d, frameCount: %d", captureID, frameCount); + DHLOGI("enter, captureID: %{public}d, frameCount: %{public}d", captureID, frameCount); } void DCameraPhotoCallback::OnFrameShutter(const int32_t captureId, const uint64_t timestamp) const { - DHLOGI("enter, captureId: %d, timestamp: %llu", captureId, timestamp); + DHLOGI("enter, captureId: %{public}d, timestamp: %{public}" PRIu64, captureId, timestamp); } void DCameraPhotoCallback::OnCaptureError(const int32_t captureId, const int32_t errorCode) const { - DHLOGE("enter, captureId: %d, errorCode: %d", captureId, errorCode); + DHLOGE("enter, captureId: %{public}d, errorCode: %{public}d", captureId, errorCode); if (callback_ == nullptr) { DHLOGE("StateCallback is null"); return; diff --git a/services/cameraservice/cameraoperator/client/src/callback/dcamera_preview_callback.cpp b/services/cameraservice/cameraoperator/client/src/callback/dcamera_preview_callback.cpp index 84225e6bc8cb36f480de0def2c07a05358640379..c2deccf86a92b710382be1e338fcc5b6fa54c1e0 100644 --- a/services/cameraservice/cameraoperator/client/src/callback/dcamera_preview_callback.cpp +++ b/services/cameraservice/cameraoperator/client/src/callback/dcamera_preview_callback.cpp @@ -32,12 +32,12 @@ void DCameraPreviewCallback::OnFrameStarted() const void DCameraPreviewCallback::OnFrameEnded(const int32_t frameCount) const { - DHLOGI("enter, frameCount: %d", frameCount); + DHLOGI("enter, frameCount: %{public}d", frameCount); } void DCameraPreviewCallback::OnError(const int32_t errorCode) const { - DHLOGE("enter, errorCode: %d", errorCode); + DHLOGE("enter, errorCode: %{public}d", errorCode); if (callback_ == nullptr) { DHLOGE("StateCallback is null"); return; diff --git a/services/cameraservice/cameraoperator/client/src/callback/dcamera_session_callback.cpp b/services/cameraservice/cameraoperator/client/src/callback/dcamera_session_callback.cpp index 4a532c72a263ecd575251e8de5ea3dc2592a3657..70c58feefc1453545eebe0ecf2488f232e3a841b 100644 --- a/services/cameraservice/cameraoperator/client/src/callback/dcamera_session_callback.cpp +++ b/services/cameraservice/cameraoperator/client/src/callback/dcamera_session_callback.cpp @@ -29,7 +29,7 @@ DCameraSessionCallback::DCameraSessionCallback(const std::shared_ptr(cameraList.size()); + DHLOGI("Init camera size: %{public}" PRIu64, listSize); for (auto& info : cameraList) { if (info->GetID() == cameraId_) { - DHLOGI("Init cameraInfo get id: %s", GetAnonyString(info->GetID()).c_str()); + DHLOGI("Init cameraInfo get id: %{public}s", GetAnonyString(info->GetID()).c_str()); cameraInfo_ = info; break; } @@ -75,13 +76,13 @@ int32_t DCameraClient::Init() } isInit_ = true; - DHLOGI("Init %s success", GetAnonyString(cameraId_).c_str()); + DHLOGI("Init %{public}s success", GetAnonyString(cameraId_).c_str()); return DCAMERA_OK; } int32_t DCameraClient::UnInit() { - DHLOGI("UnInit cameraId: %s", GetAnonyString(cameraId_).c_str()); + DHLOGI("UnInit cameraId: %{public}s", GetAnonyString(cameraId_).c_str()); if (cameraManager_ != nullptr) { DHLOGI("UnInit unregister cameraManager callback"); cameraManager_->SetCallback(nullptr); @@ -90,30 +91,30 @@ int32_t DCameraClient::UnInit() isInit_ = false; cameraInfo_ = nullptr; cameraManager_ = nullptr; - DHLOGI("UnInit %s success", GetAnonyString(cameraId_).c_str()); + DHLOGI("UnInit %{public}s success", GetAnonyString(cameraId_).c_str()); return DCAMERA_OK; } int32_t DCameraClient::UpdateSettings(std::vector>& settings) { - DHLOGI("UpdateSettings cameraId: %s", GetAnonyString(cameraId_).c_str()); + DHLOGI("UpdateSettings cameraId: %{public}s", GetAnonyString(cameraId_).c_str()); for (auto& setting : settings) { switch (setting->type_) { case UPDATE_METADATA: { - DHLOGI("UpdateSettings %s update metadata settings", GetAnonyString(cameraId_).c_str()); + DHLOGI("UpdateSettings %{public}s update metadata settings", GetAnonyString(cameraId_).c_str()); std::string dcSettingValue = setting->value_; std::string metadataStr = Base64Decode(dcSettingValue); FindCameraMetadata(metadataStr); if (cameraInput_ == nullptr) { - DHLOGE("UpdateSettings %s cameraInput is null", GetAnonyString(cameraId_).c_str()); + DHLOGE("UpdateSettings %{public}s cameraInput is null", GetAnonyString(cameraId_).c_str()); UpdateSettingCache(metadataStr); return DCAMERA_OK; } int32_t ret = ((sptr &)cameraInput_)->SetCameraSettings(metadataStr); if (ret != DCAMERA_OK) { - DHLOGE("UpdateSettings %s update metadata settings failed, ret: %d", + DHLOGE("UpdateSettings %{public}s update metadata settings failed, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); return ret; } @@ -125,14 +126,14 @@ int32_t DCameraClient::UpdateSettings(std::vectorget(), OHOS_CONTROL_FOCUS_MODE, &focusItem); if (ret == CAM_META_SUCCESS) { - DHLOGI("FindCameraMetadata focus mode: %d", focusItem.data.u8[0]); + DHLOGI("FindCameraMetadata focus mode: %{public}d", focusItem.data.u8[0]); } else { - DHLOGE("FindCameraMetadata %s find focus mode failed, ret: %d", + DHLOGE("FindCameraMetadata %{public}s find focus mode failed, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); } camera_metadata_item_t exposureItem; ret = Camera::FindCameraMetadataItem(cameraMetadata->get(), OHOS_CONTROL_EXPOSURE_MODE, &exposureItem); if (ret == CAM_META_SUCCESS) { - DHLOGI("FindCameraMetadata exposure mode: %d", exposureItem.data.u8[0]); + DHLOGI("FindCameraMetadata exposure mode: %{public}d", exposureItem.data.u8[0]); } else { - DHLOGE("FindCameraMetadata %s find exposure mode failed, ret: %d", + DHLOGE("FindCameraMetadata %{public}s find exposure mode failed, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); } camera_metadata_item_t stabilityItem; ret = Camera::FindCameraMetadataItem(cameraMetadata->get(), OHOS_CONTROL_VIDEO_STABILIZATION_MODE, &stabilityItem); if (ret == CAM_META_SUCCESS) { - DHLOGI("FindCameraMetadata stabilization mode: %d", stabilityItem.data.u8[0]); + DHLOGI("FindCameraMetadata stabilization mode: %{public}d", stabilityItem.data.u8[0]); } else { - DHLOGE("FindCameraMetadata %s find stabilization mode failed, ret: %d", + DHLOGE("FindCameraMetadata %{public}s find stabilization mode failed, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); } } @@ -173,9 +174,9 @@ void DCameraClient::FindCameraMetadata(const std::string& metadataStr) int32_t DCameraClient::StartCapture(std::vector>& captureInfos, sptr& surface) { - DHLOGI("StartCapture cameraId: %s", GetAnonyString(cameraId_).c_str()); + DHLOGI("StartCapture cameraId: %{public}s", GetAnonyString(cameraId_).c_str()); if ((photoOutput_ == nullptr) && (previewOutput_ == nullptr)) { - DHLOGI("StartCapture %s config capture session", GetAnonyString(cameraId_).c_str()); + DHLOGI("StartCapture %{public}s config capture session", GetAnonyString(cameraId_).c_str()); if (surface == nullptr) { DHLOGE("StartCapture: input surface is nullptr."); return DCAMERA_BAD_VALUE; @@ -183,7 +184,7 @@ int32_t DCameraClient::StartCapture(std::vectorClose(); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture cameraInput Close failed, cameraId: %s, ret: %d", + DHLOGE("StopCapture cameraInput Close failed, cameraId: %{public}s, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); } ret = cameraInput_->Release(); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture cameraInput Release failed, cameraId: %s, ret: %d", + DHLOGE("StopCapture cameraInput Release failed, cameraId: %{public}s, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); } cameraInput_ = nullptr; @@ -236,50 +237,50 @@ int32_t DCameraClient::StopCapture() ReleaseCaptureSession(); if (previewSurface_ != nullptr) { - DHLOGI("StopCapture %s preview surface unregister consumer listener", + DHLOGI("StopCapture %s previewsurface unregister consumer listener", GetAnonyString(cameraId_).c_str()); previewSurface_ = nullptr; } if (photoSurface_ != nullptr) { - DHLOGI("StopCapture %s photo surface unregister consumer listener", + DHLOGI("StopCapture %{public}s photosurface unregister consumer listener", GetAnonyString(cameraId_).c_str()); int32_t ret = photoSurface_->UnregisterConsumerListener(); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture %s photo surface unregister consumer listener failed, ret: %d", + DHLOGE("StopCapture %{public}s photosurface unregister consumer listener failed, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); } photoListener_ = nullptr; photoSurface_ = nullptr; } - DHLOGI("StopCapture %s success", GetAnonyString(cameraId_).c_str()); + DHLOGI("StopCapture %{public}s success", GetAnonyString(cameraId_).c_str()); return DCAMERA_OK; } void DCameraClient::StopOutput() { if (previewOutput_ != nullptr) { - DHLOGI("StopCapture %s stop previewOutput", GetAnonyString(cameraId_).c_str()); + DHLOGI("StopCapture %{public}s stop previewOutput", GetAnonyString(cameraId_).c_str()); int32_t ret = ((sptr &)previewOutput_)->Stop(); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture videoOutput stop failed, cameraId: %s, ret: %d", + DHLOGE("StopCapture videoOutput stop failed, cameraId: %{public}s, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); } - DHLOGI("StopCapture %s release previewOutput", GetAnonyString(cameraId_).c_str()); + DHLOGI("StopCapture %{public}s release previewOutput", GetAnonyString(cameraId_).c_str()); ret = previewOutput_->Release(); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture previewOutput Release failed, cameraId: %s, ret: %d", + DHLOGE("StopCapture previewOutput Release failed, cameraId: %{public}s, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); } previewOutput_ = nullptr; } if (photoOutput_ != nullptr) { - DHLOGI("StopCapture %s release photoOutput", GetAnonyString(cameraId_).c_str()); + DHLOGI("StopCapture %{public}s release photoOutput", GetAnonyString(cameraId_).c_str()); int32_t ret = photoOutput_->Release(); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture photoOutput Release failed, cameraId: %s, ret: %d", + DHLOGE("StopCapture photoOutput Release failed, cameraId: %{public}s, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); } photoOutput_ = nullptr; @@ -291,16 +292,16 @@ void DCameraClient::ReleaseCaptureSession() if (captureSession_ == nullptr) { return; } - DHLOGI("StopCapture %s stop captureSession", GetAnonyString(cameraId_).c_str()); + DHLOGI("StopCapture %{public}s stop captureSession", GetAnonyString(cameraId_).c_str()); int32_t ret = captureSession_->Stop(); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture captureSession stop failed, cameraId: %s, ret: %d", + DHLOGE("StopCapture captureSession stop failed, cameraId: %{public}s, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); } - DHLOGI("StopCapture %s release captureSession", GetAnonyString(cameraId_).c_str()); + DHLOGI("StopCapture %{public}s release captureSession", GetAnonyString(cameraId_).c_str()); ret = captureSession_->Release(); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture captureSession Release failed, cameraId: %s, ret: %d", + DHLOGE("StopCapture captureSession Release failed, cameraId: %{public}s, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); } captureSession_ = nullptr; @@ -308,9 +309,9 @@ void DCameraClient::ReleaseCaptureSession() int32_t DCameraClient::SetStateCallback(std::shared_ptr& callback) { - DHLOGI("SetStateCallback cameraId: %s", GetAnonyString(cameraId_).c_str()); + DHLOGI("SetStateCallback cameraId: %{public}s", GetAnonyString(cameraId_).c_str()); if (callback == nullptr) { - DHLOGE("SetStateCallback %s unregistering state callback", GetAnonyString(cameraId_).c_str()); + DHLOGE("SetStateCallback %{public}s unregistering state callback", GetAnonyString(cameraId_).c_str()); } stateCallback_ = callback; return DCAMERA_OK; @@ -318,9 +319,9 @@ int32_t DCameraClient::SetStateCallback(std::shared_ptr& callback int32_t DCameraClient::SetResultCallback(std::shared_ptr& callback) { - DHLOGI("SetResultCallback cameraId: %s", GetAnonyString(cameraId_).c_str()); + DHLOGI("SetResultCallback cameraId: %{public}s", GetAnonyString(cameraId_).c_str()); if (callback == nullptr) { - DHLOGE("SetResultCallback %s unregistering result callback", GetAnonyString(cameraId_).c_str()); + DHLOGE("SetResultCallback %{public}s unregistering result callback", GetAnonyString(cameraId_).c_str()); } resultCallback_ = callback; return DCAMERA_OK; @@ -328,15 +329,15 @@ int32_t DCameraClient::SetResultCallback(std::shared_ptr& callba int32_t DCameraClient::ConfigCaptureSession(std::vector>& captureInfos) { - DHLOGI("ConfigCaptureSession cameraId: %s", GetAnonyString(cameraId_).c_str()); + DHLOGI("ConfigCaptureSession cameraId: %{public}s", GetAnonyString(cameraId_).c_str()); int rv = cameraManager_->CreateCameraInput(cameraInfo_, &((sptr &)cameraInput_)); if (rv != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession %s create cameraInput failed", GetAnonyString(cameraId_).c_str()); + DHLOGE("ConfigCaptureSession %{public}s create cameraInput failed", GetAnonyString(cameraId_).c_str()); return DCAMERA_BAD_VALUE; } int32_t rc = ((sptr &)cameraInput_)->Open(); if (rc != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession cameraInput_ Open failed, cameraId: %s, ret: %d", + DHLOGE("ConfigCaptureSession cameraInput_ Open failed, cameraId: %{public}s, ret: %{public}d", GetAnonyString(cameraId_).c_str(), rc); return DCAMERA_BAD_VALUE; } @@ -348,7 +349,7 @@ int32_t DCameraClient::ConfigCaptureSession(std::vector &)cameraInput_)->SetCameraSettings(metadataStr); if (ret != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession %s set camera settings failed, ret: %d", + DHLOGE("ConfigCaptureSession %{public}s set camera settings failed, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); return ret; } @@ -357,7 +358,7 @@ int32_t DCameraClient::ConfigCaptureSession(std::vectorCreateCaptureSession(&captureSession_); if (rv != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession %s create captureSession failed", + DHLOGE("ConfigCaptureSession %{public}s create captureSession failed", GetAnonyString(cameraId_).c_str()); return DCAMERA_BAD_VALUE; } @@ -368,7 +369,7 @@ int32_t DCameraClient::ConfigCaptureSession(std::vectorBeginConfig(); if (ret != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession %s config captureSession failed, ret: %d", + DHLOGE("ConfigCaptureSession %{public}s config captureSession failed, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); return ret; } ret = captureSession_->AddInput(cameraInput_); if (ret != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession %s add cameraInput to captureSession failed, ret: %d", + DHLOGE("ConfigCaptureSession %{public}s add cameraInput to captureSession failed, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); return ret; } @@ -395,7 +396,7 @@ int32_t DCameraClient::ConfigCaptureSessionInner() if (photoOutput_ != nullptr) { ret = captureSession_->AddOutput(photoOutput_); if (ret != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession %s add photoOutput to captureSession failed, ret: %d", + DHLOGE("ConfigCaptureSession %{public}s add photoOutput to captureSession failed, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); return ret; } @@ -404,7 +405,7 @@ int32_t DCameraClient::ConfigCaptureSessionInner() if (previewOutput_ != nullptr) { ret = captureSession_->AddOutput(previewOutput_); if (ret != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession %s add previewOutput to captureSession failed, ret: %d", + DHLOGE("ConfigCaptureSession %{public}s add previewOutput to captureSession failed, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); return ret; } @@ -412,25 +413,25 @@ int32_t DCameraClient::ConfigCaptureSessionInner() ret = captureSession_->CommitConfig(); if (ret != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession %s commit captureSession failed, ret: %d", + DHLOGE("ConfigCaptureSession %{public}s commit captureSession failed, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); return ret; } ret = captureSession_->Start(); if (ret != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession %s start captureSession failed, ret: %d", + DHLOGE("ConfigCaptureSession %{public}s start captureSession failed, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); } - DHLOGI("ConfigCaptureSession %s success", GetAnonyString(cameraId_).c_str()); + DHLOGI("ConfigCaptureSession %{public}s success", GetAnonyString(cameraId_).c_str()); return DCAMERA_OK; } int32_t DCameraClient::CreateCaptureOutput(std::vector>& captureInfos) { if (captureInfos.empty()) { - DHLOGE("CreateCaptureOutput no capture info, cameraId: %s", GetAnonyString(cameraId_).c_str()); + DHLOGE("CreateCaptureOutput no capture info, cameraId: %{public}s", GetAnonyString(cameraId_).c_str()); return DCAMERA_BAD_VALUE; } @@ -438,14 +439,14 @@ int32_t DCameraClient::CreateCaptureOutput(std::vectorstreamType_ == SNAPSHOT_FRAME) { int32_t ret = CreatePhotoOutput(info); if (ret != DCAMERA_OK) { - DHLOGE("CreateCaptureOutput %s create photo output failed, ret: %d", + DHLOGE("CreateCaptureOutput %{public}s create photo output failed, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); return ret; } } else if (info->streamType_ == CONTINUOUS_FRAME) { int32_t ret = CreatePreviewOutput(info); if (ret != DCAMERA_OK) { - DHLOGE("CreateCaptureOutput %s create video output failed, ret: %d", + DHLOGE("CreateCaptureOutput %{public}s create video output failed, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); return ret; } @@ -459,9 +460,9 @@ int32_t DCameraClient::CreateCaptureOutput(std::vector& info) { - DHLOGI("CreatePhotoOutput dhId: %s, width: %d, height: %d, format: %d, stream: %d, isCapture: %d", - GetAnonyString(cameraId_).c_str(), info->width_, info->height_, info->format_, info->streamType_, - info->isCapture_); + DHLOGI("CreatePhotoOutput dhId: %{public}s, width: %{public}d, height: %{public}d, format: %{public}d, stream: " + "%{public}d, isCapture: %{public}d", GetAnonyString(cameraId_).c_str(), info->width_, info->height_, + info->format_, info->streamType_, info->isCapture_); photoSurface_ = IConsumerSurface::Create(); photoListener_ = new DCameraPhotoSurfaceListener(photoSurface_, resultCallback_); photoSurface_->RegisterConsumerListener((sptr &)photoListener_); @@ -472,32 +473,32 @@ int32_t DCameraClient::CreatePhotoOutput(std::shared_ptr& in int32_t rv = cameraManager_->CreatePhotoOutput( photoProfile, bp, &((sptr &)photoOutput_)); if (rv != DCAMERA_OK) { - DHLOGE("CreatePhotoOutput %s create photo output failed", GetAnonyString(cameraId_).c_str()); + DHLOGE("CreatePhotoOutput %{public}s create photo output failed", GetAnonyString(cameraId_).c_str()); return DCAMERA_BAD_VALUE; } std::shared_ptr photoCallback = std::make_shared(stateCallback_); ((sptr &)photoOutput_)->SetCallback(photoCallback); - DHLOGI("CreatePhotoOutput %s success", GetAnonyString(cameraId_).c_str()); + DHLOGI("CreatePhotoOutput %{public}s success", GetAnonyString(cameraId_).c_str()); return DCAMERA_OK; } int32_t DCameraClient::CreatePreviewOutput(std::shared_ptr& info) { - DHLOGI("CreatePreviewOutput dhId: %s, width: %d, height: %d, format: %d, stream: %d, isCapture: %d", - GetAnonyString(cameraId_).c_str(), info->width_, info->height_, info->format_, info->streamType_, - info->isCapture_); + DHLOGI("CreatePreviewOutput dhId: %{public}s, width: %{public}d, height: %{public}d, format: %{public}d, stream:" + " %{public}d, isCapture: %{public}d", GetAnonyString(cameraId_).c_str(), info->width_, info->height_, + info->format_, info->streamType_, info->isCapture_); CameraStandard::CameraFormat previewFormat = ConvertToCameraFormat(info->format_); CameraStandard::Size previewSize = {info->width_, info->height_}; CameraStandard::Profile previewProfile(previewFormat, previewSize); int32_t rv = cameraManager_->CreatePreviewOutput( previewProfile, previewSurface_, &((sptr &)previewOutput_)); if (rv != DCAMERA_OK) { - DHLOGE("CreatePreviewOutput %s create preview output failed", GetAnonyString(cameraId_).c_str()); + DHLOGE("CreatePreviewOutput %{public}s create preview output failed", GetAnonyString(cameraId_).c_str()); return DCAMERA_BAD_VALUE; } auto previewCallback = std::make_shared(stateCallback_); ((sptr &)previewOutput_)->SetCallback(previewCallback); - DHLOGI("CreatePreviewOutput %s success", GetAnonyString(cameraId_).c_str()); + DHLOGI("CreatePreviewOutput %{public}s success", GetAnonyString(cameraId_).c_str()); return DCAMERA_OK; } @@ -535,7 +536,7 @@ int32_t DCameraClient::StartCaptureInner(std::shared_ptr& in int32_t DCameraClient::StartPhotoOutput(std::shared_ptr& info) { - DHLOGI("StartPhotoOutput cameraId: %s", GetAnonyString(cameraId_).c_str()); + DHLOGI("StartPhotoOutput cameraId: %{public}s", GetAnonyString(cameraId_).c_str()); if (photoOutput_ == nullptr) { DHLOGE("StartPhotoOutput photoOutput is null"); return DCAMERA_BAD_VALUE; @@ -545,7 +546,7 @@ int32_t DCameraClient::StartPhotoOutput(std::shared_ptr& inf std::string metadataSetting; for (const auto& setting : captureSettings) { if (setting->type_ == UPDATE_METADATA) { - DHLOGI("StartPhotoOutput %s update metadata settings", GetAnonyString(cameraId_).c_str()); + DHLOGI("StartPhotoOutput %{public}s update metadata settings", GetAnonyString(cameraId_).c_str()); metadataSetting = setting->value_; } } @@ -554,7 +555,7 @@ int32_t DCameraClient::StartPhotoOutput(std::shared_ptr& inf DHLOGE("StartPhotoOutput no metadata settings to update"); int32_t ret = ((sptr &)photoOutput_)->Capture(); if (ret != DCAMERA_OK) { - DHLOGE("StartPhotoOutput %s photoOutput capture failed, ret: %d", + DHLOGE("StartPhotoOutput %{public}s photoOutput capture failed, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); return ret; } @@ -570,7 +571,7 @@ int32_t DCameraClient::StartPhotoOutput(std::shared_ptr& inf SetPhotoCaptureLocation(cameraMetadata, photoCaptureSetting); int32_t ret = ((sptr &)photoOutput_)->Capture(photoCaptureSetting); if (ret != DCAMERA_OK) { - DHLOGE("StartPhotoOutput %s photoOutput capture failed, ret: %d", + DHLOGE("StartPhotoOutput %{public}s photoOutput capture failed, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); return ret; } @@ -587,7 +588,7 @@ void DCameraClient::SetPhotoCaptureRotation(const std::shared_ptr(item.data.i32[0]); photoCaptureSetting->SetRotation(rotation); - DHLOGI("SetPhotoCaptureRotation %s photo capture settings set %d rotation: %d", + DHLOGI("SetPhotoCaptureRotation %{public}s photo capture settings set %{public}d rotation: %{public}d", GetAnonyString(cameraId_).c_str(), item.count, rotation); } } @@ -602,7 +603,7 @@ void DCameraClient::SetPhotoCaptureQuality(const std::shared_ptr(item.data.u8[0]); photoCaptureSetting->SetQuality(quality); - DHLOGI("SetPhotoCaptureQuality %s photo capture settings set %d quality: %d", + DHLOGI("SetPhotoCaptureQuality %{public}s photo capture settings set %{public}d quality: %{public}d", GetAnonyString(cameraId_).c_str(), item.count, quality); } } @@ -622,9 +623,9 @@ void DCameraClient::SetPhotoCaptureLocation(const std::shared_ptrlongitude = item.data.d[longitudeIndex]; location->altitude = item.data.d[altitudeIndex]; photoCaptureSetting->SetLocation(location); - DHLOGI("SetPhotoCaptureLocation %s photo capture settings set %d location: " + - "latitude=%f, longitude=%f, altitude=%f", GetAnonyString(cameraId_).c_str(), item.count, - item.data.d[latitudeIndex], item.data.d[longitudeIndex], item.data.d[altitudeIndex]); + DHLOGI("SetPhotoCaptureLocation %{public}s photo capture settings set %{public}d location: " + "latitude=%{public}f, longitude=%{public}f, altitude=%{public}f", GetAnonyString(cameraId_).c_str(), + item.count, item.data.d[latitudeIndex], item.data.d[longitudeIndex], item.data.d[altitudeIndex]); } } @@ -636,7 +637,7 @@ int32_t DCameraClient::PauseCapture() } int32_t ret = captureSession_->Stop(); if (ret != DCAMERA_OK) { - DHLOGE("PauseCapture captureSession stop failed, cameraId: %s, ret: %d", + DHLOGE("PauseCapture captureSession stop failed, cameraId: %{public}s, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); } return ret; @@ -650,7 +651,7 @@ int32_t DCameraClient::ResumeCapture() } int32_t ret = captureSession_->Start(); if (ret != DCAMERA_OK) { - DHLOGE("ResumeCapture captureSession Start failed, cameraId: %s, ret: %d", + DHLOGE("ResumeCapture captureSession Start failed, cameraId: %{public}s, ret: %{public}d", GetAnonyString(cameraId_).c_str(), ret); } return ret; diff --git a/services/cameraservice/cameraoperator/client/src/listener/dcamera_photo_surface_listener.cpp b/services/cameraservice/cameraoperator/client/src/listener/dcamera_photo_surface_listener.cpp index 9bb4b2179da942ea387f94f3546406614f0f7f54..1545686786a1c13419d8459542bf6373f59606cf 100644 --- a/services/cameraservice/cameraoperator/client/src/listener/dcamera_photo_surface_listener.cpp +++ b/services/cameraservice/cameraoperator/client/src/listener/dcamera_photo_surface_listener.cpp @@ -57,14 +57,14 @@ void DCameraPhotoSurfaceListener::OnBufferAvailable() size = static_cast(buffer->GetSize()); } if ((address == nullptr) || (size <= 0) || (size > SURFACE_BUFFER_MAX_SIZE)) { - DHLOGE("DCameraPhotoSurfaceListener invalid params, size: %d", size); + DHLOGE("DCameraPhotoSurfaceListener invalid params, size: %{public}d", size); break; } - DHLOGI("DCameraPhotoSurfaceListener size: %d", size); + DHLOGI("DCameraPhotoSurfaceListener size: %{public}d", size); std::shared_ptr dataBuffer = std::make_shared(size); int32_t ret = memcpy_s(dataBuffer->Data(), dataBuffer->Capacity(), address, size); if (ret != EOK) { - DHLOGE("DCameraPhotoSurfaceListener Memory Copy failed, ret: %d", ret); + DHLOGE("DCameraPhotoSurfaceListener Memory Copy failed, ret: %{public}d", ret); break; } #ifdef DUMP_DCAMERA_FILE diff --git a/services/cameraservice/cameraoperator/client/test/sample/dcamera_client_demo.h b/services/cameraservice/cameraoperator/client/test/sample/dcamera_client_demo.h index 06514d405c01e5dd269354b4ec68bfdd6a9a1ca9..65ba1e9d08b642ba9f100b73809d2583266bdb3e 100644 --- a/services/cameraservice/cameraoperator/client/test/sample/dcamera_client_demo.h +++ b/services/cameraservice/cameraoperator/client/test/sample/dcamera_client_demo.h @@ -107,10 +107,10 @@ public: protected: void SaveFile() const override { - DHLOGI("DemoDCameraPhotoSurfaceListener::SaveFile width: %d, height: %d, size: %d, dataSize: %d, " + - "actualSize: %d", width_, height_, size_, dataSize_, actualSize_); + DHLOGI("DemoDCameraPhotoSurfaceListener::SaveFile width: %{public}d, height: %{public}d, size: %{public}d, " + "dataSize: %{public}d, actualSize: %{public}d", width_, height_, size_, dataSize_, actualSize_); if ((address_ == nullptr) || (dataSize_ <= 0)) { - DHLOGE("DemoDCameraPhotoSurfaceListener invalid params, dataSize: %d", dataSize_); + DHLOGE("DemoDCameraPhotoSurfaceListener invalid params, dataSize: %{public}d", dataSize_); return; } @@ -138,10 +138,10 @@ public: protected: void SaveFile() const override { - DHLOGI("DemoDCameraPreviewSurfaceListener::SaveFile width: %d, height: %d, size: %d, dataSize: %d, " + - "actualSize: %d", width_, height_, size_, dataSize_, actualSize_); + DHLOGI("DemoDCameraPreviewSurfaceListener::SaveFile width: %{public}d, height: %{public}d, size: %{public}d, " + "dataSize: %{public}d, actualSize: %{public}d", width_, height_, size_, dataSize_, actualSize_); if ((address_ == nullptr) || (actualSize_ <= 0)) { - DHLOGE("DemoDCameraPreviewSurfaceListener invalid params, actualSize: %d", actualSize_); + DHLOGE("DemoDCameraPreviewSurfaceListener invalid params, actualSize: %{public}d", actualSize_); return; } @@ -170,10 +170,10 @@ public: protected: void SaveFile() const override { - DHLOGI("DemoDCameraVideoSurfaceListener::SaveFile width: %d, height: %d, size: %d, dataSize: %d, " + - "actualSize: %d", width_, height_, size_, dataSize_, actualSize_); + DHLOGI("DemoDCameraVideoSurfaceListener::SaveFile width: %{public}d, height: %{public}d, size: %{public}d, " + "dataSize: %{public}d, actualSize: %{public}d", width_, height_, size_, dataSize_, actualSize_); if ((address_ == nullptr) || (actualSize_ <= 0)) { - DHLOGE("DemoDCameraVideoSurfaceListener invalid params, actualSize: %d", actualSize_); + DHLOGE("DemoDCameraVideoSurfaceListener invalid params, actualSize: %{public}d", actualSize_); return; } @@ -196,27 +196,31 @@ class DemoDCameraPhotoCallback : public CameraStandard::PhotoStateCallback { public: void OnCaptureStarted(const int32_t captureID) const { - DHLOGI("DemoDCameraPhotoCallback::OnCaptureStarted captureID: %d", captureID); + DHLOGI("DemoDCameraPhotoCallback::OnCaptureStarted captureID: %{public}d", captureID); } void OnCaptureStarted(const int32_t captureID, uint32_t exposureTime) const { - DHLOGI("DemoDCameraPhotoCallback::OnCaptureStarted captureID: %d, exposureTime: %u", captureID, exposureTime); + DHLOGI("DemoDCameraPhotoCallback::OnCaptureStarted captureID: %{public}d, exposureTime: %{public}u", + captureID, exposureTime); } void OnCaptureEnded(const int32_t captureID, int32_t frameCount) const { - DHLOGI("DemoDCameraPhotoCallback::OnCaptureEnded captureID: %d frameCount: %d", captureID, frameCount); + DHLOGI("DemoDCameraPhotoCallback::OnCaptureEnded captureID: %{public}d frameCount: %{public}d", + captureID, frameCount); } void OnFrameShutter(const int32_t captureId, const uint64_t timestamp) const { - DHLOGI("DemoDCameraPhotoCallback::OnFrameShutter captureID: %d timestamp: %llu", captureId, timestamp); + DHLOGI("DemoDCameraPhotoCallback::OnFrameShutter captureID: %{public}d timestamp: %{public}llu", + captureId, timestamp); } void OnCaptureError(const int32_t captureId, const int32_t errorCode) const { - DHLOGI("DemoDCameraPhotoCallback::OnCaptureError captureID: %d errorCode: %d", captureId, errorCode); + DHLOGI("DemoDCameraPhotoCallback::OnCaptureError captureID: %{public}d errorCode: %{public}d", + captureId, errorCode); } }; @@ -229,12 +233,12 @@ public: void OnFrameEnded(const int32_t frameCount) const { - DHLOGI("DemoDCameraPreviewCallback::OnFrameEnded frameCount: %d", frameCount); + DHLOGI("DemoDCameraPreviewCallback::OnFrameEnded frameCount: %{public}d", frameCount); } void OnError(const int32_t errorCode) const { - DHLOGI("DemoDCameraPreviewCallback::OnError errorCode: %d", errorCode); + DHLOGI("DemoDCameraPreviewCallback::OnError errorCode: %{public}d", errorCode); } void OnSketchStatusDataChanged(const CameraStandard::SketchStatusData& statusData) const @@ -252,12 +256,12 @@ public: void OnFrameEnded(const int32_t frameCount) const { - DHLOGI("DemoDCameraVideoCallback::OnFrameEnded frameCount: %d", frameCount); + DHLOGI("DemoDCameraVideoCallback::OnFrameEnded frameCount: %{public}d", frameCount); } void OnError(const int32_t errorCode) const { - DHLOGI("DemoDCameraVideoCallback::OnError errorCode: %d", errorCode); + DHLOGI("DemoDCameraVideoCallback::OnError errorCode: %{public}d", errorCode); } }; @@ -265,7 +269,7 @@ class DemoDCameraInputCallback : public CameraStandard::ErrorCallback { public: void OnError(const int32_t errorType, const int32_t errorMsg) const { - DHLOGI("DemoDCameraInputCallback::OnError errorType: %d errorMsg: %d", errorType, errorMsg); + DHLOGI("DemoDCameraInputCallback::OnError errorType: %{public}d errorMsg: %{public}d", errorType, errorMsg); } }; @@ -273,13 +277,14 @@ class DemoDCameraManagerCallback : public CameraStandard::CameraManagerCallback public: void OnCameraStatusChanged(const CameraStandard::CameraStatusInfo &cameraStatusInfo) const { - DHLOGI("DemoDCameraManagerCallback::OnCameraStatusChanged cameraStatus: %d", cameraStatusInfo.cameraStatus); + DHLOGI("DemoDCameraManagerCallback::OnCameraStatusChanged cameraStatus: %{public}d", + cameraStatusInfo.cameraStatus); } void OnFlashlightStatusChanged(const std::string &cameraID, const CameraStandard::FlashStatus flashStatus) const { - DHLOGI("DemoDCameraManagerCallback::OnFlashlightStatusChanged cameraID: %s, flashStatus: %d", + DHLOGI("DemoDCameraManagerCallback::OnFlashlightStatusChanged cameraID: %{public}s, flashStatus: %{public}d", GetAnonyString(cameraID).c_str(), flashStatus); } }; @@ -288,12 +293,12 @@ class DemoDCameraSessionCallback : public CameraStandard::SessionCallback, publi public: void OnError(int32_t errorCode) { - DHLOGI("DemoDCameraSessionCallback::OnError errorCode: %d", errorCode); + DHLOGI("DemoDCameraSessionCallback::OnError errorCode: %{public}d", errorCode); } void OnFocusState(FocusState state) { - DHLOGI("DemoDCameraSessionCallback::OnFocusState state: %d", state); + DHLOGI("DemoDCameraSessionCallback::OnFocusState state: %{public}d", state); } }; } // namespace DistributedHardware diff --git a/services/cameraservice/cameraoperator/client/test/sample/main.cpp b/services/cameraservice/cameraoperator/client/test/sample/main.cpp index da6e8d78d1ef4e74760fbd618e29994479f6da28..39cb1f07652146e77a3c83bec2b1a2301af26457 100644 --- a/services/cameraservice/cameraoperator/client/test/sample/main.cpp +++ b/services/cameraservice/cameraoperator/client/test/sample/main.cpp @@ -67,7 +67,7 @@ static int32_t InitCameraStandard() int rv = g_cameraManager->CreateCaptureSession(&g_captureSession); if (rv != DCAMERA_OK) { - DHLOGE("InitCameraStandard create captureSession failed, rv: %d", rv); + DHLOGE("InitCameraStandard create captureSession failed, rv: %{public}d", rv); return rv; } std::shared_ptr sessionCallback = std::make_shared(); @@ -76,7 +76,8 @@ static int32_t InitCameraStandard() std::vector> cameraObjList = g_cameraManager->GetSupportedCameras(); for (auto info : cameraObjList) { - DHLOGI("Camera: %s, position: %d, camera type: %d, connection type: %d", GetAnonyString(info->GetID()).c_str(), + DHLOGI("Camera: %{public}s, position: %{public}d, camera type: %{public}d, connection type: %{public}d", + GetAnonyString(info->GetID()).c_str(), info->GetPosition(), info->GetCameraType(), info->GetConnectionType()); // OHOS_CAMERA_POSITION_FRONT or OHOS_CAMERA_POSITION_BACK if ((info->GetPosition() == CameraPosition::CAMERA_POSITION_FRONT) && @@ -93,12 +94,12 @@ static int32_t InitCameraStandard() rv = g_cameraManager->CreateCameraInput(g_cameraInfo, &((sptr &)g_cameraInput)); if (rv != DCAMERA_OK) { - DHLOGE("InitCameraStandard create cameraInput failed, rv: %d", rv); + DHLOGE("InitCameraStandard create cameraInput failed, rv: %{public}d", rv); return rv; } int32_t ret = ((sptr &)g_cameraInput)->Open(); if (ret != DCAMERA_OK) { - DHLOGE("InitCameraStandard g_cameraInput Open failed, ret: %d", ret); + DHLOGE("InitCameraStandard g_cameraInput Open failed, ret: %{public}d", ret); return ret; } std::shared_ptr inputCallback = std::make_shared(); @@ -149,7 +150,7 @@ static CameraFormat ConvertToCameraFormat(int32_t format) static void InitPhotoOutput() { - DHLOGI("Distributed Camera Demo: Create PhotoOutput, width = %d, height = %d, format = %d", + DHLOGI("Distributed Camera Demo: Create PhotoOutput, width = %{public}d, height = %{public}d, format = %{public}d", g_photoInfo->width_, g_photoInfo->height_, g_photoInfo->format_); sptr photoSurface = IConsumerSurface::Create(); sptr photoListener(new DemoDCameraPhotoSurfaceListener(photoSurface)); @@ -160,7 +161,7 @@ static void InitPhotoOutput() sptr photoProducer = photoSurface->GetProducer(); int rv = g_cameraManager->CreatePhotoOutput(photoProfile, photoProducer, &((sptr &)g_photoOutput)); if (rv != DCAMERA_OK) { - DHLOGE("InitPhotoOutput create photoOutput failed, rv: %d", rv); + DHLOGE("InitPhotoOutput create photoOutput failed, rv: %{public}d", rv); return; } ((sptr &)g_photoOutput)->SetCallback(std::make_shared()); @@ -168,8 +169,8 @@ static void InitPhotoOutput() static void InitPreviewOutput() { - DHLOGI("Distributed Camera Demo: Create PreviewOutput, width = %d, height = %d, format = %d", - g_previewInfo->width_, g_previewInfo->height_, g_previewInfo->format_); + DHLOGI("Distributed Camera Demo: Create PreviewOutput, width = %{public}d, height = %{public}d, format = " + "%{public}d", g_previewInfo->width_, g_previewInfo->height_, g_previewInfo->format_); sptr previewSurface = IConsumerSurface::Create(); sptr previewListener(new DemoDCameraPreviewSurfaceListener(previewSurface)); previewSurface->RegisterConsumerListener(previewListener); @@ -181,7 +182,7 @@ static void InitPreviewOutput() int rv = g_cameraManager->CreatePreviewOutput( previewProfile, previewProducerSurface, &((sptr &)g_previewOutput)); if (rv != DCAMERA_OK) { - DHLOGE("InitPhotoOutput create previewOutput failed, rv: %d", rv); + DHLOGE("InitPhotoOutput create previewOutput failed, rv: %{public}d", rv); return; } ((sptr &)g_previewOutput)->SetCallback(std::make_shared()); @@ -189,7 +190,7 @@ static void InitPreviewOutput() static void InitVideoOutput() { - DHLOGI("Distributed Camera Demo: Create VideoOutput, width = %d, height = %d, format = %d", + DHLOGI("Distributed Camera Demo: Create VideoOutput, width = %{public}d, height = %{public}d, format = %{public}d", g_videoInfo->width_, g_videoInfo->height_, g_videoInfo->format_); sptr videoSurface = IConsumerSurface::Create(); sptr videoListener(new DemoDCameraVideoSurfaceListener(videoSurface)); @@ -202,7 +203,7 @@ static void InitVideoOutput() sptr pSurface = Surface::CreateSurfaceAsProducer(videoProducer); int rv = g_cameraManager->CreateVideoOutput(videoSettings, pSurface, &((sptr &)g_videoOutput)); if (rv != DCAMERA_OK) { - DHLOGE("InitPhotoOutput create videoOutput failed, rv: %d", rv); + DHLOGE("InitPhotoOutput create videoOutput failed, rv: %{public}d", rv); return; } ((sptr &)g_videoOutput)->SetCallback(std::make_shared()); @@ -220,12 +221,12 @@ static void ConfigCaptureSession() std::vector stabilizationModes; int32_t rv = g_captureSession->GetSupportedStabilizationMode(stabilizationModes); if (rv != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession get supported stabilization mode failed, rv: %d", rv); + DHLOGE("ConfigCaptureSession get supported stabilization mode failed, rv: %{public}d", rv); return; } if (!stabilizationModes.empty()) { for (auto mode : stabilizationModes) { - DHLOGI("Distributed Camera Demo: video stabilization mode %d", mode); + DHLOGI("Distributed Camera Demo: video stabilization mode %{public}d", mode); } g_captureSession->SetVideoStabilizationMode(stabilizationModes.back()); } @@ -240,11 +241,11 @@ static void ConfigFocusAndExposure() std::vector biasRange; int32_t rv = g_captureSession->GetExposureBiasRange(biasRange); if (rv != DCAMERA_OK) { - DHLOGE("ConfigFocusAndExposure get exposure bias range failed, rv: %d", rv); + DHLOGE("ConfigFocusAndExposure get exposure bias range failed, rv: %{public}d", rv); return; } if (!biasRange.empty()) { - DHLOGI("Distributed Camera Demo: get %d exposure compensation range", biasRange.size()); + DHLOGI("Distributed Camera Demo: get %{public}d exposure compensation range", biasRange.size()); exposureValue = biasRange[0]; } g_captureSession->SetFocusMode(focusMode); diff --git a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/dcamera_client_test.cpp b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/dcamera_client_test.cpp index 7f42eef21a162ae2952a57b3774deac41ca4e9be..8e94ae3084a14006d7b09d697e3cc2c1cf076e56 100644 --- a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/dcamera_client_test.cpp +++ b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/dcamera_client_test.cpp @@ -47,7 +47,7 @@ class DCameraClientTestStateCallback : public StateCallback { public: void OnStateChanged(std::shared_ptr& event) override { - DHLOGI("DCameraClientTestStateCallback::OnStateChanged type: %d, result: %d", + DHLOGI("DCameraClientTestStateCallback::OnStateChanged type: %{public}d, result: %{public}d", event->eventType_, event->eventResult_); } @@ -360,8 +360,9 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_004, TestSize.Level1) EXPECT_EQ(DCAMERA_OK, ret); SetTokenID(); - DHLOGI("DCameraClientTest dcamera_client_test_004: video width: %d, height: %d, format: %d, isCapture: %d", - videoInfo_true_->width_, videoInfo_true_->height_, videoInfo_true_->format_, videoInfo_true_->isCapture_); + DHLOGI("DCameraClientTest dcamera_client_test_004: video width: %{public}d, height: %{public}d, format: %{public}d," + " isCapture: %{public}d", videoInfo_true_->width_, videoInfo_true_->height_, videoInfo_true_->format_, + videoInfo_true_->isCapture_); std::vector> captureInfos; captureInfos.push_back(videoInfo_true_); sptr bp = videoSurface->GetProducer(); @@ -413,10 +414,12 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_005, TestSize.Level1) EXPECT_EQ(DCAMERA_OK, ret); SetTokenID(); - DHLOGI("DCameraClientTest dcamera_client_test_005: video width: %d, height: %d, format: %d, isCapture: %d", - videoInfo_true_->width_, videoInfo_true_->height_, videoInfo_true_->format_, videoInfo_true_->isCapture_); - DHLOGI("DCameraClientTest dcamera_client_test_005: photo width: %d, height: %d, format: %d, isCapture: %d", - photoInfo_false_->width_, photoInfo_false_->height_, photoInfo_false_->format_, photoInfo_false_->isCapture_); + DHLOGI("DCameraClientTest dcamera_client_test_005: video width: %{public}d, height: %{public}d, format: " + "%{public}d, isCapture: %{public}d", videoInfo_true_->width_, videoInfo_true_->height_, + videoInfo_true_->format_, videoInfo_true_->isCapture_); + DHLOGI("DCameraClientTest dcamera_client_test_005: photo width: %{public}d, height: %{public}d, format: " + "%{public}d, isCapture: %{public}d", photoInfo_false_->width_, photoInfo_false_->height_, + photoInfo_false_->format_, photoInfo_false_->isCapture_); std::vector> captureInfos; captureInfos.push_back(videoInfo_true_); captureInfos.push_back(photoInfo_false_); @@ -427,10 +430,12 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_005, TestSize.Level1) sleep(TEST_SLEEP_SEC); - DHLOGI("DCameraClientTest dcamera_client_test_005: video width: %d, height: %d, format: %d, isCapture: %d", - videoInfo_false_->width_, videoInfo_false_->height_, videoInfo_false_->format_, videoInfo_false_->isCapture_); - DHLOGI("DCameraClientTest dcamera_client_test_005: photo width: %d, height: %d, format: %d, isCapture: %d", - photoInfo_true_->width_, photoInfo_true_->height_, photoInfo_true_->format_, photoInfo_true_->isCapture_); + DHLOGI("DCameraClientTest dcamera_client_test_005: video width: %{public}d, height: %{public}d, format: " + "%{public}d, isCapture: %{public}d", videoInfo_true_->width_, videoInfo_true_->height_, + videoInfo_true_->format_, videoInfo_true_->isCapture_); + DHLOGI("DCameraClientTest dcamera_client_test_005: photo width: %{public}d, height: %{public}d, format: " + "%{public}d, isCapture: %{public}d", photoInfo_false_->width_, photoInfo_false_->height_, + photoInfo_false_->format_, photoInfo_false_->isCapture_); captureInfos.clear(); captureInfos.push_back(videoInfo_false_); captureInfos.push_back(photoInfo_true_); @@ -603,10 +608,12 @@ HWTEST_F(DCameraClientTest, dcamera_client_test_013, TestSize.Level1) EXPECT_EQ(DCAMERA_OK, ret); SetTokenID(); - DHLOGI("DCameraClientTest dcamera_client_test_013: video width: %d, height: %d, format: %d, isCapture: %d", - videoInfo_true_->width_, videoInfo_true_->height_, videoInfo_true_->format_, videoInfo_true_->isCapture_); - DHLOGI("DCameraClientTest dcamera_client_test_013: photo width: %d, height: %d, format: %d, isCapture: %d", - photoInfo_false_->width_, photoInfo_false_->height_, photoInfo_false_->format_, photoInfo_false_->isCapture_); + DHLOGI("DCameraClientTest dcamera_client_test_013: video width: %{public}d, height: %{public}d, format: " + "%{public}d, isCapture: %{public}d", videoInfo_true_->width_, videoInfo_true_->height_, + videoInfo_true_->format_, videoInfo_true_->isCapture_); + DHLOGI("DCameraClientTest dcamera_client_test_013: photo width: %{public}d, height: %{public}d, format: " + "%{public}d, isCapture: %{public}d", photoInfo_false_->width_, photoInfo_false_->height_, + photoInfo_false_->format_, photoInfo_false_->isCapture_); std::vector> captureInfos; captureInfos.push_back(videoInfo_true_); captureInfos.push_back(photoInfo_false_); diff --git a/services/cameraservice/cameraoperator/handler/BUILD.gn b/services/cameraservice/cameraoperator/handler/BUILD.gn index 56a9acbb53cef7f5a8c642d40e2884f529dd30a1..c5a5c1259eadc1ffcdcb2fef192f7279301a1fb5 100644 --- a/services/cameraservice/cameraoperator/handler/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/BUILD.gn @@ -61,6 +61,7 @@ ohos_shared_library("distributed_camera_handler") { "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "drivers_peripheral_display:hdi_gralloc_client", "graphic_surface:surface", + "hilog:libhilog", "ipc:ipc_core", ] diff --git a/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp b/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp index 9d2a16142ea69d795f206e5c2c715898f5be4e83..84088c7b4422cba4b6da3f632f268bdd5f974c30 100644 --- a/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp +++ b/services/cameraservice/cameraoperator/handler/src/dcamera_handler.cpp @@ -54,24 +54,26 @@ std::vector DCameraHandler::Query() { std::vector itemList; std::vector> cameraList = cameraManager_->GetSupportedCameras(); - DHLOGI("get %d cameras", cameraList.size()); + uint64_t listSize = static_cast(cameraList.size()); + DHLOGI("get %{public}" PRIu64" cameras", listSize); if (cameraList.empty()) { DHLOGE("no camera device"); return itemList; } for (auto& info : cameraList) { if (info->GetConnectionType() != CameraStandard::ConnectionType::CAMERA_CONNECTION_BUILT_IN) { - DHLOGI("connection type: %d", info->GetConnectionType()); + DHLOGI("connection type: %{public}d", info->GetConnectionType()); continue; } - DHLOGI("get %s, position: %d, cameraType: %d", + DHLOGI("get %{public}s, position: %{public}d, cameraType: %{public}d", GetAnonyString(info->GetID()).c_str(), info->GetPosition(), info->GetCameraType()); DHItem item; if (CreateDHItem(info, item) == DCAMERA_OK) { itemList.emplace_back(item); } } - DHLOGI("success, get %d items", itemList.size()); + listSize = static_cast(itemList.size()); + DHLOGI("success, get %{public}" PRIu64" items", listSize); return itemList; } @@ -107,7 +109,8 @@ std::vector DCameraHandler::GetCameras() { std::vector cameras; std::vector> cameraList = cameraManager_->GetSupportedCameras(); - DHLOGI("get %d cameras", cameraList.size()); + uint64_t listSize = static_cast(cameraList.size()); + DHLOGI("get %{public}" PRIu64" cameras", listSize); if (cameraList.empty()) { DHLOGE("no camera device"); return cameras; @@ -119,15 +122,16 @@ std::vector DCameraHandler::GetCameras() continue; } if (info->GetConnectionType() != CameraStandard::ConnectionType::CAMERA_CONNECTION_BUILT_IN) { - DHLOGI("connection type: %d", info->GetConnectionType()); + DHLOGI("connection type: %{public}d", info->GetConnectionType()); continue; } - DHLOGI("get %s, position: %d, cameraType: %d", + DHLOGI("get %{public}s, position: %{public}d, cameraType: %{public}d", GetAnonyString(info->GetID()).c_str(), info->GetPosition(), info->GetCameraType()); std::string dhId = CAMERA_ID_PREFIX + info->GetID(); cameras.emplace_back(dhId); } - DHLOGI("success, get %d items", cameras.size()); + listSize = static_cast(cameras.size()); + DHLOGI("success, get %{public}" PRIu64" items", listSize); return cameras; } @@ -166,7 +170,7 @@ int32_t DCameraHandler::CreateDHItem(sptr& info, D std::string id = info->GetID(); item.dhId = CAMERA_ID_PREFIX + id; item.subtype = "camera"; - DHLOGI("camera id: %s", GetAnonyString(id).c_str()); + DHLOGI("camera id: %{public}s", GetAnonyString(id).c_str()); cJSON *root = cJSON_CreateObject(); CHECK_AND_RETURN_RET_LOG(root == nullptr, DCAMERA_BAD_VALUE, "Create cJSON object failed"); @@ -188,7 +192,7 @@ int32_t DCameraHandler::CreateDHItem(sptr& info, D std::hash h; std::string abilityString = cameraInput->GetCameraSettings(); - DHLOGI("abilityString hash: %zu, length: %zu", h(abilityString), abilityString.length()); + DHLOGI("abilityString hash: %{public}zu, length: %{public}zu", h(abilityString), abilityString.length()); std::string encodeString = Base64Encode(reinterpret_cast(abilityString.c_str()), abilityString.length()); @@ -211,7 +215,7 @@ int32_t DCameraHandler::CreateDHItem(sptr& info, D std::string DCameraHandler::GetCameraPosition(CameraStandard::CameraPosition position) { - DHLOGI("position: %d", position); + DHLOGI("position: %{public}d", position); std::string ret = ""; switch (position) { case CameraStandard::CameraPosition::CAMERA_POSITION_BACK: { @@ -231,7 +235,7 @@ std::string DCameraHandler::GetCameraPosition(CameraStandard::CameraPosition pos break; } } - DHLOGI("success ret: %s", ret.c_str()); + DHLOGI("success ret: %{public}s", ret.c_str()); return ret; } @@ -246,7 +250,7 @@ void DCameraHandler::ProcessProfile(const DCStreamType type, std::map& args, std::string& result) { - DHLOGI("DcameraSinkHidumper Dump args.size():%d.", args.size()); result.clear(); int32_t argsSize = static_cast(args.size()); - + DHLOGI("DcameraSinkHidumper Dump args.size():%{public}d.", argsSize); if (args.empty()) { ShowHelp(result); return true; @@ -62,7 +61,7 @@ bool DcameraSinkHidumper::Dump(const std::vector& args, std::string } for (int32_t i = 0; i < argsSize; i++) { - DHLOGI("DcameraSinkHidumper Dump args[%d]: %s.", i, args.at(i).c_str()); + DHLOGI("DcameraSinkHidumper Dump args[%{public}d]: %{public}s.", i, args.at(i).c_str()); } if (ProcessDump(args[0], result) != DCAMERA_OK) { diff --git a/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp b/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp index 2da6fd73883883f637f5efb8212f02544d0e7d21..a94ba09db35daea4842f001411d78802df81ddfa 100644 --- a/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp +++ b/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp @@ -29,7 +29,6 @@ #include "dcamera_sink_service_ipc.h" #include "distributed_camera_errno.h" #include "distributed_hardware_log.h" -#include "dh_log.h" namespace OHOS { namespace DistributedHardware { @@ -85,7 +84,7 @@ int32_t DistributedCameraSinkService::InitSink(const std::string& params, sinkVer_ = params; g_camDump.version = sinkVer_; int32_t ret = DCameraHandler::GetInstance().Initialize(); - CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "handler initialize failed, ret: %d", ret); + CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "handler initialize failed, ret: %{public}d", ret); std::vector cameras = DCameraHandler::GetInstance().GetCameras(); CHECK_AND_RETURN_RET_LOG(cameras.empty(), DCAMERA_BAD_VALUE, "no camera device"); @@ -93,7 +92,7 @@ int32_t DistributedCameraSinkService::InitSink(const std::string& params, for (auto& dhId : cameras) { std::shared_ptr sinkDevice = std::make_shared(dhId, sinkCallback); ret = sinkDevice->Init(); - CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "sink device init failed, ret: %d", ret); + CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "sink device init failed, ret: %{public}d", ret); { std::lock_guard lock(mapMutex_); camerasMap_.emplace(dhId, sinkDevice); @@ -111,7 +110,7 @@ int32_t DistributedCameraSinkService::ReleaseSink() for (auto iter = camerasMap_.begin(); iter != camerasMap_.end(); iter++) { std::shared_ptr sinkDevice = iter->second; int32_t ret = sinkDevice->UnInit(); - CHECK_AND_LOG(ret != DCAMERA_OK, "release sink device failed, ret: %d", ret); + CHECK_AND_LOG(ret != DCAMERA_OK, "release sink device failed, ret: %{public}d", ret); } camerasMap_.clear(); } @@ -120,14 +119,14 @@ int32_t DistributedCameraSinkService::ReleaseSink() CHECK_AND_RETURN_RET_LOG(systemAbilityMgr == nullptr, DCAMERA_BAD_VALUE, "sink systemAbilityMgr is null"); int32_t ret = systemAbilityMgr->UnloadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID); CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, DCAMERA_BAD_VALUE, - "sink systemAbilityMgr UnLoadSystemAbility failed, ret: %d", ret); + "sink systemAbilityMgr UnLoadSystemAbility failed, ret: %{public}d", ret); DHLOGI("sink systemAbilityMgr UnLoadSystemAbility success"); return DCAMERA_OK; } int32_t DistributedCameraSinkService::SubscribeLocalHardware(const std::string& dhId, const std::string& parameters) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DHLOGI("dhId: %{public}s", GetAnonyString(dhId).c_str()); std::shared_ptr sinkDevice = nullptr; { std::lock_guard lock(mapMutex_); @@ -140,14 +139,14 @@ int32_t DistributedCameraSinkService::SubscribeLocalHardware(const std::string& } int32_t ret = sinkDevice->SubscribeLocalHardware(parameters); - CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "SubscribeLocalHardware failed, ret: %d", ret); + CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "SubscribeLocalHardware failed, ret: %{public}d", ret); DHLOGI("SubscribeLocalHardware success"); return DCAMERA_OK; } int32_t DistributedCameraSinkService::UnsubscribeLocalHardware(const std::string& dhId) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DHLOGI("dhId: %{public}s", GetAnonyString(dhId).c_str()); std::shared_ptr sinkDevice = nullptr; { std::lock_guard lock(mapMutex_); @@ -160,14 +159,14 @@ int32_t DistributedCameraSinkService::UnsubscribeLocalHardware(const std::string } int32_t ret = sinkDevice->UnsubscribeLocalHardware(); - CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "UnsubscribeLocalHardware failed, ret: %d", ret); + CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "UnsubscribeLocalHardware failed, ret: %{public}d", ret); DHLOGI("UnsubscribeLocalHardware success"); return DCAMERA_OK; } int32_t DistributedCameraSinkService::StopCapture(const std::string& dhId) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DHLOGI("dhId: %{public}s", GetAnonyString(dhId).c_str()); std::shared_ptr sinkDevice = nullptr; { std::lock_guard lock(mapMutex_); @@ -180,14 +179,14 @@ int32_t DistributedCameraSinkService::StopCapture(const std::string& dhId) } int32_t ret = sinkDevice->StopCapture(); - CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "StopCapture failed, ret: %d", ret); + CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "StopCapture failed, ret: %{public}d", ret); DHLOGI("StopCapture success"); return DCAMERA_OK; } int32_t DistributedCameraSinkService::ChannelNeg(const std::string& dhId, std::string& channelInfo) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DHLOGI("dhId: %{public}s", GetAnonyString(dhId).c_str()); std::shared_ptr sinkDevice = nullptr; { std::lock_guard lock(mapMutex_); @@ -200,14 +199,14 @@ int32_t DistributedCameraSinkService::ChannelNeg(const std::string& dhId, std::s } int32_t ret = sinkDevice->ChannelNeg(channelInfo); - CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "ChannelNeg failed, ret: %d", ret); + CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "ChannelNeg failed, ret: %{public}d", ret); DHLOGI("ChannelNeg success"); return DCAMERA_OK; } int32_t DistributedCameraSinkService::GetCameraInfo(const std::string& dhId, std::string& cameraInfo) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DHLOGI("dhId: %{public}s", GetAnonyString(dhId).c_str()); std::shared_ptr sinkDevice = nullptr; { std::lock_guard lock(mapMutex_); @@ -220,14 +219,14 @@ int32_t DistributedCameraSinkService::GetCameraInfo(const std::string& dhId, std } int32_t ret = sinkDevice->GetCameraInfo(cameraInfo); - CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "GetCameraInfo failed, ret: %d", ret); + CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "GetCameraInfo failed, ret: %{public}d", ret); DHLOGI("GetCameraInfo success"); return DCAMERA_OK; } int32_t DistributedCameraSinkService::OpenChannel(const std::string& dhId, std::string& openInfo) { - DHLOGI("DistributedCameraSinkService OpenChannel Begin,dhId: %s", GetAnonyString(dhId).c_str()); + DHLOGI("DistributedCameraSinkService OpenChannel Begin,dhId: %{public}s", GetAnonyString(dhId).c_str()); std::shared_ptr sinkDevice = nullptr; { std::lock_guard lock(mapMutex_); @@ -241,7 +240,7 @@ int32_t DistributedCameraSinkService::OpenChannel(const std::string& dhId, std:: int32_t ret = sinkDevice->OpenChannel(openInfo); if (ret != DCAMERA_OK) { - DHLOGE("OpenChannel failed, ret: %d", ret); + DHLOGE("OpenChannel failed, ret: %{public}d", ret); ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_SINK_OPEN_CAM_ERROR, CreateMsg("sink service open channel failed, dhId: %s", GetAnonyString(dhId).c_str())); return ret; @@ -252,7 +251,7 @@ int32_t DistributedCameraSinkService::OpenChannel(const std::string& dhId, std:: int32_t DistributedCameraSinkService::CloseChannel(const std::string& dhId) { - DHLOGI("dhId: %s", GetAnonyString(dhId).c_str()); + DHLOGI("dhId: %{public}s", GetAnonyString(dhId).c_str()); std::shared_ptr sinkDevice = nullptr; { std::lock_guard lock(mapMutex_); @@ -265,7 +264,7 @@ int32_t DistributedCameraSinkService::CloseChannel(const std::string& dhId) } int32_t ret = sinkDevice->CloseChannel(); - CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "CloseChannel failed, ret: %d", ret); + CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "CloseChannel failed, ret: %{public}d", ret); DHLOGI("CloseChannel success"); return DCAMERA_OK; } @@ -316,10 +315,10 @@ bool DistributedCameraSinkService::IsCurSinkDev(std::shared_ptr { std::string camInfoJson; int32_t ret = sinkDevice->GetCameraInfo(camInfoJson); - CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, false, "GetCameraInfo failed, ret: %d", ret); + CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, false, "GetCameraInfo failed, ret: %{public}d", ret); DCameraInfoCmd cmd; ret = cmd.Unmarshal(camInfoJson); - CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, false, "DCameraInfoCmd Unmarshal failed: %d", ret); + CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, false, "DCameraInfoCmd Unmarshal failed: %{public}d", ret); std::shared_ptr camInfo = cmd.value_; if (camInfo->state_ == DCAMERA_CHANNEL_STATE_CONNECTED) { return true; @@ -344,7 +343,7 @@ int32_t DistributedCameraSinkService::PauseDistributedHardware(const std::string "PauseDistributedHardware sinkDevice is nullptr."); int32_t ret = sinkDevice->PauseDistributedHardware(networkId); - CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "PauseDistributedHardware failed, ret: %d", ret); + CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "PauseDistributedHardware failed, ret: %{public}d", ret); DHLOGI("PauseDistributedHardware success"); return DCAMERA_OK; } @@ -366,7 +365,7 @@ int32_t DistributedCameraSinkService::ResumeDistributedHardware(const std::strin "ResumeDistributedHardware sinkDevice is nullptr."); int32_t ret = sinkDevice->ResumeDistributedHardware(networkId); - CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "ResumeDistributedHardware failed, ret: %d", ret); + CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "ResumeDistributedHardware failed, ret: %{public}d", ret); DHLOGI("ResumeDistributedHardware success"); return DCAMERA_OK; } @@ -388,7 +387,7 @@ int32_t DistributedCameraSinkService::StopDistributedHardware(const std::string "StopDistributedHardware sinkDevice is nullptr."); int32_t ret = sinkDevice->StopDistributedHardware(networkId); - CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "StopDistributedHardware failed, ret: %d", ret); + CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "StopDistributedHardware failed, ret: %{public}d", ret); DHLOGI("StopDistributedHardware success"); return DCAMERA_OK; } diff --git a/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_stub.cpp b/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_stub.cpp index e87ebde28d5fcd47fc5dcc2b0691868d37b6d6e7..4c208ecd44d54e8ce759d609fcea738c7807da2e 100644 --- a/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_stub.cpp +++ b/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_stub.cpp @@ -66,7 +66,7 @@ bool DistributedCameraSinkStub::HasEnableDHPermission() int32_t DistributedCameraSinkStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - DHLOGD("remote request code: %d", code); + DHLOGD("remote request code: %{public}d", code); std::u16string desc = DistributedCameraSinkStub::GetDescriptor(); std::u16string remoteDesc = data.ReadInterfaceToken(); if (desc != remoteDesc) { diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_access_control.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_access_control.cpp index b03992af46f9ba78af9350b5f974381864cae5ba..e0dc8b5bc03a1a2b0a12ba4c64a14032113f3390 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_access_control.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_access_control.cpp @@ -23,25 +23,25 @@ namespace OHOS { namespace DistributedHardware { bool DCameraSinkAccessControl::IsSensitiveSrcAccess(const std::string& srcType) { - DHLOGI("DCameraSinkAccessControl::IsSensitiveSrcAccess srcType: %s", srcType.c_str()); + DHLOGI("DCameraSinkAccessControl::IsSensitiveSrcAccess srcType: %{public}s", srcType.c_str()); return true; } bool DCameraSinkAccessControl::NotifySensitiveSrc(const std::string& srcType) { - DHLOGI("DCameraSinkAccessControl::NotifySensitiveSrc srcType: %s", srcType.c_str()); + DHLOGI("DCameraSinkAccessControl::NotifySensitiveSrc srcType: %{public}s", srcType.c_str()); return true; } int32_t DCameraSinkAccessControl::TriggerFrame(const std::string& deviceName) { - DHLOGI("DCameraSinkAccessControl::TriggerFrame deviceName: %s", deviceName.c_str()); + DHLOGI("DCameraSinkAccessControl::TriggerFrame deviceName: %{public}s", deviceName.c_str()); return DCAMERA_OK; } int32_t DCameraSinkAccessControl::GetAccessControlType(const std::string& accessType) { - DHLOGI("DCameraSinkAccessControl::GetAccessControlType accessType: %s", accessType.c_str()); + DHLOGI("DCameraSinkAccessControl::GetAccessControlType accessType: %{public}s", accessType.c_str()); return DCAMERA_SAME_ACCOUNT; } } // namespace DistributedHardware diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp index 82be46656a1619300fd1f767d38c16a59af44a8d..dc8bbd2b48a38871b224efcd5dc8d6a21e1e4882 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp @@ -62,7 +62,7 @@ DCameraSinkController::~DCameraSinkController() int32_t DCameraSinkController::StartCapture(std::vector>& captureInfos) { - DHLOGI("StartCapture dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("StartCapture dhId: %{public}s", GetAnonyString(dhId_).c_str()); std::string accessType = ""; if ((accessControl_->IsSensitiveSrcAccess(SRC_TYPE)) && (accessControl_->GetAccessControlType(accessType) == DCAMERA_SAME_ACCOUNT)) { @@ -83,11 +83,11 @@ int32_t DCameraSinkController::StartCapture(std::vector autoLock(captureLock_); int32_t ret = operator_->StopCapture(); if (ret != DCAMERA_OK) { - DHLOGE("client stop capture failed, dhId: %s, ret: %d", + DHLOGE("client stop capture failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_DEVICE_ERROR, std::string("operator stop capture failed.")); return ret; @@ -95,31 +95,31 @@ int32_t DCameraSinkController::StopCapture() ret = output_->StopCapture(); if (ret != DCAMERA_OK) { - DHLOGE("output stop capture failed, dhId: %s, ret: %d", + DHLOGE("output stop capture failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_DEVICE_ERROR, std::string("output stop capture failed")); return ret; } - DHLOGI("StopCapture %s success", GetAnonyString(dhId_).c_str()); + DHLOGI("StopCapture %{public}s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSinkController::ChannelNeg(std::shared_ptr& info) { - DHLOGI("ChannelNeg dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("ChannelNeg dhId: %{public}s", GetAnonyString(dhId_).c_str()); int32_t ret = output_->OpenChannel(info); if (ret != DCAMERA_OK) { - DHLOGE("channel negotiate failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("channel negotiate failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); return ret; } - DHLOGI("ChannelNeg %s success", GetAnonyString(dhId_).c_str()); + DHLOGI("ChannelNeg %{public}s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSinkController::DCameraNotify(std::shared_ptr& events) { - DHLOGI("DCameraNotify dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraNotify dhId: %{public}s", GetAnonyString(dhId_).c_str()); if (srcDevId_.empty()) { DHLOGE("source deviceId is empty"); return DCAMERA_BAD_VALUE; @@ -139,7 +139,7 @@ int32_t DCameraSinkController::DCameraNotify(std::shared_ptr& even eventCmd.value_ = events; int32_t ret = eventCmd.Marshal(jsonStr); if (ret != DCAMERA_OK) { - DHLOGE("DCameraEventCmd marshal failed, dhId: %s, ret: %d", + DHLOGE("DCameraEventCmd marshal failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); return ret; } @@ -147,66 +147,66 @@ int32_t DCameraSinkController::DCameraNotify(std::shared_ptr& even std::string sinkDevId; ret = GetLocalDeviceNetworkId(sinkDevId); if (ret != DCAMERA_OK) { - DHLOGE("GetLocalDeviceNetworkId failed, devId: %s, dhId: %s, ret: %d", + DHLOGE("GetLocalDeviceNetworkId failed, devId: %{public}s, dhId: %{public}s, ret: %{public}d", GetAnonyString(sinkDevId).c_str(), GetAnonyString(dhId_).c_str(), ret); return ret; } ret = sourceSA->DCameraNotify(sinkDevId, dhId_, jsonStr); if (ret != DCAMERA_OK) { - DHLOGE("SourceSA notify failed, srcId: %s, sinkId: %s, dhId: %s, ret: %d", + DHLOGE("SourceSA notify failed, srcId: %{public}s, sinkId: %{public}s, dhId: %{public}s, ret: %{public}d", GetAnonyString(srcDevId_).c_str(), GetAnonyString(sinkDevId).c_str(), GetAnonyString(dhId_).c_str(), ret); return ret; } - DHLOGI("DCameraNotify %s success", GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraNotify %{public}s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSinkController::UpdateSettings(std::vector>& settings) { - DHLOGI("UpdateSettings dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("UpdateSettings dhId: %{public}s", GetAnonyString(dhId_).c_str()); if (!CheckPermission()) { DHLOGE("DCameraSinkController UpdateSettings fail, CheckPermission fail"); return DCAMERA_WRONG_STATE; } int32_t ret = operator_->UpdateSettings(settings); if (ret != DCAMERA_OK) { - DHLOGE("UpdateSettings failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("UpdateSettings failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); return ret; } - DHLOGI("UpdateSettings %s success", GetAnonyString(dhId_).c_str()); + DHLOGI("UpdateSettings %{public}s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSinkController::GetCameraInfo(std::shared_ptr& camInfo) { - DHLOGI("GetCameraInfo dhId: %s, session state: %d", GetAnonyString(dhId_).c_str(), sessionState_); + DHLOGI("GetCameraInfo dhId: %{public}s, session state: %{public}d", GetAnonyString(dhId_).c_str(), sessionState_); camInfo->state_ = sessionState_; return DCAMERA_OK; } int32_t DCameraSinkController::OpenChannel(std::shared_ptr& openInfo) { - DHLOGI("DCameraSinkController OpenChannel Start, dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSinkController OpenChannel Start, dhId: %{public}s", GetAnonyString(dhId_).c_str()); if (!CheckPermission()) { DHLOGE("DCameraSinkController OpenChannel fail, CheckPermission fail"); return DCAMERA_WRONG_STATE; } if (sessionState_ != DCAMERA_CHANNEL_STATE_DISCONNECTED) { - DHLOGE("wrong state, dhId: %s, sessionState: %d", GetAnonyString(dhId_).c_str(), sessionState_); + DHLOGE("wrong state, dhId: %{public}s, sessionState: %{public}d", GetAnonyString(dhId_).c_str(), sessionState_); return DCAMERA_WRONG_STATE; } srcDevId_ = openInfo->sourceDevId_; int32_t ret = sinkCallback_->OnNotifyResourceInfo(ResourceEventType::EVENT_TYPE_QUERY_RESOURCE, PAGE_SUBTYPE, srcDevId_, isSensitive_, isSameAccount_); if (ret != DCAMERA_OK) { - DHLOGE("Query resource failed, ret: %d", ret); + DHLOGE("Query resource failed, ret: %{public}d", ret); return ret; } - DHLOGI("OpenChannel isSensitive: %d, isSameAccout: %d", isSensitive_, isSameAccount_); + DHLOGI("OpenChannel isSensitive: %{public}d, isSameAccout: %{public}d", isSensitive_, isSameAccount_); if (isSensitive_ && !isSameAccount_) { DHLOGE("Privacy resource must be logged in with the same account."); return DCAMERA_BAD_VALUE; @@ -215,7 +215,7 @@ int32_t DCameraSinkController::OpenChannel(std::shared_ptr& ope std::string sinkDevId; ret = GetLocalDeviceNetworkId(sinkDevId); if (ret != DCAMERA_OK) { - DHLOGE("GetLocalDeviceNetworkId failed, ret: %d", ret); + DHLOGE("GetLocalDeviceNetworkId failed, ret: %{public}d", ret); return ret; } if (isSensitive_ && !CheckDeviceSecurityLevel(srcDevId_, sinkDevId)) { @@ -230,14 +230,14 @@ int32_t DCameraSinkController::OpenChannel(std::shared_ptr& ope std::make_shared(controller); ret = channel_->CreateSession(indexs, SESSION_FLAG, DCAMERA_SESSION_MODE_CTRL, listener); if (ret != DCAMERA_OK) { - DHLOGE("channel create session failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("channel create session failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); return ret; } ret = PullUpPage(); if (ret != DCAMERA_OK) { return ret; } - DHLOGI("DCameraSinkController OpenChannel %s success", GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSinkController OpenChannel %{public}s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } @@ -249,7 +249,7 @@ int32_t DCameraSinkController::PullUpPage() int32_t ret = sinkCallback_->OnNotifyResourceInfo(ResourceEventType::EVENT_TYPE_PULL_UP_PAGE, PAGE_SUBTYPE, srcDevId_, isSensitive, isSameAccout); if (ret != DCAMERA_OK) { - DHLOGE("pull up page failed, ret %d", ret); + DHLOGE("pull up page failed, ret %{public}d", ret); return ret; } isPageStatus_.store(true); @@ -259,20 +259,20 @@ int32_t DCameraSinkController::PullUpPage() int32_t DCameraSinkController::CloseChannel() { - DHLOGI("DCameraSinkController CloseChannel Start, dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSinkController CloseChannel Start, dhId: %{public}s", GetAnonyString(dhId_).c_str()); std::lock_guard autoLock(channelLock_); DCameraLowLatency::GetInstance().DisableLowLatency(); DCameraSinkServiceIpc::GetInstance().DeleteSourceRemoteCamSrv(srcDevId_); srcDevId_.clear(); int32_t ret = channel_->ReleaseSession(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSinkController release channel failed, dhId: %s, ret: %d", + DHLOGE("DCameraSinkController release channel failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); } ret = output_->CloseChannel(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSinkController CloseChannel failed, dhId: %s, ret: %d", + DHLOGE("DCameraSinkController CloseChannel failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); } sessionState_ = DCAMERA_CHANNEL_STATE_DISCONNECTED; @@ -282,11 +282,11 @@ int32_t DCameraSinkController::CloseChannel() ret = sinkCallback_->OnNotifyResourceInfo(ResourceEventType::EVENT_TYPE_CLOSE_PAGE, PAGE_SUBTYPE, srcDevId_, isSensitive, isSameAccout); if (ret != DCAMERA_OK) { - DHLOGE("close page failed, ret: %d", ret); + DHLOGE("close page failed, ret: %{public}d", ret); } } isPageStatus_.store(false); - DHLOGI("DCameraSinkController CloseChannel %s success", GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSinkController CloseChannel %{public}s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } @@ -298,7 +298,7 @@ int32_t DCameraSinkController::Init(std::vector& indexs) output_ = std::make_shared(dhId_, operator_); int32_t ret = output_->Init(); if (ret != DCAMERA_OK) { - DHLOGE("output init failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("output init failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); return ret; } @@ -307,7 +307,7 @@ int32_t DCameraSinkController::Init(std::vector& indexs) operator_->SetStateCallback(stateCallback); ret = operator_->Init(); if (ret != DCAMERA_OK) { - DHLOGE("operator init failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("operator init failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); return ret; } @@ -320,28 +320,30 @@ int32_t DCameraSinkController::Init(std::vector& indexs) isInit_ = true; initCallback_ = std::make_shared(); - DHLOGI("DCameraSinkController Init %s success", GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSinkController Init %{public}s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSinkController::UnInit() { - DHLOGI("DCameraSinkController UnInit dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSinkController UnInit dhId: %{public}s", GetAnonyString(dhId_).c_str()); std::lock_guard autoLock(autoLock_); int32_t ret = StopCapture(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSinkController UnInit %s stop capture failed, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("DCameraSinkController UnInit %{public}s stop capture failed, ret: %{public}d", + GetAnonyString(dhId_).c_str(), ret); } ret = CloseChannel(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSinkController UnInit %s close channel failed, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("DCameraSinkController UnInit %{public}s close channel failed, ret: %{public}d", + GetAnonyString(dhId_).c_str(), ret); } if (output_ != nullptr) { ret = output_->UnInit(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSinkController release output failed, dhId: %s, ret: %d", + DHLOGE("DCameraSinkController release output failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); } } @@ -349,13 +351,13 @@ int32_t DCameraSinkController::UnInit() if (operator_ != nullptr) { ret = operator_->UnInit(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSinkController release operator failed, dhId: %s, ret: %d", + DHLOGE("DCameraSinkController release operator failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); } } isInit_ = false; - DHLOGI("DCameraSinkController UnInit %s success", GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSinkController UnInit %{public}s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } @@ -373,7 +375,7 @@ void DCameraSinkController::OnEvent(DCameraPostAuthorizationEvent& event) void DCameraSinkController::OnStateChanged(std::shared_ptr& event) { - DHLOGI("DCameraSinkController::OnStateChanged dhId: %s, result: %d", + DHLOGI("DCameraSinkController::OnStateChanged dhId: %{public}s, result: %{public}d", GetAnonyString(dhId_).c_str(), event->eventResult_); if (event->eventResult_ == DCAMERA_EVENT_DEVICE_PREEMPT) { DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_DEVICE_PREEMPT, std::string("camera device preempted")); @@ -384,7 +386,7 @@ void DCameraSinkController::OnStateChanged(std::shared_ptr& event) void DCameraSinkController::OnMetadataResult(std::vector>& settings) { - DHLOGI("DCameraSinkController::OnMetadataResult dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSinkController::OnMetadataResult dhId: %{public}s", GetAnonyString(dhId_).c_str()); if (settings.empty()) { DHLOGE("camera settings is empty"); return; @@ -397,27 +399,29 @@ void DCameraSinkController::OnMetadataResult(std::vector buffer = std::make_shared(jsonStr.length() + 1); ret = memcpy_s(buffer->Data(), buffer->Capacity(), reinterpret_cast(const_cast(jsonStr.c_str())), jsonStr.length()); if (ret != EOK) { - DHLOGE("memcpy_s failed, dhId: %s ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("memcpy_s failed, dhId: %{public}s ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); return; } ret = channel_->SendData(buffer); if (ret != DCAMERA_OK) { - DHLOGE("channel send data failed, dhId: %s ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("channel send data failed, dhId: %{public}s ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); return; } - DHLOGI("DCameraSinkController::OnMetadataResult dhId: %s success", GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSinkController::OnMetadataResult dhId: %{public}s success", GetAnonyString(dhId_).c_str()); } void DCameraSinkController::OnSessionState(int32_t state) { - DHLOGI("DCameraSinkController::OnSessionState dhId: %s, state: %d", GetAnonyString(dhId_).c_str(), state); + DHLOGI("DCameraSinkController::OnSessionState dhId: %{public}s, state: %{public}d", + GetAnonyString(dhId_).c_str(), state); sessionState_ = state; switch (state) { case DCAMERA_CHANNEL_STATE_CONNECTING: @@ -429,18 +433,18 @@ void DCameraSinkController::OnSessionState(int32_t state) case DCAMERA_CHANNEL_STATE_DISCONNECTED: DHLOGI("channel is disconnected"); std::thread([this]() { - DHLOGI("DCameraSinkController::OnSessionState %s new thread session state: %d", + DHLOGI("DCameraSinkController::OnSessionState %{public}s new thread session state: %{public}d", GetAnonyString(dhId_).c_str(), sessionState_); prctl(PR_SET_NAME, CHANNEL_DISCONNECTED.c_str()); std::lock_guard autoLock(autoLock_); int32_t ret = CloseChannel(); if (ret != DCAMERA_OK) { - DHLOGE("session state: %d, %s close channel failed, ret: %d", + DHLOGE("session state: %{public}d, %{public}s close channel failed, ret: %{public}d", sessionState_, GetAnonyString(dhId_).c_str(), ret); } ret = StopCapture(); if (ret != DCAMERA_OK) { - DHLOGE("session state: %d, %s stop capture failed, ret: %d", + DHLOGE("session state: %{public}d, %{public}s stop capture failed, ret: %{public}d", sessionState_, GetAnonyString(dhId_).c_str(), ret); } }).detach(); @@ -453,13 +457,13 @@ void DCameraSinkController::OnSessionState(int32_t state) void DCameraSinkController::OnSessionError(int32_t eventType, int32_t eventReason, std::string detail) { - DHLOGI("DCameraSinkController::OnSessionError dhId: %s, eventType: %d, eventReason: %d, detail: %s", - GetAnonyString(dhId_).c_str(), eventType, eventReason, detail.c_str()); + DHLOGI("DCameraSinkController::OnSessionError dhId: %{public}s, eventType: %{public}d, eventReason: %{public}d," + " detail: %{public}s", GetAnonyString(dhId_).c_str(), eventType, eventReason, detail.c_str()); } void DCameraSinkController::OnDataReceived(std::vector>& buffers) { - DHLOGI("OnReceivedData %s control channel receive data", GetAnonyString(dhId_).c_str()); + DHLOGI("OnReceivedData %{public}s control channel receive data", GetAnonyString(dhId_).c_str()); for (auto& buffer : buffers) { if (buffer->Size() <= 0 || buffer->Size() > DATABUFF_MAX_SIZE) { DHLOGI("buffer is invalid"); @@ -471,7 +475,7 @@ void DCameraSinkController::OnDataReceived(std::vector>& captureInfos) { - DHLOGI("DCameraSinkController::PostAuthorization dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSinkController::PostAuthorization dhId: %{public}s", GetAnonyString(dhId_).c_str()); int32_t ret = StartCaptureInner(captureInfos); if (ret == DCAMERA_OK) { accessControl_->NotifySensitiveSrc(SRC_TYPE); @@ -480,11 +484,11 @@ void DCameraSinkController::PostAuthorization(std::vector>& captureInfos) { - DHLOGI("StartCaptureInner dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("StartCaptureInner dhId: %{public}s", GetAnonyString(dhId_).c_str()); std::lock_guard autoLock(captureLock_); int32_t ret = output_->StartCapture(captureInfos); if (ret != DCAMERA_OK) { - DHLOGE("output start capture failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("output start capture failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_DEVICE_ERROR, std::string("output start capture failed")); return ret; } @@ -496,7 +500,8 @@ int32_t DCameraSinkController::StartCaptureInner(std::vectorStartCapture(captureInfos, carrier.surface_); if (ret != DCAMERA_OK) { - DHLOGE("camera client start capture failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("camera client start capture failed, dhId: %{public}s, ret: %{public}d", + GetAnonyString(dhId_).c_str(), ret); if (ret == DCAMERA_ALLOC_ERROR) { DCameraNotifyInner(DCAMERA_MESSAGE, DCAMERA_EVENT_NO_PERMISSION, std::string("operator start capture permission denial.")); @@ -508,7 +513,7 @@ int32_t DCameraSinkController::StartCaptureInner(std::vector& dataBuffer) { - DHLOGI("DCameraSinkController::HandleReceivedData dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSinkController::HandleReceivedData dhId: %{public}s", GetAnonyString(dhId_).c_str()); uint8_t *data = dataBuffer->Data(); std::string jsonStr(reinterpret_cast(data), dataBuffer->Capacity()); cJSON *rootValue = cJSON_Parse(jsonStr.c_str()); @@ -542,7 +547,8 @@ int32_t DCameraSinkController::HandleReceivedData(std::shared_ptr& d DCameraCaptureInfoCmd captureInfoCmd; int ret = captureInfoCmd.Unmarshal(jsonStr); if (ret != DCAMERA_OK) { - DHLOGE("Capture Info Unmarshal failed, dhId: %s ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("Capture Info Unmarshal failed, dhId: %{public}s ret: %{public}d", + GetAnonyString(dhId_).c_str(), ret); return ret; } return StartCapture(captureInfoCmd.value_); @@ -550,7 +556,7 @@ int32_t DCameraSinkController::HandleReceivedData(std::shared_ptr& d DCameraMetadataSettingCmd metadataSettingCmd; int ret = metadataSettingCmd.Unmarshal(jsonStr); if (ret != DCAMERA_OK) { - DHLOGE("Metadata Setting Unmarshal failed, dhId: %s ret: %d", + DHLOGE("Metadata Setting Unmarshal failed, dhId: %{public}s ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); return ret; } @@ -561,7 +567,7 @@ int32_t DCameraSinkController::HandleReceivedData(std::shared_ptr& d int32_t DCameraSinkController::PauseDistributedHardware(const std::string &networkId) { - DHLOGI("Pause distributed hardware dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("Pause distributed hardware dhId: %{public}s", GetAnonyString(dhId_).c_str()); if (networkId.empty()) { DHLOGE("networkId is empty"); return DCAMERA_BAD_VALUE; @@ -572,14 +578,15 @@ int32_t DCameraSinkController::PauseDistributedHardware(const std::string &netwo } int32_t ret = operator_->PauseCapture(); if (ret != DCAMERA_OK) { - DHLOGE("Pause distributed hardware failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("Pause distributed hardware failed, dhId: %{public}s, ret: %{public}d", + GetAnonyString(dhId_).c_str(), ret); } return ret; } int32_t DCameraSinkController::ResumeDistributedHardware(const std::string &networkId) { - DHLOGI("Resume distributed hardware dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("Resume distributed hardware dhId: %{public}s", GetAnonyString(dhId_).c_str()); if (networkId.empty()) { DHLOGE("networkId is empty"); return DCAMERA_BAD_VALUE; @@ -590,14 +597,15 @@ int32_t DCameraSinkController::ResumeDistributedHardware(const std::string &netw } int32_t ret = operator_->ResumeCapture(); if (ret != DCAMERA_OK) { - DHLOGE("Resume distributed hardware failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("Resume distributed hardware failed, dhId: %{public}s, ret: %{public}d", + GetAnonyString(dhId_).c_str(), ret); } return ret; } int32_t DCameraSinkController::StopDistributedHardware(const std::string &networkId) { - DHLOGI("Stop distributed hardware dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("Stop distributed hardware dhId: %{public}s", GetAnonyString(dhId_).c_str()); if (networkId.empty()) { DHLOGE("networkId is empty"); return DCAMERA_BAD_VALUE; @@ -609,7 +617,7 @@ int32_t DCameraSinkController::StopDistributedHardware(const std::string &networ bool DCameraSinkController::CheckDeviceSecurityLevel(const std::string &srcDeviceId, const std::string &dstDeviceId) { - DHLOGD("CheckDeviceSecurityLevel srcDeviceId %s, dstDeviceId %s.", + DHLOGD("CheckDeviceSecurityLevel srcDeviceId %{public}s, dstDeviceId %{public}s.", GetAnonyString(srcDeviceId).c_str(), GetAnonyString(dstDeviceId).c_str()); std::string srcUdid = GetUdidByNetworkId(srcDeviceId); if (srcUdid.empty()) { @@ -621,11 +629,11 @@ bool DCameraSinkController::CheckDeviceSecurityLevel(const std::string &srcDevic DHLOGE("dst udid is empty"); return false; } - DHLOGD("CheckDeviceSecurityLevel srcUdid %s, dstUdid %s.", + DHLOGD("CheckDeviceSecurityLevel srcUdid %{public}s, dstUdid %{public}s.", GetAnonyString(srcUdid).c_str(), GetAnonyString(dstUdid).c_str()); int32_t srcDeviceSecurityLevel = GetDeviceSecurityLevel(srcUdid); int32_t dstDeviceSecurityLevel = GetDeviceSecurityLevel(dstUdid); - DHLOGI("srcDeviceSecurityLevel is %d, dstDeviceSecurityLevel is %d.", + DHLOGI("srcDeviceSecurityLevel is %{public}d, dstDeviceSecurityLevel is %{public}d.", srcDeviceSecurityLevel, dstDeviceSecurityLevel); if (srcDeviceSecurityLevel == DEFAULT_DEVICE_SECURITY_LEVEL || srcDeviceSecurityLevel < dstDeviceSecurityLevel) { @@ -641,24 +649,24 @@ int32_t DCameraSinkController::GetDeviceSecurityLevel(const std::string &udid) devIdentify.length = DEVICE_ID_MAX_LEN; int32_t ret = memcpy_s(devIdentify.identity, DEVICE_ID_MAX_LEN, udid.c_str(), DEVICE_ID_MAX_LEN); if (ret != 0) { - DHLOGE("str copy failed %d", ret); + DHLOGE("str copy failed %{public}d", ret); return DEFAULT_DEVICE_SECURITY_LEVEL; } DeviceSecurityInfo *info = nullptr; ret = RequestDeviceSecurityInfo(&devIdentify, nullptr, &info); if (ret != SUCCESS) { - DHLOGE("Request device security info failed %d", ret); + DHLOGE("Request device security info failed %{public}d", ret); FreeDeviceSecurityInfo(info); info = nullptr; return DEFAULT_DEVICE_SECURITY_LEVEL; } int32_t level = 0; ret = GetDeviceSecurityLevelValue(info, &level); - DHLOGD("Get device security level, level is %d", level); + DHLOGD("Get device security level, level is %{public}d", level); FreeDeviceSecurityInfo(info); info = nullptr; if (ret != SUCCESS) { - DHLOGE("Get device security level failed %d", ret); + DHLOGE("Get device security level failed %{public}d", ret); return DEFAULT_DEVICE_SECURITY_LEVEL; } return level; @@ -672,13 +680,13 @@ std::string DCameraSinkController::GetUdidByNetworkId(const std::string &network } int32_t ret = DeviceManager::GetInstance().InitDeviceManager(DCAMERA_PKG_NAME, initCallback_); if (ret != DCAMERA_OK) { - DHLOGE("InitDeviceManager failed ret = %d", ret); + DHLOGE("InitDeviceManager failed ret = %{public}d", ret); return ""; } std::string udid = ""; ret = DeviceManager::GetInstance().GetUdidByNetworkId(DCAMERA_PKG_NAME, networkId, udid); if (ret != DCAMERA_OK) { - DHLOGE("GetUdidByNetworkId failed ret = %d", ret); + DHLOGE("GetUdidByNetworkId failed ret = %{public}d", ret); return ""; } return udid; diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_data_process.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_data_process.cpp index d121e813724e985d0ef0d8340837ad5a12845ccf..8bf4ad5684b375fca877ba13e71b11e08199b727 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_data_process.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_data_process.cpp @@ -31,12 +31,12 @@ namespace DistributedHardware { DCameraSinkDataProcess::DCameraSinkDataProcess(const std::string& dhId, std::shared_ptr& channel) : dhId_(dhId), channel_(channel), eventHandler_(nullptr) { - DHLOGI("DCameraSinkDataProcess Constructor dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSinkDataProcess Constructor dhId: %{public}s", GetAnonyString(dhId_).c_str()); } DCameraSinkDataProcess::~DCameraSinkDataProcess() { - DHLOGI("DCameraSinkDataProcess delete dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSinkDataProcess delete dhId: %{public}s", GetAnonyString(dhId_).c_str()); if ((eventHandler_ != nullptr) && (eventHandler_->GetEventRunner() != nullptr)) { eventHandler_->GetEventRunner()->Stop(); } @@ -46,7 +46,7 @@ DCameraSinkDataProcess::~DCameraSinkDataProcess() void DCameraSinkDataProcess::Init() { - DHLOGI("DCameraSinkDataProcess Init dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSinkDataProcess Init dhId: %{public}s", GetAnonyString(dhId_).c_str()); eventThread_ = std::thread(&DCameraSinkDataProcess::StartEventHandler, this); std::unique_lock lock(eventMutex_); eventCon_.wait(lock, [this] { @@ -68,17 +68,17 @@ void DCameraSinkDataProcess::StartEventHandler() int32_t DCameraSinkDataProcess::StartCapture(std::shared_ptr& captureInfo) { - DHLOGI("StartCapture dhId: %s, width: %d, height: %d, format: %d, stream: %d, encode: %d", - GetAnonyString(dhId_).c_str(), captureInfo->width_, captureInfo->height_, captureInfo->format_, - captureInfo->streamType_, captureInfo->encodeType_); + DHLOGI("StartCapture dhId: %{public}s, width: %{public}d, height: %{public}d, format: %{public}d, stream: " + "%{public}d, encode: %{public}d", GetAnonyString(dhId_).c_str(), captureInfo->width_, captureInfo->height_, + captureInfo->format_, captureInfo->streamType_, captureInfo->encodeType_); captureInfo_ = captureInfo; if (pipeline_ != nullptr) { - DHLOGI("StartCapture %s pipeline already exits", GetAnonyString(dhId_).c_str()); + DHLOGI("StartCapture %{public}s pipeline already exits", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } if (captureInfo->streamType_ == CONTINUOUS_FRAME) { - DHLOGI("StartCapture %s create data process pipeline", GetAnonyString(dhId_).c_str()); + DHLOGI("StartCapture %{public}s create data process pipeline", GetAnonyString(dhId_).c_str()); pipeline_ = std::make_shared(); auto dataProcess = std::shared_ptr(shared_from_this()); std::shared_ptr listener = std::make_shared(dataProcess); @@ -94,24 +94,24 @@ int32_t DCameraSinkDataProcess::StartCapture(std::shared_ptr captureInfo->height_); int32_t ret = pipeline_->CreateDataProcessPipeline(PipelineType::VIDEO, srcParams, destParams, listener); if (ret != DCAMERA_OK) { - DHLOGE("create data process pipeline failed, dhId: %s, ret: %d", + DHLOGE("create data process pipeline failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); return ret; } } - DHLOGI("StartCapture %s success", GetAnonyString(dhId_).c_str()); + DHLOGI("StartCapture %{public}s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSinkDataProcess::StopCapture() { - DHLOGI("StopCapture dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("StopCapture dhId: %{public}s", GetAnonyString(dhId_).c_str()); if (pipeline_ != nullptr) { pipeline_->DestroyDataProcessPipeline(); pipeline_ = nullptr; } if (eventHandler_ != nullptr) { - DHLOGI("StopCapture dhId: %s, remove all events", GetAnonyString(dhId_).c_str()); + DHLOGI("StopCapture dhId: %{public}s, remove all events", GetAnonyString(dhId_).c_str()); eventHandler_->RemoveAllEvents(); } return DCAMERA_OK; @@ -120,12 +120,13 @@ int32_t DCameraSinkDataProcess::StopCapture() int32_t DCameraSinkDataProcess::FeedStream(std::shared_ptr& dataBuffer) { DCStreamType type = captureInfo_->streamType_; - DHLOGD("FeedStream dhId: %s, stream type: %d", GetAnonyString(dhId_).c_str(), type); + DHLOGD("FeedStream dhId: %{public}s, stream type: %{public}d", GetAnonyString(dhId_).c_str(), type); switch (type) { case CONTINUOUS_FRAME: { int32_t ret = FeedStreamInner(dataBuffer); if (ret != DCAMERA_OK) { - DHLOGE("FeedStream continuous frame failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("FeedStream continuous frame failed, dhId: %{public}s, ret: %{public}d", + GetAnonyString(dhId_).c_str(), ret); return ret; } break; @@ -135,7 +136,7 @@ int32_t DCameraSinkDataProcess::FeedStream(std::shared_ptr& dataBuff break; } default: { - DHLOGE("FeedStream %s unknown stream type: %d", GetAnonyString(dhId_).c_str(), type); + DHLOGE("FeedStream %{public}s unknown stream type: %{public}d", GetAnonyString(dhId_).c_str(), type); break; } } @@ -147,8 +148,9 @@ void DCameraSinkDataProcess::SendDataAsync(const std::shared_ptr& bu auto sendFunc = [this, buffer]() mutable { std::shared_ptr sendBuffer = buffer; int32_t ret = channel_->SendData(sendBuffer); - DHLOGD("SendData type: %d output data ret: %d, dhId: %s, bufferSize: %d", captureInfo_->streamType_, ret, - GetAnonyString(dhId_).c_str(), buffer->Size()); + uint64_t buffersSize = static_cast(buffer->Size()); + DHLOGD("SendData type: %{public}d output data ret: %{public}d, dhId: %{public}s, bufferSize: %{public}" PRIu64, + captureInfo_->streamType_, ret, GetAnonyString(dhId_).c_str(), buffersSize); }; if (eventHandler_ != nullptr) { eventHandler_->PostTask(sendFunc); @@ -167,7 +169,7 @@ void DCameraSinkDataProcess::OnProcessedVideoBuffer(const std::shared_ptr& dat buffers.push_back(dataBuffer); int32_t ret = pipeline_->ProcessData(buffers); if (ret != DCAMERA_OK) { - DHLOGE("process data failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("process data failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); return ret; } return DCAMERA_OK; diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_dev.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_dev.cpp index 6eadf0477aaed9df0a1b170d0cdd3caaba668632..ce56b5c31f50e7ee94aa53b14c8ac212ef00f340 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_dev.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_dev.cpp @@ -29,7 +29,7 @@ namespace DistributedHardware { DCameraSinkDev::DCameraSinkDev(const std::string& dhId, const sptr &sinkCallback) : dhId_(dhId), sinkCallback_(sinkCallback) { - DHLOGI("DCameraSinkDev Constructor dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSinkDev Constructor dhId: %{public}s", GetAnonyString(dhId_).c_str()); isInit_ = false; } @@ -42,7 +42,7 @@ DCameraSinkDev::~DCameraSinkDev() int32_t DCameraSinkDev::Init() { - DHLOGI("Init dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("Init dhId: %{public}s", GetAnonyString(dhId_).c_str()); accessControl_ = std::make_shared(); controller_ = std::make_shared(accessControl_, sinkCallback_); DCameraIndex index("", dhId_); @@ -50,12 +50,12 @@ int32_t DCameraSinkDev::Init() indexs.push_back(index); int32_t ret = controller_->Init(indexs); if (ret != DCAMERA_OK) { - DHLOGE("init controller failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("init controller failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); return ret; } isInit_ = true; - DHLOGI("DCameraSinkDev Init %s success", GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSinkDev Init %{public}s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } @@ -64,7 +64,7 @@ int32_t DCameraSinkDev::UnInit() if (controller_ != nullptr) { int32_t ret = controller_->UnInit(); if (ret != DCAMERA_OK) { - DHLOGE("release controller failed, dhId: %s, ret: %d", + DHLOGE("release controller failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); } } @@ -87,13 +87,13 @@ int32_t DCameraSinkDev::UnsubscribeLocalHardware() int32_t DCameraSinkDev::StopCapture() { - DHLOGI("StopCapture dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("StopCapture dhId: %{public}s", GetAnonyString(dhId_).c_str()); return controller_->StopCapture(); } int32_t DCameraSinkDev::ChannelNeg(std::string& channelInfo) { - DHLOGI("ChannelNeg dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("ChannelNeg dhId: %{public}s", GetAnonyString(dhId_).c_str()); if (channelInfo.empty()) { DHLOGE("channelInfo is empty"); return DCAMERA_BAD_VALUE; @@ -102,7 +102,7 @@ int32_t DCameraSinkDev::ChannelNeg(std::string& channelInfo) DCameraChannelInfoCmd channelInfoCmd; int32_t ret = channelInfoCmd.Unmarshal(channelInfo); if (ret != DCAMERA_OK) { - DHLOGE("channelInfo unmarshal failed, dhId: %s, ret: %d", + DHLOGE("channelInfo unmarshal failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); return ret; } @@ -111,11 +111,11 @@ int32_t DCameraSinkDev::ChannelNeg(std::string& channelInfo) int32_t DCameraSinkDev::GetCameraInfo(std::string& cameraInfo) { - DHLOGI("GetCameraInfo dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("GetCameraInfo dhId: %{public}s", GetAnonyString(dhId_).c_str()); std::shared_ptr info = std::make_shared(); int32_t ret = controller_->GetCameraInfo(info); if (ret != DCAMERA_OK) { - DHLOGE("get state failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("get state failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); return ret; } @@ -126,16 +126,16 @@ int32_t DCameraSinkDev::GetCameraInfo(std::string& cameraInfo) cameraInfoCmd.value_ = info; ret = cameraInfoCmd.Marshal(cameraInfo); if (ret != DCAMERA_OK) { - DHLOGE("cameraInfoCmd marshal failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("cameraInfoCmd marshal failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); return ret; } - DHLOGI("GetCameraInfo %s success", GetAnonyString(dhId_).c_str()); + DHLOGI("GetCameraInfo %{public}s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSinkDev::OpenChannel(std::string& openInfo) { - DHLOGI("DCameraSinkDev OpenChannel Begin, dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSinkDev OpenChannel Begin, dhId: %{public}s", GetAnonyString(dhId_).c_str()); if (openInfo.empty()) { DHLOGE("openInfo is empty"); return DCAMERA_BAD_VALUE; @@ -144,7 +144,7 @@ int32_t DCameraSinkDev::OpenChannel(std::string& openInfo) DCameraOpenInfoCmd cmd; int32_t ret = cmd.Unmarshal(openInfo); if (ret != DCAMERA_OK) { - DHLOGE("openInfo unmarshal failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("openInfo unmarshal failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); return ret; } return controller_->OpenChannel(cmd.value_); @@ -152,7 +152,7 @@ int32_t DCameraSinkDev::OpenChannel(std::string& openInfo) int32_t DCameraSinkDev::CloseChannel() { - DHLOGI("CloseChannel dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("CloseChannel dhId: %{public}s", GetAnonyString(dhId_).c_str()); return controller_->CloseChannel(); } @@ -163,7 +163,7 @@ std::string DCameraSinkDev::GetDhid() int32_t DCameraSinkDev::PauseDistributedHardware(const std::string &networkId) { - DHLOGI("Pause distributed hardware dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("Pause distributed hardware dhId: %{public}s", GetAnonyString(dhId_).c_str()); if (networkId.empty()) { DHLOGE("networkId is empty"); return DCAMERA_BAD_VALUE; @@ -178,7 +178,7 @@ int32_t DCameraSinkDev::PauseDistributedHardware(const std::string &networkId) int32_t DCameraSinkDev::ResumeDistributedHardware(const std::string &networkId) { - DHLOGI("Resume distributed hardware dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("Resume distributed hardware dhId: %{public}s", GetAnonyString(dhId_).c_str()); if (networkId.empty()) { DHLOGE("networkId is empty"); return DCAMERA_BAD_VALUE; @@ -193,7 +193,7 @@ int32_t DCameraSinkDev::ResumeDistributedHardware(const std::string &networkId) int32_t DCameraSinkDev::StopDistributedHardware(const std::string &networkId) { - DHLOGI("Stop distributed hardware dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("Stop distributed hardware dhId: %{public}s", GetAnonyString(dhId_).c_str()); if (networkId.empty()) { DHLOGE("networkId is empty"); return DCAMERA_BAD_VALUE; diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_output.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_output.cpp index 28a368b2a7e88e1e120c2581db8c8da174997ca0..e3efaca10f821f4c031e8265b1424aa6e4ad973c 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_output.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_output.cpp @@ -30,7 +30,7 @@ namespace DistributedHardware { DCameraSinkOutput::DCameraSinkOutput(const std::string& dhId, std::shared_ptr& cameraOperator) : dhId_(dhId), operator_(cameraOperator) { - DHLOGI("DCameraSinkOutput Constructor dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSinkOutput Constructor dhId: %{public}s", GetAnonyString(dhId_).c_str()); isInit_ = false; } @@ -43,7 +43,7 @@ DCameraSinkOutput::~DCameraSinkOutput() int32_t DCameraSinkOutput::Init() { - DHLOGI("Init dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("Init dhId: %{public}s", GetAnonyString(dhId_).c_str()); auto output = std::shared_ptr(shared_from_this()); std::shared_ptr resultCallback = std::make_shared(output); operator_->SetResultCallback(resultCallback); @@ -51,7 +51,7 @@ int32_t DCameraSinkOutput::Init() InitInner(CONTINUOUS_FRAME); InitInner(SNAPSHOT_FRAME); isInit_ = true; - DHLOGI("Init %s success", GetAnonyString(dhId_).c_str()); + DHLOGI("Init %{public}s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } @@ -67,18 +67,18 @@ void DCameraSinkOutput::InitInner(DCStreamType type) int32_t DCameraSinkOutput::UnInit() { - DHLOGI("UnInit dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("UnInit dhId: %{public}s", GetAnonyString(dhId_).c_str()); channels_.clear(); dataProcesses_.clear(); sessionState_.clear(); isInit_ = false; - DHLOGI("UnInit %s success", GetAnonyString(dhId_).c_str()); + DHLOGI("UnInit %{public}s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSinkOutput::OpenChannel(std::shared_ptr& info) { - DHLOGI("OpenChannel dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("OpenChannel dhId: %{public}s", GetAnonyString(dhId_).c_str()); std::map modeMaps; modeMaps.emplace(CONTINUOUS_FRAME, DCAMERA_SESSION_MODE_VIDEO); modeMaps.emplace(SNAPSHOT_FRAME, DCAMERA_SESSION_MODE_JPEG); @@ -86,7 +86,7 @@ int32_t DCameraSinkOutput::OpenChannel(std::shared_ptr& info indexs.push_back(DCameraIndex(info->sourceDevId_, dhId_)); for (auto iter = info->detail_.begin(); iter != info->detail_.end(); iter++) { if (sessionState_[iter->streamType_] != DCAMERA_CHANNEL_STATE_DISCONNECTED) { - DHLOGE("wrong state, sessionState: %d", sessionState_[iter->streamType_]); + DHLOGE("wrong state, sessionState: %{public}d", sessionState_[iter->streamType_]); return DCAMERA_OK; } auto iterCh = channels_.find(iter->streamType_); @@ -99,7 +99,7 @@ int32_t DCameraSinkOutput::OpenChannel(std::shared_ptr& info int32_t ret = iterCh->second->CreateSession(indexs, iter->dataSessionFlag_, modeMaps[iter->streamType_], channelListener); if (ret != DCAMERA_OK) { - DHLOGE("channel create session failed, dhId: %s, ret: %d", + DHLOGE("channel create session failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); return ret; } @@ -109,13 +109,13 @@ int32_t DCameraSinkOutput::OpenChannel(std::shared_ptr& info int32_t DCameraSinkOutput::CloseChannel() { - DHLOGI("CloseChannel dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("CloseChannel dhId: %{public}s", GetAnonyString(dhId_).c_str()); auto iterCon = channels_.find(CONTINUOUS_FRAME); if (iterCon != channels_.end()) { int32_t ret = DCAMERA_OK; ret = iterCon->second->ReleaseSession(); if (ret != DCAMERA_OK) { - DHLOGI("DCameraSinkOutput UnInit release continue session failed, dhId: %s, ret: %d", + DHLOGI("DCameraSinkOutput UnInit release continue session failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); } sessionState_[CONTINUOUS_FRAME] = DCAMERA_CHANNEL_STATE_DISCONNECTED; @@ -126,7 +126,7 @@ int32_t DCameraSinkOutput::CloseChannel() int32_t ret = DCAMERA_OK; ret = iterSnap->second->ReleaseSession(); if (ret != DCAMERA_OK) { - DHLOGI("DCameraSinkOutput UnInit release snapshot session failed, dhId: %s, ret: %d", + DHLOGI("DCameraSinkOutput UnInit release snapshot session failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); } sessionState_[SNAPSHOT_FRAME] = DCAMERA_CHANNEL_STATE_DISCONNECTED; @@ -136,15 +136,15 @@ int32_t DCameraSinkOutput::CloseChannel() int32_t DCameraSinkOutput::StartCapture(std::vector>& captureInfos) { - DHLOGI("StartCapture dhId: %s", GetAnonyString(dhId_).c_str()); + DHLOGI("StartCapture dhId: %{public}s", GetAnonyString(dhId_).c_str()); for (auto& info : captureInfos) { if (dataProcesses_.find(info->streamType_) == dataProcesses_.end()) { - DHLOGE("has no data process, streamType: %d", info->streamType_); + DHLOGE("has no data process, streamType: %{public}d", info->streamType_); break; } int32_t ret = dataProcesses_[info->streamType_]->StartCapture(info); if (ret != DCAMERA_OK) { - DHLOGE("StartCapture failed, dhId: %s, ret: %d", GetAnonyString(dhId_).c_str(), ret); + DHLOGE("StartCapture failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); return ret; } } @@ -153,39 +153,39 @@ int32_t DCameraSinkOutput::StartCapture(std::vectorsecond->StopCapture(); if (ret != DCAMERA_OK) { - DHLOGE("continuous data process stop capture failed, dhId: %s, ret: %d", + DHLOGE("continuous data process stop capture failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); } } auto iterSnap = dataProcesses_.find(SNAPSHOT_FRAME); if (iterSnap != dataProcesses_.end()) { - DHLOGI("StopCapture %s snapshot frame stop capture", GetAnonyString(dhId_).c_str()); + DHLOGI("StopCapture %{public}s snapshot frame stop capture", GetAnonyString(dhId_).c_str()); int32_t ret = iterSnap->second->StopCapture(); if (ret != DCAMERA_OK) { - DHLOGE("snapshot data process stop capture failed, dhId: %s, ret: %d", + DHLOGE("snapshot data process stop capture failed, dhId: %{public}s, ret: %{public}d", GetAnonyString(dhId_).c_str(), ret); } } - DHLOGI("StopCapture %s success", GetAnonyString(dhId_).c_str()); + DHLOGI("StopCapture %{public}s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } void DCameraSinkOutput::OnVideoResult(std::shared_ptr& buffer) { if (sessionState_[CONTINUOUS_FRAME] != DCAMERA_CHANNEL_STATE_CONNECTED) { - DHLOGE("OnVideoResult dhId: %s, channel state: %d", + DHLOGE("OnVideoResult dhId: %{public}s, channel state: %{public}d", GetAnonyString(dhId_).c_str(), sessionState_[CONTINUOUS_FRAME]); return; } if (dataProcesses_.find(CONTINUOUS_FRAME) == dataProcesses_.end()) { - DHLOGE("OnVideoResult %s has no continuous data process", GetAnonyString(dhId_).c_str()); + DHLOGE("OnVideoResult %{public}s has no continuous data process", GetAnonyString(dhId_).c_str()); return; } dataProcesses_[CONTINUOUS_FRAME]->FeedStream(buffer); @@ -194,7 +194,7 @@ void DCameraSinkOutput::OnVideoResult(std::shared_ptr& buffer) void DCameraSinkOutput::OnPhotoResult(std::shared_ptr& buffer) { if (dataProcesses_.find(SNAPSHOT_FRAME) == dataProcesses_.end()) { - DHLOGE("OnPhotoResult %s has no snapshot data process", GetAnonyString(dhId_).c_str()); + DHLOGE("OnPhotoResult %{public}s has no snapshot data process", GetAnonyString(dhId_).c_str()); return; } dataProcesses_[SNAPSHOT_FRAME]->FeedStream(buffer); @@ -202,27 +202,27 @@ void DCameraSinkOutput::OnPhotoResult(std::shared_ptr& buffer) void DCameraSinkOutput::OnSessionState(DCStreamType type, int32_t state) { - DHLOGI("OnSessionState dhId: %s, stream type: %d, state: %d", + DHLOGI("OnSessionState dhId: %{public}s, stream type: %{public}d, state: %{public}d", GetAnonyString(dhId_).c_str(), type, state); sessionState_[type] = state; switch (state) { case DCAMERA_CHANNEL_STATE_CONNECTING: { - DHLOGI("channel is connecting, dhId: %s, stream type: %d", + DHLOGI("channel is connecting, dhId: %{public}s, stream type: %{public}d", GetAnonyString(dhId_).c_str(), type); break; } case DCAMERA_CHANNEL_STATE_CONNECTED: { - DHLOGI("channel is connected, dhId: %s, stream type: %d", + DHLOGI("channel is connected, dhId: %{public}s, stream type: %{public}d", GetAnonyString(dhId_).c_str(), type); break; } case DCAMERA_CHANNEL_STATE_DISCONNECTED: { - DHLOGI("channel is disconnected, dhId: %s, stream type: %d", + DHLOGI("channel is disconnected, dhId: %{public}s, stream type: %{public}d", GetAnonyString(dhId_).c_str(), type); break; } default: { - DHLOGE("OnSessionState %s unknown session state", GetAnonyString(dhId_).c_str()); + DHLOGE("OnSessionState %{public}s unknown session state", GetAnonyString(dhId_).c_str()); break; } } @@ -230,8 +230,8 @@ void DCameraSinkOutput::OnSessionState(DCStreamType type, int32_t state) void DCameraSinkOutput::OnSessionError(DCStreamType type, int32_t eventType, int32_t eventReason, std::string detail) { - DHLOGI("OnSessionError dhId: %s, stream type: %d, eventType: %d, eventReason: %d, detail: %s", - GetAnonyString(dhId_).c_str(), type, eventType, eventReason, detail.c_str()); + DHLOGI("OnSessionError dhId: %{public}s, stream type: %{public}d, eventType: %{public}d, eventReason: " + "%{public}d, detail: %{public}s", GetAnonyString(dhId_).c_str(), type, eventType, eventReason, detail.c_str()); } void DCameraSinkOutput::OnDataReceived(DCStreamType type, std::vector>& dataBuffers) diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_service_ipc.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_service_ipc.cpp index e6ee40713dd7d41a35be3fc9c37fd8c752a69e6a..7ad8a4de572f2b35692744a5a76d45fed417a033 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_service_ipc.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_service_ipc.cpp @@ -78,13 +78,13 @@ sptr DCameraSinkServiceIpc::GetSourceRemoteCamSrv(cons if (iter != remoteSources_.end()) { auto object = iter->second; if (object != nullptr) { - DHLOGI("DCameraSinkServiceIpc GetSourceRemoteCamSrv from cache devId: %s", + DHLOGI("DCameraSinkServiceIpc GetSourceRemoteCamSrv from cache devId: %{public}s", GetAnonyString(deviceId).c_str()); return object; } } } - DHLOGI("GetSourceRemoteCamSrv remote deviceid is %s", GetAnonyString(deviceId).c_str()); + DHLOGI("GetSourceRemoteCamSrv remote deviceid is %{public}s", GetAnonyString(deviceId).c_str()); auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (samgr == nullptr) { DHLOGE("GetSourceRemoteCamSrv failed to connect to systemAbilityMgr!"); @@ -93,13 +93,13 @@ sptr DCameraSinkServiceIpc::GetSourceRemoteCamSrv(cons auto object = samgr->CheckSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, deviceId); if (object == nullptr) { - DHLOGE("GetSourceRemoteCamSrv failed get remote CamSrv %s", GetAnonyString(deviceId).c_str()); + DHLOGE("GetSourceRemoteCamSrv failed get remote CamSrv %{public}s", GetAnonyString(deviceId).c_str()); return nullptr; } int32_t ret = object->AddDeathRecipient(sourceRemoteRecipient_); sptr remoteCamSrvObj = iface_cast(object); if (remoteCamSrvObj == nullptr) { - DHLOGI("GetSourceRemoteCamSrv failed, remoteCamSrvObj is null ret: %d", ret); + DHLOGI("GetSourceRemoteCamSrv failed, remoteCamSrvObj is null ret: %{public}d", ret); return nullptr; } { @@ -110,17 +110,17 @@ sptr DCameraSinkServiceIpc::GetSourceRemoteCamSrv(cons } remoteSources_[deviceId] = remoteCamSrvObj; } - DHLOGI("GetSourceRemoteCamSrv success, AddDeathRecipient ret: %d", ret); + DHLOGI("GetSourceRemoteCamSrv success, AddDeathRecipient ret: %{public}d", ret); return remoteCamSrvObj; } void DCameraSinkServiceIpc::DeleteSourceRemoteCamSrv(const std::string& deviceId) { - DHLOGI("DeleteSourceRemoteCamSrv devId: %s", GetAnonyString(deviceId).c_str()); + DHLOGI("DeleteSourceRemoteCamSrv devId: %{public}s", GetAnonyString(deviceId).c_str()); std::lock_guard autoLock(sourceRemoteCamSrvLock_); auto item = remoteSources_.find(deviceId); if (item == remoteSources_.end()) { - DHLOGI("DeleteSourceRemoteCamSrv not found device: %s", GetAnonyString(deviceId).c_str()); + DHLOGI("DeleteSourceRemoteCamSrv not found device: %{public}s", GetAnonyString(deviceId).c_str()); return; } @@ -166,7 +166,7 @@ void DCameraSinkServiceIpc::OnSourceRemoteCamSrvDied(const wptr& DHLOGI("OnSourceRemoteCamSrvDied not found remote object"); return; } - DHLOGI("OnSourceRemoteCamSrvDied remote.devId: %s", GetAnonyString(iter->first).c_str()); + DHLOGI("OnSourceRemoteCamSrvDied remote.devId: %{public}s", GetAnonyString(iter->first).c_str()); if (iter->second != nullptr) { iter->second->AsObject()->RemoveDeathRecipient(sourceRemoteRecipient_); } diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_dev_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_dev_test.cpp index 2572af580e09be5e274729476340ef2bcda8ccc8..a71adb2002c5c9c99c8598f95e3a94a1334fb7fc 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_dev_test.cpp +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_dev_test.cpp @@ -144,7 +144,7 @@ HWTEST_F(DCameraSinkDevTest, dcamera_sink_dev_test_004, TestSize.Level1) { int32_t ret = dev_->GetCameraInfo(g_testCameraInfo); EXPECT_EQ(DCAMERA_OK, ret); - DHLOGI("DCameraSinkDevTest::GetCameraInfo cameraInfo is %s", GetAnonyString(g_testCameraInfo).c_str()); + DHLOGI("DCameraSinkDevTest::GetCameraInfo cameraInfo is %{public}s", GetAnonyString(g_testCameraInfo).c_str()); } /** diff --git a/services/cameraservice/sourceservice/BUILD.gn b/services/cameraservice/sourceservice/BUILD.gn index 409b07a229c5cfbeb9e11c7b0eba257fcc58f234..d7183aa3d621d558a15ad39e9b54119e3eb0f8a1 100644 --- a/services/cameraservice/sourceservice/BUILD.gn +++ b/services/cameraservice/sourceservice/BUILD.gn @@ -126,6 +126,7 @@ ohos_shared_library("distributed_camera_source") { "hdf_core:libhdi", "hdf_core:libpub_utils", "hicollie:libhicollie", + "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/cameraservice/sourceservice/src/distributedcamera/dcamera_service_state_listener.cpp b/services/cameraservice/sourceservice/src/distributedcamera/dcamera_service_state_listener.cpp index 58898249253932c5e83a48054de811d95329bfb5..770b38eb2292fb055488ce44d91399e031aa099a 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/dcamera_service_state_listener.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/dcamera_service_state_listener.cpp @@ -47,13 +47,14 @@ void DCameraServiceStateListener::SetCallback(sptr callb int32_t DCameraServiceStateListener::OnRegisterNotify(const std::string& devId, const std::string& dhId, const std::string& reqId, int32_t status, std::string& data) { - DHLOGI("OnRegisterNotify devId: %s, dhId: %s, status: %d", + DHLOGI("OnRegisterNotify devId: %{public}s, dhId: %{public}s, status: %{public}d", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), status); std::lock_guard autoLock(proxyMutex_); if (status != DCAMERA_OK) { std::thread([=]() mutable { - DHLOGI("thread delete devId: %s dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); + DHLOGI("thread delete devId: %{public}s dhId: %{public}s", GetAnonyString(devId).c_str(), + GetAnonyString(dhId).c_str()); prctl(PR_SET_NAME, REGISTER_SERVICE_NOTIFY.c_str()); DCameraIndex camIndex(devId, dhId); DistributedCameraSourceService::CamDevErase(camIndex); @@ -63,7 +64,7 @@ int32_t DCameraServiceStateListener::OnRegisterNotify(const std::string& devId, } int32_t ret = callbackProxy_->OnNotifyRegResult(devId, dhId, reqId, status, data); if (ret != DCAMERA_OK) { - DHLOGE("OnNotifyRegResult failed: %d", ret); + DHLOGE("OnNotifyRegResult failed: %{public}d", ret); } }).detach(); } else { @@ -73,7 +74,7 @@ int32_t DCameraServiceStateListener::OnRegisterNotify(const std::string& devId, } int32_t ret = callbackProxy_->OnNotifyRegResult(devId, dhId, reqId, status, data); if (ret != DCAMERA_OK) { - DHLOGE("OnNotifyRegResult failed: %d", ret); + DHLOGE("OnNotifyRegResult failed: %{public}d", ret); } } return DCAMERA_OK; @@ -82,7 +83,7 @@ int32_t DCameraServiceStateListener::OnRegisterNotify(const std::string& devId, int32_t DCameraServiceStateListener::OnUnregisterNotify(const std::string& devId, const std::string& dhId, const std::string& reqId, int32_t status, std::string& data) { - DHLOGI("OnUnregisterNotify devId: %s, dhId: %s, status: %d", + DHLOGI("OnUnregisterNotify devId: %{public}s, dhId: %{public}s, status: %{public}d", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), status); std::lock_guard autoLock(proxyMutex_); if (callbackProxy_ == nullptr) { @@ -92,20 +93,21 @@ int32_t DCameraServiceStateListener::OnUnregisterNotify(const std::string& devId if (status == DCAMERA_OK) { std::thread([=]() mutable { - DHLOGI("thread delete devId: %s dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); + DHLOGI("thread delete devId: %{public}s dhId: %{public}s", GetAnonyString(devId).c_str(), + GetAnonyString(dhId).c_str()); prctl(PR_SET_NAME, UNREGISTER_SERVICE_NOTIFY.c_str()); DCameraIndex camIndex(devId, dhId); DistributedCameraSourceService::CamDevErase(camIndex); int32_t ret = callbackProxy_->OnNotifyUnregResult(devId, dhId, reqId, status, data); if (ret != DCAMERA_OK) { - DHLOGE("OnNotifyUnregResult failed, ret: %d", ret); + DHLOGE("OnNotifyUnregResult failed, ret: %{public}d", ret); } }).detach(); } else { int32_t ret = callbackProxy_->OnNotifyUnregResult(devId, dhId, reqId, status, data); if (ret != DCAMERA_OK) { - DHLOGE("OnNotifyUnregResult failed, ret: %d", ret); + DHLOGE("OnNotifyUnregResult failed, ret: %{public}d", ret); } } diff --git a/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp b/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp index e5878a86919e29943fe10c4aa767b0141acef47a..92788bed833ff1cfe5250c0e1e8032816edd411b 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp @@ -62,10 +62,9 @@ void DcameraSourceHidumper::SetSourceDumpInfo(CameraDumpInfo& camDumpInfo_) bool DcameraSourceHidumper::Dump(const std::vector& args, std::string& result) { - DHLOGI("DcameraSourceHidumper Dump args.size():%d.", args.size()); result.clear(); int32_t argsSize = static_cast(args.size()); - + DHLOGI("DcameraSourceHidumper Dump args.size():%{public}d.", argsSize); if (args.empty()) { ShowHelp(result); return true; @@ -75,7 +74,7 @@ bool DcameraSourceHidumper::Dump(const std::vector& args, std::stri } for (int32_t i = 0; i < argsSize; i++) { - DHLOGI("DcameraSourceHidumper Dump args[%d]: %s.", i, args.at(i).c_str()); + DHLOGI("DcameraSourceHidumper Dump args[%{public}d]: %{public}s.", i, args.at(i).c_str()); } if (ProcessDump(args[0], result) != DCAMERA_OK) { @@ -150,7 +149,7 @@ int32_t DcameraSourceHidumper::GetCurrentStateInfo(std::string& result) int32_t camState = 0; deviceId = it->first; camState = it->second; - DHLOGI("GetCurrentStateInfo camState is %d.", camState); + DHLOGI("GetCurrentStateInfo camState is %{public}d.", camState); auto state = STATE_MAP.find(camState); std::string curState(""); if (state != STATE_MAP.end()) { diff --git a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp index 0539b8246cb9c114fc62438c05049c3bfca12c3e..facae28d17f54da2b76453cf18b1ae3510711a93 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp @@ -97,10 +97,10 @@ void DistributedCameraSourceService::OnStop() int32_t DistributedCameraSourceService::InitSource(const std::string& params, const sptr& callback) { - DHLOGI("DistributedCameraSourceService InitSource param: %s", params.c_str()); + DHLOGI("DistributedCameraSourceService InitSource param: %{public}s", params.c_str()); int32_t ret = LoadDCameraHDF(); if (ret != DCAMERA_OK) { - DHLOGE("DistributedCameraSourceService InitSource LoadHDF failed, ret: %d", ret); + DHLOGE("DistributedCameraSourceService InitSource LoadHDF failed, ret: %{public}d", ret); return ret; } sourceVer_ = params; @@ -115,7 +115,7 @@ int32_t DistributedCameraSourceService::ReleaseSource() DHLOGI("enter"); int32_t ret = UnLoadCameraHDF(); if (ret != DCAMERA_OK) { - DHLOGE("DistributedCameraSourceService ReleaseSource UnLoadHDF failed, ret: %d", ret); + DHLOGE("DistributedCameraSourceService ReleaseSource UnLoadHDF failed, ret: %{public}d", ret); return ret; } @@ -126,7 +126,7 @@ int32_t DistributedCameraSourceService::ReleaseSource() } ret = systemAbilityMgr->UnloadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID); if (ret != DCAMERA_OK) { - DHLOGE("source systemAbilityMgr UnLoadSystemAbility failed, ret: %d", ret); + DHLOGE("source systemAbilityMgr UnLoadSystemAbility failed, ret: %{public}d", ret); return DCAMERA_BAD_VALUE; } DHLOGI("source systemAbilityMgr UnLoadSystemAbility success"); @@ -136,7 +136,7 @@ int32_t DistributedCameraSourceService::ReleaseSource() int32_t DistributedCameraSourceService::RegisterDistributedHardware(const std::string& devId, const std::string& dhId, const std::string& reqId, const EnableParam& param) { - DHLOGI("RegisterDistributedHardware devId: %s, dhId: %s, sinkVersion: %s", + DHLOGI("RegisterDistributedHardware devId: %{public}s, dhId: %{public}s, sinkVersion: %{public}s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.sinkVersion.c_str()); if (GetCamDevNum() > MAX_CAMERAS_NUMBER) { DHLOGE("cameras exceed the upper limit"); @@ -146,30 +146,30 @@ int32_t DistributedCameraSourceService::RegisterDistributedHardware(const std::s int32_t ret = DCAMERA_OK; std::shared_ptr camDev = GetCamDevByIndex(camIndex); if (camDev == nullptr) { - DHLOGI("new dev devId: %s, dhId: %s, sinkVersion: %s", + DHLOGI("new dev devId: %{public}s, dhId: %{public}s, sinkVersion: %{public}s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.sinkVersion.c_str()); camDev = std::make_shared(devId, dhId, listener_); ret = camDev->InitDCameraSourceDev(); if (ret != DCAMERA_OK) { - DHLOGE("RegisterDistributedHardware failed %d InitDev devId: %s, dhId: %s", + DHLOGE("RegisterDistributedHardware failed %{public}d InitDev devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return ret; } CamDevInsert(camIndex, camDev); } else { - DHLOGE("RegisterDistributedHardware exist devId: %s, dhId: %s, sinkVersion: %s", + DHLOGE("RegisterDistributedHardware exist devId: %{public}s, dhId: %{public}s, sinkVersion: %{public}s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.sinkVersion.c_str()); return DCAMERA_ALREADY_EXISTS; } ret = camDev->RegisterDistributedHardware(devId, dhId, reqId, param); if (ret != DCAMERA_OK) { - DHLOGE("RegisterDistributedHardware failed, ret: %d", ret); + DHLOGE("RegisterDistributedHardware failed, ret: %{public}d", ret); ReportRegisterCameraFail(DCAMERA_REGISTER_FAIL, GetAnonyString(devId), dhId, param.sinkVersion, "dcamera source RegisterDistributedHardware fail."); CamDevErase(camIndex); } - DHLOGI("RegisterDistributedHardware end devId: %s, dhId: %s, sinkVersion: %s", + DHLOGI("RegisterDistributedHardware end devId: %{public}s, dhId: %{public}s, sinkVersion: %{public}s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), param.sinkVersion.c_str()); return ret; } @@ -177,7 +177,7 @@ int32_t DistributedCameraSourceService::RegisterDistributedHardware(const std::s int32_t DistributedCameraSourceService::UnregisterDistributedHardware(const std::string& devId, const std::string& dhId, const std::string& reqId) { - DHLOGI("UnregisterDistributedHardware devId: %s, dhId: %s", + DHLOGI("UnregisterDistributedHardware devId: %{public}s, dhId: %{public}s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); DCameraIndex camIndex(devId, dhId); std::shared_ptr camDev = GetCamDevByIndex(camIndex); @@ -188,7 +188,7 @@ int32_t DistributedCameraSourceService::UnregisterDistributedHardware(const std: int32_t ret = camDev->UnRegisterDistributedHardware(devId, dhId, reqId); if (ret != DCAMERA_OK) { - DHLOGE("UnregisterDistributedHardware failed, ret: %d", ret); + DHLOGE("UnregisterDistributedHardware failed, ret: %{public}d", ret); } return ret; } @@ -196,7 +196,7 @@ int32_t DistributedCameraSourceService::UnregisterDistributedHardware(const std: int32_t DistributedCameraSourceService::DCameraNotify(const std::string& devId, const std::string& dhId, std::string& events) { - DHLOGI("DCameraNotify devId: %s, dhId: %s", GetAnonyString(devId).c_str(), + DHLOGI("DCameraNotify devId: %{public}s, dhId: %{public}s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); DCameraIndex camIndex(devId, dhId); std::shared_ptr camDev = GetCamDevByIndex(camIndex); @@ -207,7 +207,7 @@ int32_t DistributedCameraSourceService::DCameraNotify(const std::string& devId, int32_t ret = camDev->DCameraNotify(events); if (ret != DCAMERA_OK) { - DHLOGE("DCameraNotify failed, ret: %d", ret); + DHLOGE("DCameraNotify failed, ret: %{public}d", ret); } return ret; } @@ -218,7 +218,7 @@ int32_t DistributedCameraSourceService::LoadDCameraHDF() DHLOGI("load hdf driver start"); int32_t ret = DCameraHdfOperate::GetInstance().LoadDcameraHDFImpl(); if (ret != DCAMERA_OK) { - DHLOGE("load hdf driver failed, ret %d", ret); + DHLOGE("load hdf driver failed, ret %{public}d", ret); ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_HDF_ERROR, CreateMsg("dcamera load hdf driver fail.")); return ret; } @@ -231,7 +231,7 @@ int32_t DistributedCameraSourceService::UnLoadCameraHDF() DHLOGI("unload hdf driver start"); int32_t ret = DCameraHdfOperate::GetInstance().UnLoadDcameraHDFImpl(); if (ret != DCAMERA_OK) { - DHLOGE("unload hdf driver failed, ret %d", ret); + DHLOGE("unload hdf driver failed, ret %{public}d", ret); return ret; } DHLOGI("unload hdf driver end"); diff --git a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_stub.cpp b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_stub.cpp index 6319cf39ef6cd3efff7425f381ce4428a6e92fde..b8d991557b3b1a8fb201ed25a9c54770a386ab62 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_stub.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_stub.cpp @@ -53,7 +53,7 @@ bool DistributedCameraSourceStub::HasEnableDHPermission() int32_t DistributedCameraSourceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - DHLOGD("OnRemoteRequest code: %u", code); + DHLOGD("OnRemoteRequest code: %{public}u", code); std::u16string desc = DistributedCameraSourceStub::GetDescriptor(); std::u16string remoteDesc = data.ReadInterfaceToken(); if (desc != remoteDesc) { @@ -146,7 +146,7 @@ int32_t DistributedCameraSourceStub::RegisterDistributedHardwareInner(MessagePar break; } ret = RegisterDistributedHardware(devId, dhId, reqId, params); - DHLOGI("DistributedCameraSourceStub RegisterDistributedHardware %d", ret); + DHLOGI("DistributedCameraSourceStub RegisterDistributedHardware %{public}d", ret); } while (0); reply.WriteInt32(ret); return DCAMERA_OK; diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp index 56ae8fe02dceec71f888b1f6a6792d086132ec6f..812d258ef7a5b9c58b0bb6410696e9a31558e4cc 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp @@ -34,7 +34,7 @@ namespace DistributedHardware { DCameraSourceDev::DCameraSourceDev(std::string devId, std::string dhId, std::shared_ptr& stateLisener) : devId_(devId), dhId_(dhId), stateListener_(stateLisener) { - DHLOGI("DCameraSourceDev Construct devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDev Construct devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); memberFuncMap_[DCAMERA_EVENT_REGIST] = &DCameraSourceDev::NotifyRegisterResult; memberFuncMap_[DCAMERA_EVENT_UNREGIST] = &DCameraSourceDev::NotifyRegisterResult; @@ -57,7 +57,7 @@ DCameraSourceDev::DCameraSourceDev(std::string devId, std::string dhId, DCameraSourceDev::~DCameraSourceDev() { - DHLOGI("DCameraSourceDev Delete devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDev Delete devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); eventBus_ = nullptr; hdiCallback_ = nullptr; @@ -68,13 +68,13 @@ DCameraSourceDev::~DCameraSourceDev() eventResultMap_.clear(); memberFuncMap_.clear(); - DHLOGI("DCameraSourceDev Delete devId %s dhId %s end", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDev Delete devId %{public}s dhId %{public}s end", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } int32_t DCameraSourceDev::InitDCameraSourceDev() { - DHLOGI("DCameraSourceDev InitDCameraSourceDev devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDev InitDCameraSourceDev devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); eventBus_ = std::make_shared("SrcDevHandler"); DCameraSourceEvent event(*this); @@ -89,16 +89,16 @@ int32_t DCameraSourceDev::InitDCameraSourceDev() DHLOGE("DCameraSourceDev InitDCameraSourceDev failed, hdiCallback is null."); return DCAMERA_BAD_VALUE; } - DHLOGI("DCameraSourceDev InitDCameraSourceDev end devId %s dhId %s", GetAnonyString(devId_).c_str(), - GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSourceDev InitDCameraSourceDev end devId %{public}s dhId %{public}s", + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSourceDev::RegisterDistributedHardware(const std::string& devId, const std::string& dhId, const std::string& reqId, const EnableParam& param) { - DHLOGI("DCameraSourceDev PostTask RegisterDistributedHardware devId %s dhId %s", GetAnonyString(devId).c_str(), - GetAnonyString(dhId).c_str()); + DHLOGI("DCameraSourceDev PostTask RegisterDistributedHardware devId %{public}s dhId %{public}s", + GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); version_ = param.sinkVersion; DCameraIndex index(devId, dhId); actualDevInfo_.insert(index); @@ -113,8 +113,8 @@ int32_t DCameraSourceDev::RegisterDistributedHardware(const std::string& devId, int32_t DCameraSourceDev::UnRegisterDistributedHardware(const std::string devId, const std::string dhId, const std::string reqId) { - DHLOGI("DCameraSourceDev PostTask UnRegisterDistributedHardware devId %s dhId %s", GetAnonyString(devId).c_str(), - GetAnonyString(dhId).c_str()); + DHLOGI("DCameraSourceDev PostTask UnRegisterDistributedHardware devId %{public}s dhId %{public}s", + GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); std::string sinkAttrs; std::string sourceAttrs; std::shared_ptr regParam = std::make_shared(devId, dhId, reqId, sinkAttrs, @@ -126,12 +126,12 @@ int32_t DCameraSourceDev::UnRegisterDistributedHardware(const std::string devId, int32_t DCameraSourceDev::DCameraNotify(std::string& eventStr) { - DHLOGI("DCameraSourceDev PostTask DCameraNotify devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDev PostTask DCameraNotify devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DCameraEventCmd cmd; int32_t ret = cmd.Unmarshal(eventStr); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev DCameraNotify devId %s dhId %s marshal failed, ret: %d", + DHLOGE("DCameraSourceDev DCameraNotify devId %{public}s dhId %{public}s marshal failed, ret: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), ret); return ret; } @@ -143,7 +143,7 @@ int32_t DCameraSourceDev::DCameraNotify(std::string& eventStr) int32_t DCameraSourceDev::OpenSession(DCameraIndex& camIndex) { - DHLOGI("DCameraSourceDev PostTask OpenSession devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDev PostTask OpenSession devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DCameraSourceEvent event(*this, DCAMERA_EVENT_OPEN, camIndex); eventBus_->PostEvent(event); @@ -152,7 +152,7 @@ int32_t DCameraSourceDev::OpenSession(DCameraIndex& camIndex) int32_t DCameraSourceDev::CloseSession(DCameraIndex& camIndex) { - DHLOGI("DCameraSourceDev PostTask CloseSession devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDev PostTask CloseSession devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DCameraSourceEvent event(*this, DCAMERA_EVENT_CLOSE, camIndex); eventBus_->PostEvent(event); @@ -161,7 +161,7 @@ int32_t DCameraSourceDev::CloseSession(DCameraIndex& camIndex) int32_t DCameraSourceDev::ConfigCameraStreams(const std::vector>& streamInfos) { - DHLOGI("DCameraSourceDev PostTask ConfigStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDev PostTask ConfigStreams devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DCameraSourceEvent event(*this, DCAMERA_EVENT_CONFIG_STREAMS, streamInfos); eventBus_->PostEvent(event); @@ -170,7 +170,7 @@ int32_t DCameraSourceDev::ConfigCameraStreams(const std::vector& streamIds) { - DHLOGI("DCameraSourceDev PostTask ReleaseStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDev PostTask ReleaseStreams devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DCameraSourceEvent event(*this, DCAMERA_EVENT_RELEASE_STREAMS, streamIds); eventBus_->PostEvent(event); @@ -179,7 +179,7 @@ int32_t DCameraSourceDev::ReleaseCameraStreams(const std::vector& streamIds int32_t DCameraSourceDev::StartCameraCapture(const std::vector>& captureInfos) { - DHLOGI("DCameraSourceDev PostTask StartCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDev PostTask StartCapture devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DCameraSourceEvent event(*this, DCAMERA_EVENT_START_CAPTURE, captureInfos); eventBus_->PostEvent(event); @@ -188,7 +188,7 @@ int32_t DCameraSourceDev::StartCameraCapture(const std::vector& streamIds) { - DHLOGI("DCameraSourceDev PostTask StopCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDev PostTask StopCapture devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DCameraSourceEvent event(*this, DCAMERA_EVENT_STOP_CAPTURE, streamIds); eventBus_->PostEvent(event); @@ -197,8 +197,8 @@ int32_t DCameraSourceDev::StopCameraCapture(const std::vector& streamIds) int32_t DCameraSourceDev::UpdateCameraSettings(const std::vector>& settings) { - DHLOGI("DCameraSourceDev PostTask UpdateCameraSettings devId %s dhId %s", GetAnonyString(devId_).c_str(), - GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSourceDev PostTask UpdateCameraSettings devId %{public}s dhId %{public}s", + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DCameraSourceEvent event(*this, DCAMERA_EVENT_UPDATE_SETTINGS, settings); eventBus_->PostEvent(event); return DCAMERA_OK; @@ -206,15 +206,15 @@ int32_t DCameraSourceDev::UpdateCameraSettings(const std::vectorExecute(event.GetEventType(), event); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev OnEvent failed, ret: %d, devId: %s dhId: %s", ret, + DHLOGE("DCameraSourceDev OnEvent failed, ret: %{public}d, devId: %{public}s dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } NotifyResult(event.GetEventType(), event, ret); @@ -223,7 +223,7 @@ void DCameraSourceDev::OnEvent(DCameraSourceEvent& event) int32_t DCameraSourceDev::Register(std::shared_ptr& param) { DCAMERA_SYNC_TRACE(DCAMERA_REGISTER_CAMERA); - DHLOGI("DCameraSourceDev Execute Register devId: %s dhId: %s", + DHLOGI("DCameraSourceDev Execute Register devId: %{public}s dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); ReportRegisterCameraEvent(REGIST_CAMERA_EVENT, GetAnonyString(devId_), dhId_, version_, "execute register event."); @@ -231,22 +231,22 @@ int32_t DCameraSourceDev::Register(std::shared_ptr& param) actualDevInfo.assign(actualDevInfo_.begin(), actualDevInfo_.end()); int32_t ret = controller_->Init(actualDevInfo); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute Register controller init failed, ret: %d, devId: %s dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceDev Execute Register controller init failed, ret: %{public}d, devId: %{public}s dhId: " + "%{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } ret = input_->Init(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute Register input init failed, ret: %d, devId: %s dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceDev Execute Register input init failed, ret: %{public}d, devId: %{public}s dhId: " + "%{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); controller_->UnInit(); return ret; } sptr camHdiProvider = IDCameraProvider::Get(HDF_DCAMERA_EXT_SERVICE); if (camHdiProvider == nullptr) { - DHLOGI("Register camHdiProvider is nullptr devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DHLOGI("Register camHdiProvider is nullptr devId: %{public}s dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); controller_->UnInit(); input_->UnInit(); @@ -261,8 +261,8 @@ int32_t DCameraSourceDev::Register(std::shared_ptr& param) DHLOGE("Parsing param failed."); } int32_t retHdi = camHdiProvider->EnableDCameraDevice(dhBase, ability, hdiCallback_); - DHLOGI("DCameraSourceDev Execute Register register hal, ret: %d, devId: %s dhId: %s", retHdi, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSourceDev Execute Register register hal, ret: %{public}d, devId: %{public}s dhId: %{public}s", + retHdi, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (retHdi != SUCCESS) { controller_->UnInit(); input_->UnInit(); @@ -308,26 +308,26 @@ int32_t DCameraSourceDev::ParseEnableParam(std::shared_ptr& int32_t DCameraSourceDev::UnRegister(std::shared_ptr& param) { DCAMERA_SYNC_TRACE(DCAMERA_UNREGISTER_CAMERA); - DHLOGI("DCameraSourceDev Execute UnRegister devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDev Execute UnRegister devId: %{public}s dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); ReportRegisterCameraEvent(UNREGIST_CAMERA_EVENT, GetAnonyString(devId_), dhId_, version_, "execute unregister event."); int32_t ret = controller_->UnInit(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute UnRegister controller uninit failed, ret: %d, devId: %s dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceDev Execute UnRegister controller uninit failed, ret: %{public}d, devId: %{public}s " + "dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } ret = input_->UnInit(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute UnRegister input uninit failed, ret: %d, devId: %s dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceDev Execute UnRegister input uninit failed, ret: %{public}d, devId: %{public}s dhId: " + "%{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } sptr camHdiProvider = IDCameraProvider::Get(HDF_DCAMERA_EXT_SERVICE); if (camHdiProvider == nullptr) { - DHLOGI("UnRegister camHdiProvider is nullptr devId: %s dhId: %s", GetAnonyString(devId_).c_str(), - GetAnonyString(dhId_).c_str()); + DHLOGI("UnRegister camHdiProvider is nullptr devId: %{public}s dhId: %{public}s", + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return DCAMERA_BAD_OPERATE; } @@ -335,8 +335,8 @@ int32_t DCameraSourceDev::UnRegister(std::shared_ptr& param) dhBase.deviceId_ = param->devId_; dhBase.dhId_ = param->dhId_; int32_t retHdi = camHdiProvider->DisableDCameraDevice(dhBase); - DHLOGI("DCameraSourceDev Execute UnRegister unregister hal, ret: %d, devId: %s dhId: %s", retHdi, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSourceDev Execute UnRegister unregister hal, ret: %{public}d, devId: %{public}s dhId: %{public}s", + retHdi, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (retHdi != SUCCESS) { return DCAMERA_UNREGIST_HAL_FAILED; } @@ -345,13 +345,13 @@ int32_t DCameraSourceDev::UnRegister(std::shared_ptr& param) int32_t DCameraSourceDev::OpenCamera() { - DHLOGI("DCameraSourceDev Execute OpenCamera devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDev Execute OpenCamera devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); ReportCameraOperaterEvent(OPEN_CAMERA_EVENT, GetAnonyString(devId_), dhId_, "execute open camera event."); std::shared_ptr openInfo = std::make_shared(); int32_t ret = GetLocalDeviceNetworkId(openInfo->sourceDevId_); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev getMyId failed ret: %d, devId: %s, dhId: %s", ret, + DHLOGE("DCameraSourceDev getMyId failed ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -359,8 +359,8 @@ int32_t DCameraSourceDev::OpenCamera() DcameraStartAsyncTrace(DCAMERA_OPEN_CHANNEL_CONTROL, DCAMERA_OPEN_CHANNEL_TASKID); ret = controller_->OpenChannel(openInfo); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute OpenCamera OpenChannel failed, ret: %d, devId: %s dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceDev Execute OpenCamera OpenChannel failed, ret: %{public}d, devId: %{public}s dhId: " + "%{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DcameraFinishAsyncTrace(DCAMERA_OPEN_CHANNEL_CONTROL, DCAMERA_OPEN_CHANNEL_TASKID); return DCAMERA_OPEN_CONFLICT; } @@ -369,37 +369,37 @@ int32_t DCameraSourceDev::OpenCamera() int32_t DCameraSourceDev::CloseCamera() { - DHLOGI("DCameraSourceDev Execute CloseCamera devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDev Execute CloseCamera devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); ReportCameraOperaterEvent(CLOSE_CAMERA_EVENT, GetAnonyString(devId_), dhId_, "execute close camera event."); int32_t ret = input_->CloseChannel(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute CloseCamera input CloseChannel failed, ret: %d, devId: %s dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceDev Execute CloseCamera input CloseChannel failed, ret: %{public}d, devId: %{public}s " + "dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } ret = controller_->CloseChannel(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute CloseCamera controller CloseChannel failed, ret: %d, devId: %s dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceDev Execute CloseCamera controller CloseChannel failed, ret: %{public}d, devId: " + "%{public}s dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } return DCAMERA_OK; } int32_t DCameraSourceDev::ConfigStreams(std::vector>& streamInfos) { - DHLOGI("DCameraSourceDev Execute ConfigStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDev Execute ConfigStreams devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); int32_t ret = input_->ConfigStreams(streamInfos); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute ConfigStreams ConfigStreams failed, ret: %d, devId: %s dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceDev Execute ConfigStreams ConfigStreams failed, ret: %{public}d, devId: %{public}s dhId: " + "%{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } std::shared_ptr chanInfo = std::make_shared(); ret = GetLocalDeviceNetworkId(chanInfo->sourceDevId_); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev getLocalNetworkId failed ret: %d, devId: %s, dhId: %s", ret, + DHLOGE("DCameraSourceDev getLocalNetworkId failed ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -410,7 +410,7 @@ int32_t DCameraSourceDev::ConfigStreams(std::vectorChannelNeg(chanInfo); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev ChannelNeg failed ret: %d, devId: %s, dhId: %s", ret, + DHLOGE("DCameraSourceDev ChannelNeg failed ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -419,8 +419,8 @@ int32_t DCameraSourceDev::ConfigStreams(std::vectorOpenChannel(actualDevInfo); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev ChannelNeg OpenChannel failed ret: %d, devId: %s, dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceDev ChannelNeg OpenChannel failed ret: %{public}d, devId: %{public}s, dhId: %{public}s", + ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } return DCAMERA_OK; @@ -428,12 +428,12 @@ int32_t DCameraSourceDev::ConfigStreams(std::vector& streamIds, bool& isAllRelease) { - DHLOGI("DCameraSourceDev Execute ReleaseStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDev Execute ReleaseStreams devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); int32_t ret = input_->ReleaseStreams(streamIds, isAllRelease); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute ReleaseStreams failed ret: %d, devId: %s, dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceDev Execute ReleaseStreams failed ret: %{public}d, devId: %{public}s, dhId: %{public}s", + ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } return DCAMERA_OK; @@ -441,12 +441,12 @@ int32_t DCameraSourceDev::ReleaseStreams(std::vector& streamIds, bool& isAl int32_t DCameraSourceDev::ReleaseAllStreams() { - DHLOGI("DCameraSourceDev Execute ReleaseAllStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), - GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSourceDev Execute ReleaseAllStreams devId %{public}s dhId %{public}s", + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); int32_t ret = input_->ReleaseAllStreams(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute ReleaseAllStreams failed ret: %d, devId: %s, dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceDev Execute ReleaseAllStreams failed ret: %{public}d, devId: %{public}s, " + "dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } return DCAMERA_OK; @@ -455,11 +455,11 @@ int32_t DCameraSourceDev::ReleaseAllStreams() int32_t DCameraSourceDev::StartCapture(std::vector>& captureInfos) { HitraceAndHisyseventImpl(captureInfos); - DHLOGI("DCameraSourceDev Execute StartCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDev Execute StartCapture devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); int32_t ret = input_->StartCapture(captureInfos); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev input StartCapture failed ret: %d, devId: %s, dhId: %s", ret, + DHLOGE("DCameraSourceDev input StartCapture failed ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DcameraFinishAsyncTrace(DCAMERA_CONTINUE_FIRST_FRAME, DCAMERA_CONTINUE_FIRST_FRAME_TASKID); DcameraFinishAsyncTrace(DCAMERA_SNAPSHOT_FIRST_FRAME, DCAMERA_SNAPSHOT_FIRST_FRAME_TASKID); @@ -475,7 +475,8 @@ int32_t DCameraSourceDev::StartCapture(std::vectorisCapture_ = (*iter)->isCapture_; capture->encodeType_ = (*iter)->encodeType_; capture->streamType_ = (*iter)->type_; - DHLOGI("StartCapture devId %s dhId %s settings size: %d w: %d h: %d fmt: %d isC: %d enc: %d streamT: %d", + DHLOGI("StartCapture devId %{public}s dhId %{public}s settings size: %{public}zu w: %{public}d h: %{public}d " + "fmt: %{public}d isC: %{public}d enc: %{public}d streamT: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), (*iter)->captureSettings_.size(), capture->width_, capture->height_, capture->format_, capture->isCapture_ ? 1 : 0, capture->encodeType_, capture->streamType_); @@ -491,8 +492,8 @@ int32_t DCameraSourceDev::StartCapture(std::vectorStartCapture(captures); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute StartCapture StartCapture failed, ret: %d, devId: %s dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceDev Execute StartCapture StartCapture failed, ret: %{public}d, devId: %{public}s dhId: " + "%{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); DcameraFinishAsyncTrace(DCAMERA_CONTINUE_FIRST_FRAME, DCAMERA_CONTINUE_FIRST_FRAME_TASKID); DcameraFinishAsyncTrace(DCAMERA_SNAPSHOT_FIRST_FRAME, DCAMERA_SNAPSHOT_FIRST_FRAME_TASKID); } @@ -522,18 +523,18 @@ void DCameraSourceDev::HitraceAndHisyseventImpl(std::vector& streamIds, bool& isAllStop) { - DHLOGI("DCameraSourceDev Execute StopCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDev Execute StopCapture devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); int32_t ret = input_->StopCapture(streamIds, isAllStop); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute StopCapture input StopCapture failed, ret: %d, devId: %s dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceDev Execute StopCapture input StopCapture failed, ret: %{public}d, devId: %{public}s " + "dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } if (isAllStop) { ret = controller_->StopCapture(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute StopCapture controller StopCapture failed, ret: %d, devId: %s dhId: %s", - ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceDev Execute StopCapture controller StopCapture failed, ret: %{public}d, devId: " + "%{public}s dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } } return DCAMERA_OK; @@ -541,35 +542,35 @@ int32_t DCameraSourceDev::StopCapture(std::vector& streamIds, bool& isAllSt int32_t DCameraSourceDev::StopAllCapture() { - DHLOGI("DCameraSourceDev Execute StopAllCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDev Execute StopAllCapture devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); int32_t ret = input_->StopAllCapture(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute StopAllCapture input StopAllCapture failed, ret: %d, devId: %s dhId: %s", - ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceDev Execute StopAllCapture input StopAllCapture failed, ret: %{public}d, devId: " + "%{public}s dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } ret = controller_->StopCapture(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute StopAllCapture controller StopAllCapture failed, ret: %d, devId: %s dhId: %s", - ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceDev Execute StopAllCapture controller StopAllCapture failed, ret: %{public}d, devId: " + "%{public}s dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } return DCAMERA_OK; } int32_t DCameraSourceDev::UpdateSettings(std::vector>& settings) { - DHLOGI("DCameraSourceDev Execute UpdateSettings devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDev Execute UpdateSettings devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); int32_t ret = input_->UpdateSettings(settings); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute UpdateSettings input UpdateSettings failed, ret: %d, devId: %s dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceDev Execute UpdateSettings input UpdateSettings failed, ret: %{public}d, devId: " + "%{public}s dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } ret = controller_->UpdateSettings(settings); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute UpdateSettings controller UpdateSettings failed, ret: %d, devId: %s dhId: %s", - ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceDev Execute UpdateSettings controller UpdateSettings failed, ret: %{public}d, " + "devId: %{public}s dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } return DCAMERA_OK; @@ -577,12 +578,12 @@ int32_t DCameraSourceDev::UpdateSettings(std::vector& events) { - DHLOGI("DCameraSourceDev Execute CameraEventNotify devId %s dhId %s", GetAnonyString(devId_).c_str(), - GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSourceDev Execute CameraEventNotify devId %{public}s dhId %{public}s", + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); int32_t ret = controller_->DCameraNotify(events); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceDev Execute CameraEventNotify DCameraNotify failed, ret: %d, devId: %s dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceDev Execute CameraEventNotify DCameraNotify failed, ret: %{public}d, devId: %{public}s " + "dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } return DCAMERA_OK; @@ -592,7 +593,7 @@ void DCameraSourceDev::NotifyResult(DCAMERA_EVENT eventType, DCameraSourceEvent& { auto itFunc = memberFuncMap_.find(eventType); if (itFunc == memberFuncMap_.end()) { - DHLOGE("Notify func map not find, execute %d notify, devId: %s dhId: %s", eventType, + DHLOGE("Notify func map not find, execute %{public}d notify, devId: %{public}s dhId: %{public}s", eventType, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return; } @@ -624,8 +625,8 @@ void DCameraSourceDev::NotifyRegisterResult(DCAMERA_EVENT eventType, DCameraSour void DCameraSourceDev::NotifyHalResult(DCAMERA_EVENT eventType, DCameraSourceEvent& event, int32_t result) { - DHLOGI("DCameraSourceDev NotifyHalResult eventType: %d, result: %d devId: %s dhId: %s", eventType, result, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSourceDev NotifyHalResult eventType: %{public}d, result: %{public}d devId: %{public}s dhId: " + "%{public}s", eventType, result, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (result == DCAMERA_OK) { return; } @@ -643,7 +644,7 @@ void DCameraSourceDev::NotifyHalResult(DCAMERA_EVENT eventType, DCameraSourceEve int32_t DCameraSourceDev::GetStateInfo() { - DHLOGI("GetStateInfo In state %d", stateMachine_->GetCameraState()); + DHLOGI("GetStateInfo In state %{public}d", stateMachine_->GetCameraState()); return stateMachine_->GetCameraState(); } diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_service_ipc.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_service_ipc.cpp index b694a513852c8a6881c0aba957df42600148fc5d..79de79dc254f299b35a8b15f6ef8f8745bff501d 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_service_ipc.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_service_ipc.cpp @@ -78,13 +78,13 @@ sptr DCameraSourceServiceIpc::GetSinkRemoteCamSrv(const if (iter != remoteSinks_.end()) { auto object = iter->second; if (object != nullptr) { - DHLOGI("DCameraSourceServiceIpc GetSinkRemoteCamSrv from cache devId: %s", + DHLOGI("DCameraSourceServiceIpc GetSinkRemoteCamSrv from cache devId: %{public}s", GetAnonyString(deviceId).c_str()); return object; } } } - DHLOGI("GetSinkRemoteCamSrv remote deviceid is %s", GetAnonyString(deviceId).c_str()); + DHLOGI("GetSinkRemoteCamSrv remote deviceid is %{public}s", GetAnonyString(deviceId).c_str()); auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (samgr == nullptr) { DHLOGE("GetSinkRemoteCamSrv failed to connect to systemAbilityMgr!"); @@ -93,13 +93,13 @@ sptr DCameraSourceServiceIpc::GetSinkRemoteCamSrv(const auto object = samgr->CheckSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, deviceId); if (object == nullptr) { - DHLOGE("GetSinkRemoteCamSrv failed get remote CamSrv %s", GetAnonyString(deviceId).c_str()); + DHLOGE("GetSinkRemoteCamSrv failed get remote CamSrv %{public}s", GetAnonyString(deviceId).c_str()); return nullptr; } int32_t ret = object->AddDeathRecipient(sinkRemoteRecipient_); sptr remoteCamSrvObj = iface_cast(object); if (remoteCamSrvObj == nullptr) { - DHLOGI("GetSinkRemoteCamSrv failed, remoteCamSrvObj is null ret: %d", ret); + DHLOGI("GetSinkRemoteCamSrv failed, remoteCamSrvObj is null ret: %{public}d", ret); return nullptr; } { @@ -110,17 +110,17 @@ sptr DCameraSourceServiceIpc::GetSinkRemoteCamSrv(const } remoteSinks_[deviceId] = remoteCamSrvObj; } - DHLOGI("GetSinkRemoteCamSrv success, AddDeathRecipient ret: %d", ret); + DHLOGI("GetSinkRemoteCamSrv success, AddDeathRecipient ret: %{public}d", ret); return remoteCamSrvObj; } void DCameraSourceServiceIpc::DeleteSinkRemoteCamSrv(const std::string& deviceId) { - DHLOGI("DeleteSinkRemoteCamSrv devId: %s", GetAnonyString(deviceId).c_str()); + DHLOGI("DeleteSinkRemoteCamSrv devId: %{public}s", GetAnonyString(deviceId).c_str()); std::lock_guard autoLock(sinkRemoteCamSrvLock_); auto item = remoteSinks_.find(deviceId); if (item == remoteSinks_.end()) { - DHLOGI("DeleteSinkRemoteCamSrv not found device: %s", GetAnonyString(deviceId).c_str()); + DHLOGI("DeleteSinkRemoteCamSrv not found device: %{public}s", GetAnonyString(deviceId).c_str()); return; } @@ -167,7 +167,7 @@ void DCameraSourceServiceIpc::OnSinkRemoteCamSrvDied(const wptr& return; } - DHLOGI("OnSinkRemoteCamSrvDied remote.devId: %s", GetAnonyString(iter->first).c_str()); + DHLOGI("OnSinkRemoteCamSrvDied remote.devId: %{public}s", GetAnonyString(iter->first).c_str()); if (iter->second != nullptr) { iter->second->AsObject()->RemoveDeathRecipient(sinkRemoteRecipient_); } diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp index 1df70f624f5c430d3220733f4f3b832391810553..8d89e44b0f91e12e8febcfdd01c045787b01d800 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp @@ -44,7 +44,7 @@ DCameraSourceController::DCameraSourceController(std::string devId, std::string : devId_(devId), dhId_(dhId), stateMachine_(stateMachine), camDev_(camDev), channelState_(DCAMERA_CHANNEL_STATE_DISCONNECTED) { - DHLOGI("DCameraSourceController create devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceController create devId: %{public}s dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); isInit = false; cameraHdiRecipient_ = new DCameraHdiRecipient(); @@ -52,7 +52,7 @@ DCameraSourceController::DCameraSourceController(std::string devId, std::string DCameraSourceController::~DCameraSourceController() { - DHLOGI("DCameraSourceController delete devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceController delete devId: %{public}s dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (isInit) { UnInit(); @@ -63,13 +63,14 @@ DCameraSourceController::~DCameraSourceController() int32_t DCameraSourceController::StartCapture(std::vector>& captureInfos) { if (indexs_.size() > DCAMERA_MAX_NUM) { - DHLOGE("StartCapture not support operate %d camera", indexs_.size()); + DHLOGE("StartCapture not support operate %{public}zu camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } std::string dhId = indexs_.begin()->dhId_; std::string devId = indexs_.begin()->devId_; - DHLOGI("StartCapture devId: %s, dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); + DHLOGI("StartCapture devId: %{public}s, dhId: %{public}s", GetAnonyString(devId).c_str(), + GetAnonyString(dhId).c_str()); DCameraCaptureInfoCmd cmd; cmd.type_ = DCAMERA_PROTOCOL_TYPE_OPERATION; cmd.dhId_ = dhId; @@ -78,27 +79,27 @@ int32_t DCameraSourceController::StartCapture(std::vector buffer = std::make_shared(jsonStr.length() + 1); ret = memcpy_s(buffer->Data(), buffer->Capacity(), reinterpret_cast(const_cast(jsonStr.c_str())), jsonStr.length()); if (ret != EOK) { - DHLOGE("memcpy_s failed %d, devId: %s, dhId: %s", ret, + DHLOGE("memcpy_s failed %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return ret; } ret = channel_->SendData(buffer); if (ret != DCAMERA_OK) { - DHLOGE("SendData failed %d, devId: %s, dhId: %s", ret, + DHLOGE("SendData failed %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return ret; } - DHLOGI("StartCapture devId: %s, dhId: %s success", GetAnonyString(devId).c_str(), + DHLOGI("StartCapture devId: %{public}s, dhId: %{public}s success", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return DCAMERA_OK; } @@ -106,25 +107,26 @@ int32_t DCameraSourceController::StartCapture(std::vector DCAMERA_MAX_NUM) { - DHLOGE("StopCapture not support operate %d camera", indexs_.size()); + DHLOGE("StopCapture not support operate %{public}zu camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } std::string dhId = indexs_.begin()->dhId_; std::string devId = indexs_.begin()->devId_; - DHLOGI("StopCapture devId: %s, dhId: %s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); + DHLOGI("StopCapture devId: %{public}s, dhId: %{public}s", GetAnonyString(devId).c_str(), + GetAnonyString(dhId).c_str()); sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteCamSrv(devId); if (camSinkSrv == nullptr) { - DHLOGE("can not get service, devId: %s", GetAnonyString(devId).c_str()); + DHLOGE("can not get service, devId: %{public}s", GetAnonyString(devId).c_str()); return DCAMERA_BAD_OPERATE; } int32_t ret = camSinkSrv->StopCapture(dhId); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture failed: %d, devId: %s, dhId: %s", ret, + DHLOGE("StopCapture failed: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return DCAMERA_BAD_OPERATE; } - DHLOGI("StopCapture devId: %s, dhId: %s success", GetAnonyString(devId).c_str(), + DHLOGI("StopCapture devId: %{public}s, dhId: %{public}s success", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return DCAMERA_OK; } @@ -132,17 +134,17 @@ int32_t DCameraSourceController::StopCapture() int32_t DCameraSourceController::ChannelNeg(std::shared_ptr& info) { if (indexs_.size() > DCAMERA_MAX_NUM) { - DHLOGE("ChannelNeg not support operate %d camera", indexs_.size()); + DHLOGE("ChannelNeg not support operate %{public}zu camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } std::string dhId = indexs_.begin()->dhId_; std::string devId = indexs_.begin()->devId_; - DHLOGI("ChannelNeg devId: %s, dhId: %s", GetAnonyString(devId).c_str(), + DHLOGI("ChannelNeg devId: %{public}s, dhId: %{public}s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteCamSrv(devId); if (camSinkSrv == nullptr) { - DHLOGE("can not get service, devId: %s", GetAnonyString(devId).c_str()); + DHLOGE("can not get service, devId: %{public}s", GetAnonyString(devId).c_str()); return DCAMERA_BAD_OPERATE; } DCameraChannelInfoCmd cmd; @@ -153,20 +155,20 @@ int32_t DCameraSourceController::ChannelNeg(std::shared_ptr& std::string jsonStr; int32_t ret = cmd.Marshal(jsonStr); if (ret != DCAMERA_OK) { - DHLOGE("Marshal failed ret: %d, devId: %s, dhId: %s", ret, + DHLOGE("Marshal failed ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return ret; } - DHLOGD("devId: %s, dhId: %s channelNegCommand: %s", + DHLOGD("devId: %{public}s, dhId: %{public}s channelNegCommand: %{public}s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), cmd.command_.c_str()); ret = camSinkSrv->ChannelNeg(dhId, jsonStr); if (ret != DCAMERA_OK) { - DHLOGE("ChannelNeg rpc failed ret: %d, devId: %s, dhId: %s", ret, + DHLOGE("ChannelNeg rpc failed ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return ret; } - DHLOGD("DCameraSourceController ChannelNeg devId: %s, dhId: %s success", GetAnonyString(devId).c_str(), - GetAnonyString(dhId).c_str()); + DHLOGD("DCameraSourceController ChannelNeg devId: %{public}s, dhId: %{public}s success", + GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return DCAMERA_OK; } @@ -177,8 +179,8 @@ int32_t DCameraSourceController::DCameraNotify(std::shared_ptr& ev DcameraFinishAsyncTrace(DCAMERA_SNAPSHOT_FIRST_FRAME, DCAMERA_SNAPSHOT_FIRST_FRAME_TASKID); } if (camHdiProvider_ == nullptr) { - DHLOGI("DCameraNotify camHdiProvider is nullptr devId: %s dhId: %s", GetAnonyString(devId_).c_str(), - GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraNotify camHdiProvider is nullptr devId: %{public}s dhId: %{public}s", + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return DCAMERA_BAD_OPERATE; } DHBase dhBase; @@ -193,9 +195,9 @@ int32_t DCameraSourceController::DCameraNotify(std::shared_ptr& ev hdiEvent.result_ = events->eventResult_; hdiEvent.content_ = events->eventContent_; int32_t retHdi = camHdiProvider_->Notify(dhBase, hdiEvent); - DHLOGI("Nofify hal, ret: %d, devId: %s dhId: %s, type: %d, result: %d, content: %s", retHdi, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), events->eventType_, events->eventResult_, - events->eventContent_.c_str()); + DHLOGI("Nofify hal, ret: %{public}d, devId: %{public}s dhId: %{public}s, type: %{public}d, result: %{public}d, " + "content: %{public}s", retHdi, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), + events->eventType_, events->eventResult_, events->eventContent_.c_str()); if (retHdi != SUCCESS) { return DCAMERA_BAD_OPERATE; } @@ -205,13 +207,13 @@ int32_t DCameraSourceController::DCameraNotify(std::shared_ptr& ev int32_t DCameraSourceController::UpdateSettings(std::vector>& settings) { if (indexs_.size() > DCAMERA_MAX_NUM) { - DHLOGE("UpdateSettings not support operate %d camera", indexs_.size()); + DHLOGE("UpdateSettings not support operate %{public}zu camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } std::string dhId = indexs_.begin()->dhId_; std::string devId = indexs_.begin()->devId_; - DHLOGI("UpdateSettings devId: %s, dhId: %s", GetAnonyString(devId).c_str(), + DHLOGI("UpdateSettings devId: %{public}s, dhId: %{public}s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); DCameraMetadataSettingCmd cmd; cmd.type_ = DCAMERA_PROTOCOL_TYPE_MESSAGE; @@ -221,7 +223,7 @@ int32_t DCameraSourceController::UpdateSettings(std::vectorData(), buffer->Capacity(), reinterpret_cast(const_cast(jsonStr.c_str())), jsonStr.length()); if (ret != EOK) { - DHLOGE("memcpy_s failed %d, devId: %s, dhId: %s", ret, + DHLOGE("memcpy_s failed %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return ret; } ret = channel_->SendData(buffer); if (ret != DCAMERA_OK) { - DHLOGE("SendData failed %d, devId: %s, dhId: %s", ret, + DHLOGE("SendData failed %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return ret; } - DHLOGI("UpdateSettings devId: %s, dhId: %s success", GetAnonyString(devId).c_str(), + DHLOGI("UpdateSettings devId: %{public}s, dhId: %{public}s success", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return DCAMERA_OK; } @@ -247,30 +249,30 @@ int32_t DCameraSourceController::UpdateSettings(std::vector& camInfo) { if (indexs_.size() > DCAMERA_MAX_NUM) { - DHLOGE("GetCameraInfo not support operate %d camera", indexs_.size()); + DHLOGE("GetCameraInfo not support operate %{public}zu camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } std::string dhId = indexs_.begin()->dhId_; std::string devId = indexs_.begin()->devId_; - DHLOGI("GetCameraInfo devId: %s, dhId: %s", GetAnonyString(devId).c_str(), + DHLOGI("GetCameraInfo devId: %{public}s, dhId: %{public}s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteCamSrv(devId); if (camSinkSrv == nullptr) { - DHLOGE("can not get service, devId: %s", GetAnonyString(devId).c_str()); + DHLOGE("can not get service, devId: %{public}s", GetAnonyString(devId).c_str()); return DCAMERA_BAD_OPERATE; } std::string camInfoJson; int32_t ret = camSinkSrv->GetCameraInfo(dhId, camInfoJson); if (ret != DCAMERA_OK) { - DHLOGE("GetCameraInfo failed: %d, devId: %s, dhId: %s", ret, + DHLOGE("GetCameraInfo failed: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); return ret; } DCameraInfoCmd cmd; ret = cmd.Unmarshal(camInfoJson); if (ret != DCAMERA_OK) { - DHLOGE("DCameraInfoCmd Unmarshal failed: %d", ret); + DHLOGE("DCameraInfoCmd Unmarshal failed: %{public}d", ret); return ret; } camInfo = cmd.value_; @@ -280,16 +282,16 @@ int32_t DCameraSourceController::GetCameraInfo(std::shared_ptr& cam int32_t DCameraSourceController::OpenChannel(std::shared_ptr& openInfo) { if (indexs_.size() > DCAMERA_MAX_NUM) { - DHLOGE("OpenChannel not support operate %d camera", indexs_.size()); + DHLOGE("OpenChannel not support operate %{public}zu camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } std::string dhId = indexs_.begin()->dhId_; std::string devId = indexs_.begin()->devId_; - DHLOGI("DCameraSourceController OpenChannel Start, devId: %s, dhId: %s", GetAnonyString(devId).c_str(), - GetAnonyString(dhId).c_str()); + DHLOGI("DCameraSourceController OpenChannel Start, devId: %{public}s, dhId: %{public}s", + GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteCamSrv(devId); if (camSinkSrv == nullptr) { - DHLOGE("DCameraSourceController can not get service, devId: %s", GetAnonyString(devId).c_str()); + DHLOGE("DCameraSourceController can not get service, devId: %{public}s", GetAnonyString(devId).c_str()); return DCAMERA_BAD_OPERATE; } std::string jsonStr; @@ -300,22 +302,22 @@ int32_t DCameraSourceController::OpenChannel(std::shared_ptr& o cmd.value_ = openInfo; int32_t ret = cmd.Marshal(jsonStr); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceController Marshal OpenInfo failed %d", ret); + DHLOGE("DCameraSourceController Marshal OpenInfo failed %{public}d", ret); return ret; } ret = camSinkSrv->OpenChannel(dhId, jsonStr); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceController SA OpenChannel failed %d", ret); + DHLOGE("DCameraSourceController SA OpenChannel failed %{public}d", ret); return ret; } - DHLOGD("DCameraSourceController OpenChannel devId: %s, dhId: %s success", GetAnonyString(devId).c_str(), - GetAnonyString(dhId).c_str()); + DHLOGD("DCameraSourceController OpenChannel devId: %{public}s, dhId: %{public}s success", + GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); std::vector indexs; indexs.push_back(DCameraIndex(devId, dhId)); ret = channel_->CreateSession(indexs, SESSION_FLAG, DCAMERA_SESSION_MODE_CTRL, listener_); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceController Bind Socket failed, ret: %d", ret); + DHLOGE("DCameraSourceController Bind Socket failed, ret: %{public}d", ret); PostChannelDisconnectedEvent(); return ret; } @@ -325,31 +327,31 @@ int32_t DCameraSourceController::OpenChannel(std::shared_ptr& o int32_t DCameraSourceController::CloseChannel() { if (indexs_.size() > DCAMERA_MAX_NUM) { - DHLOGE("CloseChannel not support operate %d camera", indexs_.size()); + DHLOGE("CloseChannel not support operate %{public}zu camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } DCameraLowLatency::GetInstance().DisableLowLatency(); DCameraSoftbusLatency::GetInstance().StopSoftbusTimeSync(devId_); std::string dhId = indexs_.begin()->dhId_; std::string devId = indexs_.begin()->devId_; - DHLOGI("DCameraSourceController CloseChannel Start, devId: %s, dhId: %s", GetAnonyString(devId).c_str(), - GetAnonyString(dhId).c_str()); + DHLOGI("DCameraSourceController CloseChannel Start, devId: %{public}s, dhId: %{public}s", + GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); int32_t ret = channel_->CloseSession(); if (ret != DCAMERA_OK) { - DHLOGE("CloseSession failed %d", ret); + DHLOGE("CloseSession failed %{public}d", ret); } - DHLOGI("DCameraSourceController CloseChannel devId: %s, dhId: %s success", GetAnonyString(devId).c_str(), - GetAnonyString(dhId).c_str()); + DHLOGI("DCameraSourceController CloseChannel devId: %{public}s, dhId: %{public}s success", + GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); channelState_ = DCAMERA_CHANNEL_STATE_DISCONNECTED; ret = channel_->ReleaseSession(); if (ret != DCAMERA_OK) { - DHLOGE("ReleaseSession failed %d", ret); + DHLOGE("ReleaseSession failed %{public}d", ret); } sptr camSinkSrv = DCameraSourceServiceIpc::GetInstance().GetSinkRemoteCamSrv(devId); if (camSinkSrv != nullptr) { ret = camSinkSrv->CloseChannel(dhId); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceController SA CloseChannel failed %d", ret); + DHLOGE("DCameraSourceController SA CloseChannel failed %{public}d", ret); } DCameraSourceServiceIpc::GetInstance().DeleteSinkRemoteCamSrv(devId); } @@ -379,8 +381,8 @@ int32_t DCameraSourceController::Init(std::vector& indexs) auto controller = std::shared_ptr(shared_from_this()); listener_ = std::make_shared(controller); channel_ = std::make_shared(); - DHLOGI("DCameraSourceController Init GetProvider end devId: %s, dhId: %s", GetAnonyString(devId).c_str(), - GetAnonyString(dhId).c_str()); + DHLOGI("DCameraSourceController Init GetProvider end devId: %{public}s, dhId: %{public}s", + GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); isInit = true; return DCAMERA_OK; } @@ -399,7 +401,7 @@ int32_t DCameraSourceController::UnInit() void DCameraSourceController::OnSessionState(int32_t state) { - DHLOGI("DCameraSourceController OnSessionState state %d", state); + DHLOGI("DCameraSourceController OnSessionState state %{public}d", state); channelState_ = state; switch (state) { case DCAMERA_CHANNEL_STATE_CONNECTED: { @@ -416,7 +418,7 @@ void DCameraSourceController::OnSessionState(int32_t state) } case DCAMERA_CHANNEL_STATE_DISCONNECTED: { DcameraFinishAsyncTrace(DCAMERA_OPEN_CHANNEL_CONTROL, DCAMERA_OPEN_CHANNEL_TASKID); - DHLOGI("DCameraSourceDev PostTask Controller CloseSession OnClose devId %s dhId %s", + DHLOGI("DCameraSourceDev PostTask Controller CloseSession OnClose devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); isChannelConnected_.store(false); PostChannelDisconnectedEvent(); @@ -430,16 +432,17 @@ void DCameraSourceController::OnSessionState(int32_t state) void DCameraSourceController::OnSessionError(int32_t eventType, int32_t eventReason, std::string detail) { - DHLOGI("DCameraSourceController OnSessionError devId: %s, dhId: %s, eventType: %d, eventReason: %d, detail %s", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), eventType, eventReason, detail.c_str()); + DHLOGI("DCameraSourceController OnSessionError devId: %{public}s, dhId: %{public}s, eventType: %{public}d, " + "eventReason: %{public}d, detail %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), + eventType, eventReason, detail.c_str()); return; } void DCameraSourceController::OnDataReceived(std::vector>& buffers) { if (buffers.empty()) { - DHLOGI("DCameraSourceController OnDataReceived empty, devId: %s, dhId: %s", GetAnonyString(devId_).c_str(), - GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSourceController OnDataReceived empty, devId: %{public}s, dhId: %{public}s", + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return; } std::shared_ptr buffer = *(buffers.begin()); @@ -464,15 +467,15 @@ void DCameraSourceController::OnDataReceived(std::vectortype_; setting.value_ = (*iter)->value_; int32_t retHdi = camHdiProvider_->OnSettingsResult(dhBase, setting); - DHLOGI("OnSettingsResult hal, ret: %d, devId: %s dhId: %s", retHdi, GetAnonyString(devId_).c_str(), - GetAnonyString(dhId_).c_str()); + DHLOGI("OnSettingsResult hal, ret: %{public}d, devId: %{public}s dhId: %{public}s", retHdi, + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } } int32_t DCameraSourceController::PublishEnableLatencyMsg(const std::string& devId) { - DHLOGI("DCameraSourceController PublishEnableLatencyMsg Start,devId: %s", GetAnonyString(devId_).c_str()); + DHLOGI("DCameraSourceController PublishEnableLatencyMsg Start,devId: %{public}s", GetAnonyString(devId_).c_str()); isChannelConnected_.store(false); DCameraLowLatency::GetInstance().EnableLowLatency(); DCameraSoftbusLatency::GetInstance().StartSoftbusTimeSync(devId); - DHLOGI("DCameraSourceController PublishEnableLatencyMsg End,devId: %s", GetAnonyString(devId_).c_str()); + DHLOGI("DCameraSourceController PublishEnableLatencyMsg End,devId: %{public}s", GetAnonyString(devId_).c_str()); return DCAMERA_OK; } diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_data_process.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_data_process.cpp index e8cf1e2db54210e1d7412686a1183035fd7c0ccc..f264135d4a3b8f999bb602c9cad65e1df464ed09 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_data_process.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_data_process.cpp @@ -26,14 +26,14 @@ namespace DistributedHardware { DCameraSourceDataProcess::DCameraSourceDataProcess(std::string devId, std::string dhId, DCStreamType streamType) : devId_(devId), dhId_(dhId), streamType_(streamType), isFirstContStream_(true) { - DHLOGI("DCameraSourceDataProcess Constructor devId %s dhId %s streamType %d", GetAnonyString(devId_).c_str(), - GetAnonyString(dhId_).c_str(), streamType_); + DHLOGI("DCameraSourceDataProcess Constructor devId %{public}s dhId %{public}s streamType %{public}d", + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_); } DCameraSourceDataProcess::~DCameraSourceDataProcess() { - DHLOGI("DCameraSourceDataProcess Destructor devId %s dhId %s streamType %d", GetAnonyString(devId_).c_str(), - GetAnonyString(dhId_).c_str(), streamType_); + DHLOGI("DCameraSourceDataProcess Destructor devId %{public}s dhId %{public}s streamType %{public}d", + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_); streamProcess_.clear(); streamIds_.clear(); } @@ -46,15 +46,17 @@ int32_t DCameraSourceDataProcess::FeedStream(std::vector(buffers.size()); if (buffers.size() > DCAMERA_MAX_NUM) { - DHLOGI("DCameraSourceDataProcess FeedStream devId %s dhId %s size: %d over flow", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), buffers.size()); + DHLOGI("DCameraSourceDataProcess FeedStream devId %{public}s dhId %{public}s size: %{public}" PRIu64 + " over flow", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), buffersSize); return DCAMERA_BAD_VALUE; } auto buffer = *(buffers.begin()); - DHLOGD("DCameraSourceDataProcess FeedStream devId %s dhId %s streamType %d streamSize: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, buffer->Size()); + buffersSize = static_cast(buffer->Size()); + DHLOGD("DCameraSourceDataProcess FeedStream devId %{public}s dhId %{public}s streamType %{public}d streamSize: " + "%{public}" PRIu64, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, buffersSize); std::lock_guard autoLock(streamMutex_); for (auto iter = streamProcess_.begin(); iter != streamProcess_.end(); iter++) { (*iter)->FeedStream(buffer); @@ -64,8 +66,9 @@ int32_t DCameraSourceDataProcess::FeedStream(std::vector>& streamInfos) { - DHLOGI("DCameraSourceDataProcess ConfigStreams devId %s dhId %s streamType %d size %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamInfos.size()); + uint64_t infoSize = static_cast(streamInfos.size()); + DHLOGI("DCameraSourceDataProcess ConfigStreams devId %{public}s dhId %{public}s streamType %{public}d size " + "%{public}" PRIu64, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, infoSize); if (streamInfos.empty()) { DHLOGI("DCameraSourceDataProcess ConfigStreams is empty"); return DCAMERA_OK; @@ -75,8 +78,9 @@ int32_t DCameraSourceDataProcess::ConfigStreams(std::vector streamInfo = *iter; DCameraStreamConfig streamConfig(streamInfo->width_, streamInfo->height_, streamInfo->format_, streamInfo->dataspace_, streamInfo->encodeType_, streamInfo->type_); - DHLOGI("DCameraSourceDataProcess ConfigStreams devId %s dhId %s, streamId: %d info: width: %d, height: %d," + - "format: %d, dataspace: %d, encodeType: %d streamType: %d", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceDataProcess ConfigStreams devId %{public}s dhId %{public}s, streamId: %{public}d info: " + "width: %{public}d, height: %{public}d, format: %{public}d, dataspace: %{public}d, encodeType: " + "%{public}d streamType: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamInfo->streamId_, streamConfig.width_, streamConfig.height_, streamConfig.format_, streamConfig.dataspace_, streamConfig.encodeType_, streamConfig.type_); if (streamConfigs.find(streamConfig) == streamConfigs.end()) { @@ -88,10 +92,11 @@ int32_t DCameraSourceDataProcess::ConfigStreams(std::vectorfirst.width_, iter->first.height_, iter->first.format_, - iter->first.dataspace_, iter->first.encodeType_, iter->first.type_); + DHLOGI("DCameraSourceDataProcess ConfigStreams devId %{public}s dhId %{public}s, info: width: %{public}d, " + "height: %{public}d, format: %{public}d, dataspace: %{public}d, encodeType: %{public}d streamType: " + "%{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), iter->first.width_, + iter->first.height_, iter->first.format_, iter->first.dataspace_, iter->first.encodeType_, + iter->first.type_); std::shared_ptr streamProcess = std::make_shared(devId_, dhId_, streamType_); @@ -108,8 +113,8 @@ int32_t DCameraSourceDataProcess::ConfigStreams(std::vector& streamIds) { - DHLOGI("DCameraSourceDataProcess ReleaseStreams devId %s dhId %s streamType: %d", GetAnonyString(devId_).c_str(), - GetAnonyString(dhId_).c_str(), streamType_); + DHLOGI("DCameraSourceDataProcess ReleaseStreams devId %{public}s dhId %{public}s streamType: %{public}d", + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_); std::lock_guard autoLock(streamMutex_); std::set streamIdSet(streamIds.begin(), streamIds.end()); auto iter = streamProcess_.begin(); @@ -129,16 +134,18 @@ int32_t DCameraSourceDataProcess::ReleaseStreams(std::vector& streamIds strStreams += (std::to_string(*iterSet) + std::string(" ")); streamIds_.erase(*iterSet); } - DHLOGI("DCameraSourceDataProcess ReleaseStreams devId %s dhId %s streamType: %d streamProcessSize: %d streams: %s", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamProcess_.size(), - strStreams.c_str()); + uint64_t processSize = static_cast(streamProcess_.size()); + DHLOGI("DCameraSourceDataProcess ReleaseStreams devId %{public}s dhId %{public}s streamType: %{public}d " + "streamProcessSize: %{public}" PRIu64" streams: %{public}s", GetAnonyString(devId_).c_str(), + GetAnonyString(dhId_).c_str(), streamType_, processSize, strStreams.c_str()); return DCAMERA_OK; } int32_t DCameraSourceDataProcess::StartCapture(std::shared_ptr& captureInfo) { - DHLOGI("DCameraSourceDataProcess StartCapture devId %s dhId %s width: %d, height: %d, format: %d, isCapture: %d," + - "dataspace: %d, encodeType: %d, streamType: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), + DHLOGI("DCameraSourceDataProcess StartCapture devId %{public}s dhId %{public}s width: %{public}d, height: " + "%{public}d, format: %{public}d, isCapture: %{public}d, dataspace: %{public}d, encodeType: %{public}d, " + "streamType: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), captureInfo->width_, captureInfo->height_, captureInfo->format_, captureInfo->isCapture_, captureInfo->dataspace_, captureInfo->encodeType_, captureInfo->type_); if (streamType_ == CONTINUOUS_FRAME && captureInfo->isCapture_ == true) { @@ -150,7 +157,7 @@ int32_t DCameraSourceDataProcess::StartCapture(std::shared_ptr& c captureInfo->dataspace_, captureInfo->encodeType_, captureInfo->type_); std::set streamIds(captureInfo->streamIds_.begin(), captureInfo->streamIds_.end()); for (auto iterSet = streamIds.begin(); iterSet != streamIds.end(); iterSet++) { - DHLOGI("DCameraSourceDataProcess StartCapture devId %s dhId %s StartCapture id: %d", + DHLOGI("DCameraSourceDataProcess StartCapture devId %{public}s dhId %{public}s StartCapture id: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), *iterSet); } for (auto iter = streamProcess_.begin(); iter != streamProcess_.end(); iter++) { @@ -161,11 +168,11 @@ int32_t DCameraSourceDataProcess::StartCapture(std::shared_ptr& c int32_t DCameraSourceDataProcess::StopCapture(std::vector& streamIds) { - DHLOGI("DCameraSourceDataProcess StopCapture devId %s dhId %s streamType: %d", GetAnonyString(devId_).c_str(), - GetAnonyString(dhId_).c_str(), streamType_); + DHLOGI("DCameraSourceDataProcess StopCapture devId %{public}s dhId %{public}s streamType: %{public}d", + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_); std::set streamIdSet(streamIds.begin(), streamIds.end()); for (auto iterSet = streamIdSet.begin(); iterSet != streamIdSet.end(); iterSet++) { - DHLOGI("DCameraSourceDataProcess StopCapture devId %s dhId %s stream id: %d", + DHLOGI("DCameraSourceDataProcess StopCapture devId %{public}s dhId %{public}s stream id: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), *iterSet); } for (auto iter = streamProcess_.begin(); iter != streamProcess_.end(); iter++) { @@ -179,8 +186,8 @@ int32_t DCameraSourceDataProcess::StopCapture(std::vector& streamIds) void DCameraSourceDataProcess::DestroyPipeline() { - DHLOGI("DCameraSourceDataProcess DestroyPipeline devId %s dhId %s streamType: %d", GetAnonyString(devId_).c_str(), - GetAnonyString(dhId_).c_str(), streamType_); + DHLOGI("DCameraSourceDataProcess DestroyPipeline devId %{public}s dhId %{public}s streamType: %{public}d", + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_); for (auto iter = streamProcess_.begin(); iter != streamProcess_.end(); iter++) { (*iter)->DestroyPipeline(); } @@ -194,7 +201,7 @@ int32_t DCameraSourceDataProcess::GetProducerSize() int32_t size = streamDataProcess->GetProducerSize(); ret += size; } - DHLOGI("DCameraSourceDataProcess GetProducerSize devId %s dhId %s size %d", + DHLOGI("DCameraSourceDataProcess GetProducerSize devId %{public}s dhId %{public}s size %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), ret); return ret; } diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_input.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_input.cpp index 928b8e9b090459cf40bddee338c4418533f02851..857415d7474c0f47a4297acdce22a86a70d02840 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_input.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_input.cpp @@ -31,13 +31,13 @@ namespace DistributedHardware { DCameraSourceInput::DCameraSourceInput(std::string devId, std::string dhId, std::shared_ptr& camDev) : devId_(devId), dhId_(dhId), camDev_(camDev), isInit(false) { - DHLOGI("DCameraSourceInput Constructor devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceInput Constructor devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } DCameraSourceInput::~DCameraSourceInput() { - DHLOGI("DCameraSourceInput Destructor devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceInput Destructor devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (isInit) { UnInit(); @@ -46,12 +46,13 @@ DCameraSourceInput::~DCameraSourceInput() int32_t DCameraSourceInput::ConfigStreams(std::vector>& streamInfos) { - DHLOGI("DCameraSourceInput ConfigStreams devId %s dhId %s, size: %d", GetAnonyString(devId_).c_str(), - GetAnonyString(dhId_).c_str(), streamInfos.size()); + uint64_t infoSize = static_cast(streamInfos.size()); + DHLOGI("DCameraSourceInput ConfigStreams devId %{public}s dhId %{public}s, size: %{public}" PRIu64, + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), infoSize); int32_t ret = ReleaseAllStreams(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInput ConfigStreams ReleaseAllStreams failed %d devId: %s, dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceInput ConfigStreams ReleaseAllStreams failed %{public}d devId: %{public}s, dhId: " + "%{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -63,8 +64,9 @@ int32_t DCameraSourceInput::ConfigStreams(std::vector> continueStreams; for (auto iter = streamInfos.begin(); iter != streamInfos.end(); iter++) { std::shared_ptr streamInfo = *iter; - DHLOGI("DCameraSourceInput ConfigStreams devId: %s, dhId: %s, streamId: %d, width: %d, height: %d," + - "format: %d, dataspace: %d, encodeType:%d streamType: %d", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceInput ConfigStreams devId: %{public}s, dhId: %{public}s, streamId: %{public}d, width: " + "%{public}d, height: %{public}d, format: %{public}d, dataspace: %{public}d, encodeType:%{public}d " + "streamType: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamInfo->streamId_, streamInfo->width_, streamInfo->height_, streamInfo->format_, streamInfo->dataspace_, streamInfo->encodeType_, streamInfo->type_); if (streamInfo->type_ == CONTINUOUS_FRAME) { @@ -78,13 +80,13 @@ int32_t DCameraSourceInput::ConfigStreams(std::vectorConfigStreams(continueStreams); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInput ConfigStreams continue failed %d devId %s dhId %s", ret, + DHLOGE("DCameraSourceInput ConfigStreams continue failed %{public}d devId %{public}s dhId %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); break; } ret = dataProcess_[SNAPSHOT_FRAME]->ConfigStreams(snapStreams); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInput ConfigStreams snapshot failed %d devId %s dhId %s", ret, + DHLOGE("DCameraSourceInput ConfigStreams snapshot failed %{public}d devId %{public}s dhId %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); break; } @@ -98,18 +100,18 @@ int32_t DCameraSourceInput::ConfigStreams(std::vector& streamIds, bool& isAllRelease) { - DHLOGI("DCameraSourceInput ReleaseStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceInput ReleaseStreams devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); int32_t ret = dataProcess_[CONTINUOUS_FRAME]->ReleaseStreams(streamIds); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInput ReleaseStreams continue stream ReleaseStreams ret: %d, devId: %s, dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceInput ReleaseStreams continue stream ReleaseStreams ret: %{public}d, devId: %{public}s," + " dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } ret = dataProcess_[SNAPSHOT_FRAME]->ReleaseStreams(streamIds); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInput ReleaseStreams snapshot stream ReleaseStreams ret: %d, devId: %s, dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceInput ReleaseStreams snapshot stream ReleaseStreams ret: %{public}d, devId: %{public}s, " + "dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -125,20 +127,21 @@ int32_t DCameraSourceInput::ReleaseStreams(std::vector& streamIds, bool& is int32_t DCameraSourceInput::StartCapture(std::vector>& captureInfos) { - DHLOGI("DCameraSourceInput StartCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceInput StartCapture devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); for (auto iter = captureInfos.begin(); iter != captureInfos.end(); iter++) { int32_t ret = DCAMERA_OK; for (auto iterSet = (*iter)->streamIds_.begin(); iterSet != (*iter)->streamIds_.end(); iterSet++) { - DHLOGI("DCameraSourceInput StartCapture devId %s dhId %s StartCapture id: %d", + DHLOGI("DCameraSourceInput StartCapture devId %{public}s dhId %{public}s StartCapture id: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), *iterSet); } - DHLOGI("DCameraSourceInput StartCapture Inner devId %s dhId %s streamType: %d idSize: %d isCap: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), (*iter)->type_, (*iter)->streamIds_.size(), - (*iter)->isCapture_ ? 1 : 0); + uint64_t idSize = static_cast((*iter)->streamIds_.size()); + DHLOGI("DCameraSourceInput StartCapture Inner devId %{public}s dhId %{public}s streamType: %{public}d " + "idSize: %{public}" PRIu64" isCap: %{public}d", GetAnonyString(devId_).c_str(), + GetAnonyString(dhId_).c_str(), (*iter)->type_, idSize, (*iter)->isCapture_ ? 1 : 0); ret = dataProcess_[(*iter)->type_]->StartCapture(*iter); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInput StartCapture ret: %d, devId: %s, dhId: %s", ret, + DHLOGE("DCameraSourceInput StartCapture ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -148,11 +151,11 @@ int32_t DCameraSourceInput::StartCapture(std::vector& streamIds, bool& isAllStop) { - DHLOGI("DCameraSourceInput StopCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceInput StopCapture devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); int32_t ret = dataProcess_[CONTINUOUS_FRAME]->StopCapture(streamIds); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInput StopCapture continue ret: %d, devId: %s, dhId: %s", ret, + DHLOGE("DCameraSourceInput StopCapture continue ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -164,7 +167,7 @@ int32_t DCameraSourceInput::StopCapture(std::vector& streamIds, bool& isAll dataProcess_[SNAPSHOT_FRAME]->GetAllStreamIds(snapStreamIds); ret = dataProcess_[SNAPSHOT_FRAME]->StopCapture(snapStreamIds); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInput StopCapture snapshot ret: %d, devId: %s, dhId: %s", ret, + DHLOGE("DCameraSourceInput StopCapture snapshot ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -174,22 +177,23 @@ int32_t DCameraSourceInput::StopCapture(std::vector& streamIds, bool& isAll int32_t DCameraSourceInput::OpenChannel(std::vector& indexs) { - DHLOGI("DCameraSourceInput OpenChannel devId %s dhId %s continue state: %d, snapshot state: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), channelState_[CONTINUOUS_FRAME], - channelState_[SNAPSHOT_FRAME]); + DHLOGI("DCameraSourceInput OpenChannel devId %{public}s dhId %{public}s continue state: %{public}d, snapshot " + "state: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), + channelState_[CONTINUOUS_FRAME], channelState_[SNAPSHOT_FRAME]); if (channelState_[CONTINUOUS_FRAME] == DCAMERA_CHANNEL_STATE_DISCONNECTED) { int32_t ret = EstablishContinuousFrameSession(indexs); if (ret != DCAMERA_OK) { - DHLOGE("esdablish continuous frame failed ret: %d,"+ - "devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("esdablish continuous frame failed ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } } if (channelState_[SNAPSHOT_FRAME] == DCAMERA_CHANNEL_STATE_DISCONNECTED) { int32_t ret = EstablishSnapshotFrameSession(indexs); if (ret != DCAMERA_OK) { - DHLOGE("esdablish snapshot frame failed ret: %d,"+ - "devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("esdablish snapshot frame failed ret: %{public}d," + "devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), + GetAnonyString(dhId_).c_str()); return ret; } } @@ -198,22 +202,22 @@ int32_t DCameraSourceInput::OpenChannel(std::vector& indexs) int32_t DCameraSourceInput::CloseChannel() { - DHLOGI("DCameraSourceInput CloseChannel devId %s dhId %s continue state: %d, snapshot state: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), channelState_[CONTINUOUS_FRAME], - channelState_[SNAPSHOT_FRAME]); + DHLOGI("DCameraSourceInput CloseChannel devId %{public}s dhId %{public}s continue state: %{public}d, " + "snapshot state: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), + channelState_[CONTINUOUS_FRAME], channelState_[SNAPSHOT_FRAME]); if (channelState_[CONTINUOUS_FRAME] != DCAMERA_CHANNEL_STATE_DISCONNECTED) { int32_t ret = DCAMERA_OK; ret = channels_[CONTINUOUS_FRAME]->CloseSession(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInput CloseChannel continue stream failed ret: %d, devId: %s, dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceInput CloseChannel continue stream failed ret: %{public}d, devId: %{public}s, dhId: " + "%{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } channelState_[CONTINUOUS_FRAME] = DCAMERA_CHANNEL_STATE_DISCONNECTED; ret = channels_[CONTINUOUS_FRAME]->ReleaseSession(); if (ret != DCAMERA_OK) { - DHLOGI("DCameraSourceInput release continue session failed: %d devId %s dhId %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSourceInput release continue session failed: %{public}d devId %{public}s dhId %{public}s", + ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } } @@ -221,15 +225,15 @@ int32_t DCameraSourceInput::CloseChannel() int32_t ret = DCAMERA_OK; ret = channels_[SNAPSHOT_FRAME]->CloseSession(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInput CloseChannel snapshot stream failed ret: %d, devId: %s, dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("DCameraSourceInput CloseChannel snapshot stream failed ret: %{public}d, devId: %{public}s, dhId: " + "%{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } channelState_[SNAPSHOT_FRAME] = DCAMERA_CHANNEL_STATE_DISCONNECTED; ret = channels_[SNAPSHOT_FRAME]->ReleaseSession(); if (ret != DCAMERA_OK) { - DHLOGI("DCameraSourceInput release snapshot session failed: %d devId %s dhId %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraSourceInput release snapshot session failed: %{public}d devId %{public}s dhId %{public}s", + ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } } return DCAMERA_OK; @@ -237,7 +241,7 @@ int32_t DCameraSourceInput::CloseChannel() int32_t DCameraSourceInput::Init() { - DHLOGI("DCameraSourceInput Init devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceInput Init devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); auto input = std::shared_ptr(shared_from_this()); std::shared_ptr conDataProcess = std::make_shared(devId_, dhId_, @@ -260,14 +264,14 @@ int32_t DCameraSourceInput::Init() dataProcess_.emplace(SNAPSHOT_FRAME, snapDataProcess); channelState_.emplace(SNAPSHOT_FRAME, DCAMERA_CHANNEL_STATE_DISCONNECTED); isInit = true; - DHLOGI("DCameraSourceInput Init devId end %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceInput Init devId end %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } int32_t DCameraSourceInput::UnInit() { - DHLOGI("DCameraSourceInput UnInit devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraSourceInput UnInit devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); channels_.clear(); listeners_.clear(); @@ -285,13 +289,13 @@ int32_t DCameraSourceInput::UpdateSettings(std::vectorframeInfo_.offset = DCameraSoftbusLatency::GetInstance().GetTimeSyncInfo(devId_); int32_t ret = dataProcess_[streamType]->FeedStream(buffers); if (ret != DCAMERA_OK) { - DHLOGE("OnDataReceived FeedStream %d stream failed ret: %d, devId: %s, dhId: %s", streamType, - ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("OnDataReceived FeedStream %{public}d stream failed ret: %{public}d, devId: %{public}s, " + "dhId: %{public}s", streamType, ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } } int32_t DCameraSourceInput::ReleaseAllStreams() { - DHLOGI("ReleaseAllStreams devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("ReleaseAllStreams devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); std::vector continueStreamIds; dataProcess_[CONTINUOUS_FRAME]->GetAllStreamIds(continueStreamIds); int32_t ret = dataProcess_[CONTINUOUS_FRAME]->ReleaseStreams(continueStreamIds); if (ret != DCAMERA_OK) { - DHLOGE("continue stream ReleaseStreams ret: %d, devId: %s, dhId: %s", ret, + DHLOGE("continue stream ReleaseStreams ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -355,8 +360,8 @@ int32_t DCameraSourceInput::ReleaseAllStreams() dataProcess_[SNAPSHOT_FRAME]->GetAllStreamIds(snapStreamIds); ret = dataProcess_[SNAPSHOT_FRAME]->ReleaseStreams(snapStreamIds); if (ret != DCAMERA_OK) { - DHLOGE("ReleaseAllStreams snapshot stream ReleaseStreams ret: %d, devId: %s, dhId: %s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("ReleaseAllStreams snapshot stream ReleaseStreams ret: %{public}d, devId: %{public}s, dhId: %{public}s", + ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } return DCAMERA_OK; @@ -364,13 +369,13 @@ int32_t DCameraSourceInput::ReleaseAllStreams() int32_t DCameraSourceInput::StopAllCapture() { - DHLOGI("StopAllCapture devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("StopAllCapture devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); std::vector continueStreamIds; dataProcess_[CONTINUOUS_FRAME]->GetAllStreamIds(continueStreamIds); int32_t ret = dataProcess_[CONTINUOUS_FRAME]->StopCapture(continueStreamIds); if (ret != DCAMERA_OK) { - DHLOGE("StopAllCapture continue ret: %d, devId: %s, dhId: %s", ret, + DHLOGE("StopAllCapture continue ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -379,7 +384,7 @@ int32_t DCameraSourceInput::StopAllCapture() dataProcess_[SNAPSHOT_FRAME]->GetAllStreamIds(snapStreamIds); ret = dataProcess_[SNAPSHOT_FRAME]->StopCapture(snapStreamIds); if (ret != DCAMERA_OK) { - DHLOGE("StopAllCapture snapshot ret: %d, devId: %s, dhId: %s", ret, + DHLOGE("StopAllCapture snapshot ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return ret; } @@ -402,8 +407,8 @@ int32_t DCameraSourceInput::EstablishContinuousFrameSession(std::vectorCreateSession(indexs, CONTINUE_SESSION_FLAG, DCAMERA_SESSION_MODE_VIDEO, listeners_[CONTINUOUS_FRAME]); if (ret != DCAMERA_OK) { - DHLOGE("Create Session failed ret: %d,"+ - "devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("Create Session failed ret: %{public}d," + "devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); PostChannelDisconnectedEvent(); DcameraFinishAsyncTrace(DCAMERA_OPEN_DATA_CONTINUE, DCAMERA_OPEN_DATA_CONTINUE_TASKID); return ret; @@ -419,8 +424,8 @@ int32_t DCameraSourceInput::EstablishSnapshotFrameSession(std::vectorCreateSession(indexs, SNAP_SHOT_SESSION_FLAG, DCAMERA_SESSION_MODE_JPEG, listeners_[SNAPSHOT_FRAME]); if (ret != DCAMERA_OK) { - DHLOGE("create session failed ret: %d,"+ - "devId: %s, dhId: %s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("create session failed ret: %{public}d," + "devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); PostChannelDisconnectedEvent(); DcameraFinishAsyncTrace(DCAMERA_OPEN_DATA_SNAPSHOT, DCAMERA_OPEN_DATA_SNAPSHOT_TASKID); return ret; diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process.cpp index 2693db07c401f19dca8b32510439dc1c8274a3a3..93daa0f1c578a2a51f38aa00f8400add87c110ad 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process.cpp @@ -28,7 +28,7 @@ namespace DistributedHardware { DCameraStreamDataProcess::DCameraStreamDataProcess(std::string devId, std::string dhId, DCStreamType streamType) : devId_(devId), dhId_(dhId), streamType_(streamType) { - DHLOGI("DCameraStreamDataProcess Constructor devId %s dhId %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraStreamDataProcess Constructor devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); pipeline_ = nullptr; listener_ = nullptr; @@ -36,8 +36,8 @@ DCameraStreamDataProcess::DCameraStreamDataProcess(std::string devId, std::strin DCameraStreamDataProcess::~DCameraStreamDataProcess() { - DHLOGI("DCameraStreamDataProcess Destructor devId %s dhId %s streamType: %d", GetAnonyString(devId_).c_str(), - GetAnonyString(dhId_).c_str(), streamType_); + DHLOGI("DCameraStreamDataProcess Destructor devId %{public}s dhId %{public}s streamType: %{public}d", + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_); streamIds_.clear(); producers_.clear(); if (pipeline_ != nullptr) { @@ -48,8 +48,10 @@ DCameraStreamDataProcess::~DCameraStreamDataProcess() void DCameraStreamDataProcess::FeedStream(std::shared_ptr& buffer) { for (auto streamId : streamIds_) { - DHLOGD("FeedStream devId %s dhId %s streamId %d streamType %d streamSize: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId, streamType_, buffer->Size()); + uint64_t buffersSize = static_cast(buffer->Size()); + DHLOGD("FeedStream devId %{public}s dhId %{public}s streamId %{public}d streamType %{public}d streamSize: " + "%{public}" PRIu64, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId, + streamType_, buffersSize); } switch (streamType_) { case SNAPSHOT_FRAME: { @@ -69,10 +71,10 @@ void DCameraStreamDataProcess::ConfigStreams(std::shared_ptr& streamIds) { for (auto streamId : streamIds) { - DHLOGI("ConfigStreams devId %s dhId %s streamId %d, width: %d, height: %d, " + - "format: %d, dataspace: %d, encodeType: %d, streamType: %d", GetAnonyString(devId_).c_str(), - GetAnonyString(dhId_).c_str(), streamId, dstConfig->width_, dstConfig->height_, dstConfig->format_, - dstConfig->dataspace_, dstConfig->encodeType_, dstConfig->type_); + DHLOGI("ConfigStreams devId %{public}s dhId %{public}s streamId %{public}d, width: %{public}d, height: " + "%{public}d, format: %{public}d, dataspace: %{public}d, encodeType: %{public}d, streamType: %{public}d", + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId, dstConfig->width_, + dstConfig->height_, dstConfig->format_, dstConfig->dataspace_, dstConfig->encodeType_, dstConfig->type_); } dstConfig_ = dstConfig; streamIds_ = streamIds; @@ -81,13 +83,13 @@ void DCameraStreamDataProcess::ConfigStreams(std::shared_ptr& streamIds) { for (auto streamId : streamIds) { - DHLOGI("ReleaseStreams devId %s dhId %s streamId %d streamType %d", + DHLOGI("ReleaseStreams devId %{public}s dhId %{public}s streamId %{public}d streamType %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId, streamType_); } std::lock_guard autoLock(producerMutex_); for (auto iter = streamIds.begin(); iter != streamIds.end(); iter++) { int32_t streamId = *iter; - DHLOGI("ReleaseStreams devId %s dhId %s streamId: %d", GetAnonyString(devId_).c_str(), + DHLOGI("ReleaseStreams devId %{public}s dhId %{public}s streamId: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId); streamIds_.erase(streamId); auto producerIter = producers_.find(streamId); @@ -103,8 +105,9 @@ void DCameraStreamDataProcess::StartCapture(std::shared_ptr std::set& streamIds) { for (auto iter = streamIds.begin(); iter != streamIds.end(); iter++) { - DHLOGI("StartCapture devId %s dhId %s streamType: %d streamId: %d, " + - "srcConfig: width: %d, height: %d, format: %d, dataspace: %d, streamType: %d, encodeType: %d", + DHLOGI("StartCapture devId %{public}s dhId %{public}s streamType: %{public}d streamId: %{public}d, " + "srcConfig: width: %{public}d, height: %{public}d, format: %{public}d, dataspace: %{public}d, " + "streamType: %{public}d, encodeType: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, *iter, srcConfig->width_, srcConfig->height_, srcConfig->format_, srcConfig->dataspace_, srcConfig->type_, srcConfig->encodeType_); @@ -117,19 +120,19 @@ void DCameraStreamDataProcess::StartCapture(std::shared_ptr std::lock_guard autoLock(producerMutex_); for (auto iter = streamIds_.begin(); iter != streamIds_.end(); iter++) { uint32_t streamId = *iter; - DHLOGI("StartCapture streamId: %d", streamId); + DHLOGI("StartCapture streamId: %{public}d", streamId); if (streamIds.find(streamId) == streamIds.end()) { continue; } - DHLOGI("StartCapture findProducer devId %s dhId %s streamType: %d streamId: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId); + DHLOGI("StartCapture findProducer devId %{public}s dhId %{public}s streamType: %{public}d streamId: " + "%{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId); auto producerIter = producers_.find(streamId); if (producerIter != producers_.end()) { continue; } - DHLOGI("StartCapture CreateProducer devId %s dhId %s streamType: %d streamId: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId); + DHLOGI("StartCapture CreateProducer devId %{public}s dhId %{public}s streamType: %{public}d streamId: " + "%{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId); producers_[streamId] = std::make_shared(devId_, dhId_, streamId, streamType_); producers_[streamId]->Start(); @@ -140,28 +143,28 @@ void DCameraStreamDataProcess::StartCapture(std::shared_ptr void DCameraStreamDataProcess::StopCapture(std::set& streamIds) { for (auto iter = streamIds.begin(); iter != streamIds.end(); iter++) { - DHLOGI("StopCapture devId %s dhId %s streamType: %d streamId: %d", + DHLOGI("StopCapture devId %{public}s dhId %{public}s streamType: %{public}d streamId: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, *iter); } { std::lock_guard autoLock(producerMutex_); for (auto iter = streamIds_.begin(); iter != streamIds_.end(); iter++) { uint32_t streamId = *iter; - DHLOGI("StopCapture streamId: %d", streamId); + DHLOGI("StopCapture streamId: %{public}d", streamId); if (streamIds.find(streamId) == streamIds.end()) { continue; } - DHLOGI("StopCapture findProducer devId %s dhId %s streamType: %d streamId: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId); + DHLOGI("StopCapture findProducer devId %{public}s dhId %{public}s streamType: %{public}d streamId: " + "%{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId); auto producerIter = producers_.find(streamId); if (producerIter == producers_.end()) { - DHLOGE("StopCapture no producer, devId %s dhId %s streamType: %d streamId: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId); + DHLOGE("StopCapture no producer, devId %{public}s dhId %{public}s streamType: %{public}d streamId: " + "%{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId); continue; } - DHLOGI("StopCapture stop producer, devId %s dhId %s streamType: %d streamId: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId); + DHLOGI("StopCapture stop producer, devId %{public}s dhId %{public}s streamType: %{public}d streamId: " + "%{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId); producerIter->second->Stop(); producerIter = producers_.erase(producerIter); } @@ -175,7 +178,7 @@ void DCameraStreamDataProcess::GetAllStreamIds(std::set& streamIds) int32_t DCameraStreamDataProcess::GetProducerSize() { - DHLOGI("DCameraStreamDataProcess GetProducerSize devId %s dhId %s", + DHLOGI("DCameraStreamDataProcess GetProducerSize devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); std::lock_guard autoLock(producerMutex_); return producers_.size(); @@ -183,8 +186,10 @@ int32_t DCameraStreamDataProcess::GetProducerSize() void DCameraStreamDataProcess::FeedStreamToSnapShot(const std::shared_ptr& buffer) { - DHLOGD("DCameraStreamDataProcess FeedStreamToSnapShot devId %s dhId %s streamType %d streamSize: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, buffer->Size()); + uint64_t buffersSize = static_cast(buffer->Size()); + DHLOGD("DCameraStreamDataProcess FeedStreamToSnapShot devId %{public}s dhId %{public}s streamType %{public}d " + "streamSize: %{public}" PRIu64, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), + streamType_, buffersSize); std::lock_guard autoLock(producerMutex_); for (auto iter = producers_.begin(); iter != producers_.end(); iter++) { iter->second->FeedStream(buffer); @@ -193,26 +198,31 @@ void DCameraStreamDataProcess::FeedStreamToSnapShot(const std::shared_ptr& buffer) { - DHLOGD("DCameraStreamDataProcess FeedStreamToContinue devId %s dhId %s streamType %d streamSize: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, buffer->Size()); + uint64_t buffersSize = static_cast(buffer->Size()); + DHLOGD("DCameraStreamDataProcess FeedStreamToContinue devId %{public}s dhId %{public}s streamType %{public}d " + "streamSize: %{public}" PRIu64, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), + streamType_, buffersSize); std::lock_guard autoLock(pipelineMutex_); std::vector> buffers; buffers.push_back(buffer); if (pipeline_ == nullptr) { - DHLOGE("pipeline null devId %s dhId %s type: %d streamSize: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, buffer->Size()); + buffersSize = static_cast(buffer->Size()); + DHLOGE("pipeline null devId %{public}s dhId %{public}s type: %{public}d streamSize: %{public}" PRIu64, + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, buffersSize); return; } int32_t ret = pipeline_->ProcessData(buffers); if (ret != DCAMERA_OK) { - DHLOGE("pipeline ProcessData failed, ret: %d", ret); + DHLOGE("pipeline ProcessData failed, ret: %{public}d", ret); } } void DCameraStreamDataProcess::OnProcessedVideoBuffer(const std::shared_ptr& videoResult) { - DHLOGI("DCameraStreamDataProcess OnProcessedVideoBuffer devId %s dhId %s streamType: %d streamSize: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, videoResult->Size()); + uint64_t resultSize = static_cast(videoResult->Size()); + DHLOGI("DCameraStreamDataProcess OnProcessedVideoBuffer devId %{public}s dhId %{public}s streamType: %{public}d " + "streamSize: %{public}" PRIu64, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), + streamType_, resultSize); std::lock_guard autoLock(producerMutex_); for (auto iter = producers_.begin(); iter != producers_.end(); iter++) { iter->second->FeedStream(videoResult); @@ -221,16 +231,16 @@ void DCameraStreamDataProcess::OnProcessedVideoBuffer(const std::shared_ptr autoLock(pipelineMutex_); if (pipeline_ != nullptr) { - DHLOGI("DCameraStreamDataProcess CreatePipeline already exist, devId %s dhId %s", + DHLOGI("DCameraStreamDataProcess CreatePipeline already exist, devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return; } @@ -243,13 +253,14 @@ void DCameraStreamDataProcess::CreatePipeline() DCAMERA_PRODUCER_FPS_DEFAULT, dstConfig_->width_, dstConfig_->height_); int32_t ret = pipeline_->CreateDataProcessPipeline(PipelineType::VIDEO, srcParams, dstParams, listener_); if (ret != DCAMERA_OK) { - DHLOGE("DCameraStreamDataProcess CreateDataProcessPipeline type: %d failed, ret: %d", PipelineType::VIDEO, ret); + DHLOGE("DCameraStreamDataProcess CreateDataProcessPipeline type: %{public}d failed, ret: %{public}d", + PipelineType::VIDEO, ret); } } void DCameraStreamDataProcess::DestroyPipeline() { - DHLOGI("DCameraStreamDataProcess DestroyPipeline devId %s dhId %s", + DHLOGI("DCameraStreamDataProcess DestroyPipeline devId %{public}s dhId %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); std::lock_guard autoLock(pipelineMutex_); if (pipeline_ == nullptr) { diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.cpp index 4f2ab1dc677f22d673508cf47f13f7d233e063d3..a9f9253da1c9c14d07630d145612adab62123e44 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.cpp @@ -35,8 +35,8 @@ DCameraStreamDataProcessProducer::DCameraStreamDataProcessProducer(std::string d : devId_(devId), dhId_(dhId), streamId_(streamId), streamType_(streamType), eventHandler_(nullptr), camHdiProvider_(nullptr) { - DHLOGI("DCameraStreamDataProcessProducer Constructor devId %s dhId %s streamType: %d streamId: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_); + DHLOGI("DCameraStreamDataProcessProducer Constructor devId %{public}s dhId %{public}s streamType: %{public}d " + "streamId: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_); state_ = DCAMERA_PRODUCER_STATE_STOP; interval_ = DCAMERA_PRODUCER_ONE_MINUTE_MS / DCAMERA_PRODUCER_FPS_DEFAULT; photoCount_ = COUNT_INIT_NUM; @@ -44,8 +44,9 @@ DCameraStreamDataProcessProducer::DCameraStreamDataProcessProducer(std::string d DCameraStreamDataProcessProducer::~DCameraStreamDataProcessProducer() { - DHLOGI("DCameraStreamDataProcessProducer Destructor devId %s dhId %s state: %d streamType: %d streamId: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), state_, streamType_, streamId_); + DHLOGI("DCameraStreamDataProcessProducer Destructor devId %{public}s dhId %{public}s state: %{public}d streamType" + ": %{public}d streamId: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), state_, + streamType_, streamId_); if (state_ == DCAMERA_PRODUCER_STATE_START) { Stop(); } @@ -53,8 +54,8 @@ DCameraStreamDataProcessProducer::~DCameraStreamDataProcessProducer() void DCameraStreamDataProcessProducer::Start() { - DHLOGI("DCameraStreamDataProcessProducer Start producer devId: %s dhId: %s streamType: %d streamId: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_); + DHLOGI("DCameraStreamDataProcessProducer Start producer devId: %{public}s dhId: %{public}s streamType: %{public}d " + "streamId: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_); camHdiProvider_ = IDCameraProvider::Get(HDF_DCAMERA_EXT_SERVICE); if (camHdiProvider_ == nullptr) { DHLOGE("camHdiProvider_ is null."); @@ -77,8 +78,9 @@ void DCameraStreamDataProcessProducer::Start() void DCameraStreamDataProcessProducer::Stop() { - DHLOGI("DCameraStreamDataProcessProducer Stop devId: %s dhId: %s streamType: %d streamId: %d state: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_, state_); + DHLOGI("DCameraStreamDataProcessProducer Stop devId: %{public}s dhId: %{public}s streamType: %{public}d " + "streamId: %{public}d state: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), + streamType_, streamId_, state_); { std::lock_guard lock(bufferMutex_); state_ = DCAMERA_PRODUCER_STATE_STOP; @@ -95,8 +97,9 @@ void DCameraStreamDataProcessProducer::Stop() producerThread_.join(); } camHdiProvider_ = nullptr; - DHLOGI("DCameraStreamDataProcessProducer Stop end devId: %s dhId: %s streamType: %d streamId: %d state: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_, state_); + DHLOGI("DCameraStreamDataProcessProducer Stop end devId: %{public}s dhId: %{public}s streamType: %{public}d " + "streamId: %{public}d state: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), + streamType_, streamId_, state_); } void DCameraStreamDataProcessProducer::FeedStream(const std::shared_ptr& buffer) @@ -104,13 +107,15 @@ void DCameraStreamDataProcessProducer::FeedStream(const std::shared_ptrframeInfo_.timePonit.startSmooth = GetNowTimeStampUs(); { std::lock_guard lock(bufferMutex_); - DHLOGD("DCameraStreamDataProcessProducer FeedStream devId %s dhId %s streamId: %d streamType: %d" + - " streamSize: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), - streamId_, streamType_, buffer->Size()); + uint64_t buffersSize = static_cast(buffer->Size()); + DHLOGD("DCameraStreamDataProcessProducer FeedStream devId %{public}s dhId %{public}s streamId: %{public}d " + "streamType: %{public}d streamSize: %{public}" PRIu64, GetAnonyString(devId_).c_str(), + GetAnonyString(dhId_).c_str(), streamId_, streamType_, buffersSize); if (buffers_.size() >= DCAMERA_PRODUCER_MAX_BUFFER_SIZE) { - DHLOGD("DCameraStreamDataProcessProducer FeedStream OverSize devId %s dhId %s streamType: %d" + - " streamSize: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), - streamType_, buffer->Size()); + buffersSize = static_cast(buffer->Size()); + DHLOGD("DCameraStreamDataProcessProducer FeedStream OverSize devId %{public}s dhId %{public}s streamType: " + "%{public}d streamSize: %{public}" PRIu64, GetAnonyString(devId_).c_str(), + GetAnonyString(dhId_).c_str(), streamType_, buffersSize); buffers_.pop_front(); } if (streamType_ == SNAPSHOT_FRAME) { @@ -137,14 +142,11 @@ void DCameraStreamDataProcessProducer::StartEvent() void DCameraStreamDataProcessProducer::LooperSnapShot() { - DHLOGI("LooperSnapShot producer devId: %s dhId: %s streamType: %d streamId: %d state: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_, state_); std::string name = PRODUCER + std::to_string(streamType_); prctl(PR_SET_NAME, name.c_str()); DHBase dhBase; dhBase.deviceId_ = devId_; dhBase.dhId_ = dhId_; - while (state_ == DCAMERA_PRODUCER_STATE_START) { std::shared_ptr buffer = nullptr; { @@ -155,16 +157,16 @@ void DCameraStreamDataProcessProducer::LooperSnapShot() if (state_ == DCAMERA_PRODUCER_STATE_STOP) { continue; } - if (!buffers_.empty()) { - DHLOGI("LooperSnapShot producer get buffer devId: %s dhId: %s streamType: %d streamId: %d state: %d", + DHLOGI("LooperSnapShot producer get buffer devId: %{public}s dhId: %{public}s streamType: %{public}d " + "streamId: %{public}d state: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_, state_); buffer = buffers_.front(); } } - if (buffer == nullptr) { - DHLOGI("LooperSnapShot producer get buffer failed devId: %s dhId: %s streamType: %d streamId: %d state: %d", + DHLOGI("LooperSnapShot producer get buffer failed devId: %{public}s dhId: %{public}s streamType:" + " %{public}d streamId: %{public}d state: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_, state_); continue; } @@ -185,15 +187,13 @@ void DCameraStreamDataProcessProducer::LooperSnapShot() buffers_.pop_front(); } } - DHLOGI("LooperSnapShot producer end devId: %s dhId: %s streamType: %d streamId: %d state: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_, state_); + DHLOGI("LooperSnapShot producer end devId: %s dhId: %s streamType: %{public}d streamId: %{public}d state: " + "%{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamType_, streamId_, state_); } int32_t DCameraStreamDataProcessProducer::FeedStreamToDriver(const DHBase& dhBase, const std::shared_ptr& buffer) { - DHLOGD("LooperFeed devId %s dhId %s streamSize: %d streamType: %d, streamId: %d", GetAnonyString(devId_).c_str(), - GetAnonyString(dhId_).c_str(), buffer->Size(), streamType_, streamId_); if (camHdiProvider_ == nullptr) { DHLOGI("camHdiProvider is nullptr"); return DCAMERA_BAD_VALUE; @@ -201,46 +201,43 @@ int32_t DCameraStreamDataProcessProducer::FeedStreamToDriver(const DHBase& dhBas DCameraBuffer sharedMemory; int32_t ret = camHdiProvider_->AcquireBuffer(dhBase, streamId_, sharedMemory); if (ret != SUCCESS) { - DHLOGE("AcquireBuffer devId: %s dhId: %s streamId: %d ret: %d", + DHLOGE("AcquireBuffer devId: %{public}s dhId: %{public}s streamId: %{public}d ret: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId_, ret); return DCAMERA_BAD_OPERATE; } - do { ret = CheckSharedMemory(sharedMemory, buffer); if (ret != DCAMERA_OK) { - DHLOGE("CheckSharedMemory failed devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DHLOGE("CheckSharedMemory failed devId: %{public}s dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); break; } sharedMemory.bufferHandle_->GetBufferHandle()->virAddr = DCameraMemoryMap(sharedMemory.bufferHandle_->GetBufferHandle()); if (sharedMemory.bufferHandle_->GetBufferHandle()->virAddr == nullptr) { - DHLOGE("mmap failed devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + DHLOGE("mmap failed devId: %{public}s dhId: %{public}s", GetAnonyString(devId_).c_str(), + GetAnonyString(dhId_).c_str()); break; } ret = memcpy_s(sharedMemory.bufferHandle_->GetBufferHandle()->virAddr, sharedMemory.size_, buffer->Data(), buffer->Size()); if (ret != EOK) { - DHLOGE("memcpy_s devId: %s dhId: %s streamId: %d bufSize: %d, addressSize: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId_, buffer->Size(), - sharedMemory.size_); + DHLOGE("memcpy_s devId: %s dhId: %s streamId: %{public}d bufSize: %zu, addressSize: %{public}d", + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId_, + buffer->Size(), sharedMemory.size_); break; } sharedMemory.size_ = buffer->Size(); } while (0); - ret = camHdiProvider_->ShutterBuffer(dhBase, streamId_, sharedMemory); if (sharedMemory.bufferHandle_ != nullptr) { DCameraMemoryUnmap(sharedMemory.bufferHandle_->GetBufferHandle()); } if (ret != SUCCESS) { - DHLOGE("ShutterBuffer devId: %s dhId: %s streamId: %d ret: %d", + DHLOGE("ShutterBuffer devId: %{public}s dhId: %{public}s streamId: %{public}d ret: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId_, ret); return DCAMERA_BAD_OPERATE; } - DHLOGD("LooperFeed end devId %s dhId %s streamSize: %d streamType: %d, streamId: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), buffer->Size(), streamType_, streamId_); return ret; } @@ -248,15 +245,16 @@ int32_t DCameraStreamDataProcessProducer::CheckSharedMemory(const DCameraBuffer& const std::shared_ptr& buffer) { if (sharedMemory.bufferHandle_ == nullptr || sharedMemory.bufferHandle_->GetBufferHandle() == nullptr) { - DHLOGE("bufferHandle read failed devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DHLOGE("bufferHandle read failed devId: %{public}s dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return DCAMERA_MEMORY_OPT_ERROR; } if (buffer->Size() > sharedMemory.size_) { - DHLOGE("sharedMemory devId: %s dhId: %s streamId: %d bufSize: %d, addressSize: %d", - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId_, buffer->Size(), - sharedMemory.size_); + uint64_t buffersSize = static_cast(buffer->Size()); + DHLOGE("sharedMemory devId: %{public}s dhId: %{public}s streamId: %{public}d bufSize: %{public}" PRIu64 + ", addressSize: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId_, + buffersSize, sharedMemory.size_); return DCAMERA_MEMORY_OPT_ERROR; } diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/base/ifeeding_smoother.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/base/ifeeding_smoother.cpp index d303b8e147f009845e48818be493590f76d15595..620db87f53852f685b24db275ea243371493f35e 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/base/ifeeding_smoother.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/base/ifeeding_smoother.cpp @@ -195,11 +195,11 @@ void IFeedingSmoother::AdjustSleepTime(const int64_t interval) int64_t sleep = sleep_ - adjustThre; delta_ -= (sleep < 0) ? sleep_ : adjustThre; sleep_ = sleep; - DHLOGD("Delta more than thre, adjust sleep to %ld us.", sleep_); + DHLOGD("Delta more than thre, adjust sleep to %{public}" PRId64" us.", sleep_); } else if (delta_ < -adjustThre) { sleep_ += delta_; delta_ = 0; - DHLOGD("Delta less than negative thre, adjust sleep to %ld us.", sleep_); + DHLOGD("Delta less than negative thre, adjust sleep to %{public}" PRId64" us.", sleep_); } } @@ -210,13 +210,13 @@ void IFeedingSmoother::SyncClock(const int64_t timeStamp, const int64_t interval int64_t offset = timeStamp - sleep_ - clock; if (offset > waitThre || offset < -trackThre) { sleep_ += offset; - DHLOGD("Offset is not in the threshold range, adjust sleep to %ld us.", sleep_); + DHLOGD("Offset is not in the threshold range, adjust sleep to %{public}" PRId64" us.", sleep_); } if (sleep_ < 0) { sleep_ = 0; DHLOGD("Sleep less than zero, adjust sleep to zero."); } - DHLOGD("Offset is %ld us, sleep is %ld us after syncing clock.", offset, sleep_); + DHLOGD("Offset is %{public}" PRId64" us, sleep is %{public}" PRId64" us after syncing clock.", offset, sleep_); } void IFeedingSmoother::RecordTime(const int64_t enterTime, const int64_t timeStamp) diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/derived/dcamera_time_statistician.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/derived/dcamera_time_statistician.cpp index 3ddc51183d08e68d4c4914e9dbb714a7f911e09a..389bffd1443d93cbb65ea6dec183b397f38b209e 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/derived/dcamera_time_statistician.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/feedingsmoother/derived/dcamera_time_statistician.cpp @@ -38,8 +38,10 @@ void DCameraTimeStatistician::CalProcessTime(const std::shared_ptr listener( new DCameraHdfServStatListener(DCameraHdfServStatListener::StatusCallback([&](const ServiceStatus& status) { - DHLOGI("LoadCameraService service status callback, serviceName: %s, status: %d", + DHLOGI("LoadCameraService service status callback, serviceName: %{public}s, status: %{public}d", status.serviceName.c_str(), status.status); std::unique_lock lock(hdfOperateMutex_); if (status.serviceName == CAMERA_SERVICE_NAME) { @@ -98,7 +98,7 @@ int32_t DCameraHdfOperate::WaitLoadCameraService() }); if (cameraServStatus_ != OHOS::HDI::ServiceManager::V1_0::SERVIE_STATUS_START) { - DHLOGE("wait load cameraService failed, status %d", cameraServStatus_); + DHLOGE("wait load cameraService failed, status %{public}d", cameraServStatus_); return DCAMERA_BAD_OPERATE; } @@ -114,7 +114,7 @@ int32_t DCameraHdfOperate::WaitLoadProviderService() }); if (providerServStatus_ != OHOS::HDI::ServiceManager::V1_0::SERVIE_STATUS_START) { - DHLOGE("wait load providerService failed, status %d", providerServStatus_); + DHLOGE("wait load providerService failed, status %{public}d", providerServStatus_); return DCAMERA_BAD_OPERATE; } @@ -132,7 +132,7 @@ int32_t DCameraHdfOperate::UnLoadDcameraHDFImpl() int32_t ret = devmgr->UnloadDevice(CAMERA_SERVICE_NAME); if (ret != 0) { - DHLOGE("Unload camera service failed, ret: %d", ret); + DHLOGE("Unload camera service failed, ret: %{public}d", ret); } ret = devmgr->UnloadDevice(PROVIDER_SERVICE_NAME); if (ret != 0) { diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp index 9776e52b8fc6f80bbefbec4759495086f337e94a..045471f1bd3aeb0f5ac083c36bb41e19b179669b 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp @@ -27,45 +27,45 @@ namespace DistributedHardware { DCameraProviderCallbackImpl::DCameraProviderCallbackImpl(std::string devId, std::string dhId, std::shared_ptr& sourceDev) : devId_(devId), dhId_(dhId), sourceDev_(sourceDev) { - DHLOGI("DCameraProviderCallbackImpl create devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraProviderCallbackImpl create devId: %{public}s dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } DCameraProviderCallbackImpl::~DCameraProviderCallbackImpl() { - DHLOGI("DCameraProviderCallbackImpl delete devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DHLOGI("DCameraProviderCallbackImpl delete devId: %{public}s dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } int32_t DCameraProviderCallbackImpl::OpenSession(const DHBase& dhBase) { - DHLOGI("DCameraProviderCallbackImpl OpenSession Start, devId: %s dhId: %s", GetAnonyString(devId_).c_str(), - GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraProviderCallbackImpl OpenSession Start, devId: %{public}s dhId: %{public}s", + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (!CheckDHBase(dhBase)) { DHLOGE("input is invalid"); return FAILED; } std::shared_ptr sourceDev = sourceDev_.lock(); if (sourceDev == nullptr) { - DHLOGE("OpenSession failed, can not get device, devId: %s, dhId: %s", + DHLOGE("OpenSession failed, can not get device, devId: %{public}s, dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } DCameraIndex camIndex(devId_, dhId_); int32_t ret = sourceDev->OpenSession(camIndex); if (ret != DCAMERA_OK) { - DHLOGE("OpenSession failed, ret: %d, devId: %s, dhId: %s", ret, + DHLOGE("OpenSession failed, ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } - DHLOGI("DCameraProviderCallbackImpl OpenSession End, devId: %s dhId: %s", GetAnonyString(devId_).c_str(), - GetAnonyString(dhId_).c_str()); + DHLOGI("DCameraProviderCallbackImpl OpenSession End, devId: %{public}s dhId: %{public}s", + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return SUCCESS; } int32_t DCameraProviderCallbackImpl::CloseSession(const DHBase& dhBase) { - DHLOGI("CloseSession devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DHLOGI("CloseSession devId: %{public}s dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (!CheckDHBase(dhBase)) { DHLOGE("input is invalid"); @@ -73,14 +73,14 @@ int32_t DCameraProviderCallbackImpl::CloseSession(const DHBase& dhBase) } std::shared_ptr sourceDev = sourceDev_.lock(); if (sourceDev == nullptr) { - DHLOGE("CloseSession failed, can not get device, devId: %s, dhId: %s", + DHLOGE("CloseSession failed, can not get device, devId: %{public}s, dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } DCameraIndex camIndex(devId_, dhId_); int32_t ret = sourceDev->CloseSession(camIndex); if (ret != DCAMERA_OK) { - DHLOGE("CloseSession failed, ret: %d, devId: %s, dhId: %s", ret, + DHLOGE("CloseSession failed, ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } @@ -100,7 +100,7 @@ bool DCameraProviderCallbackImpl::CheckDHBase(const DHBase& dhBase) int32_t DCameraProviderCallbackImpl::ConfigureStreams(const DHBase& dhBase, const std::vector& streamInfos) { - DHLOGI("ConfigStreams devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DHLOGI("ConfigStreams devId: %{public}s dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (!CheckDHBase(dhBase) || streamInfos.empty() || streamInfos.size() > PARAM_MAX_SIZE) { DHLOGE("input is invalid"); @@ -108,7 +108,7 @@ int32_t DCameraProviderCallbackImpl::ConfigureStreams(const DHBase& dhBase, } std::shared_ptr sourceDev = sourceDev_.lock(); if (sourceDev == nullptr) { - DHLOGE("ConfigStreams failed, can not get device, devId: %s, dhId: %s", + DHLOGE("ConfigStreams failed, can not get device, devId: %{public}s, dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } @@ -131,7 +131,7 @@ int32_t DCameraProviderCallbackImpl::ConfigureStreams(const DHBase& dhBase, } int32_t ret = sourceDev->ConfigCameraStreams(streams); if (ret != DCAMERA_OK) { - DHLOGE("CloseSession failed, ret: %d, devId: %s, dhId: %s", ret, + DHLOGE("CloseSession failed, ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } @@ -155,7 +155,7 @@ bool DCameraProviderCallbackImpl::CheckStreamInfo(const DCStreamInfo& stream) int32_t DCameraProviderCallbackImpl::ReleaseStreams(const DHBase& dhBase, const std::vector& streamIds) { - DHLOGI("ReleaseStreams devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DHLOGI("ReleaseStreams devId: %{public}s dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (!CheckDHBase(dhBase) || streamIds.size() > PARAM_MAX_SIZE) { DHLOGE("input is invalid"); @@ -163,13 +163,13 @@ int32_t DCameraProviderCallbackImpl::ReleaseStreams(const DHBase& dhBase, const } std::shared_ptr sourceDev = sourceDev_.lock(); if (sourceDev == nullptr) { - DHLOGE("ReleaseStreams failed, can not get device, devId: %s, dhId: %s", + DHLOGE("ReleaseStreams failed, can not get device, devId: %{public}s, dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } int32_t ret = sourceDev->ReleaseCameraStreams(streamIds); if (ret != DCAMERA_OK) { - DHLOGE("ReleaseStreams failed, ret: %d, devId: %s, dhId: %s", ret, + DHLOGE("ReleaseStreams failed, ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } @@ -178,7 +178,7 @@ int32_t DCameraProviderCallbackImpl::ReleaseStreams(const DHBase& dhBase, const int32_t DCameraProviderCallbackImpl::StartCapture(const DHBase& dhBase, const std::vector& captureInfos) { - DHLOGI("StartCapture devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DHLOGI("StartCapture devId: %{public}s dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (!CheckDHBase(dhBase) || captureInfos.empty() || captureInfos.size() > PARAM_MAX_SIZE) { DHLOGE("input is invalid"); @@ -186,7 +186,7 @@ int32_t DCameraProviderCallbackImpl::StartCapture(const DHBase& dhBase, const st } std::shared_ptr sourceDev = sourceDev_.lock(); if (sourceDev == nullptr) { - DHLOGE("StartCapture failed, can not get device, devId: %s, dhId: %s", + DHLOGE("StartCapture failed, can not get device, devId: %{public}s, dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } @@ -218,7 +218,7 @@ int32_t DCameraProviderCallbackImpl::StartCapture(const DHBase& dhBase, const st } int32_t ret = sourceDev->StartCameraCapture(captures); if (ret != DCAMERA_OK) { - DHLOGE("StartCapture failed, ret: %d, devId: %s, dhId: %s", ret, + DHLOGE("StartCapture failed, ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } @@ -243,7 +243,7 @@ bool DCameraProviderCallbackImpl::CheckCaptureInfo(const DCCaptureInfo& captureI int32_t DCameraProviderCallbackImpl::StopCapture(const DHBase& dhBase, const std::vector& streamIds) { - DHLOGI("StopCapture devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DHLOGI("StopCapture devId: %{public}s dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (!CheckDHBase(dhBase) || streamIds.size() > PARAM_MAX_SIZE) { DHLOGE("input is invalid"); @@ -251,13 +251,13 @@ int32_t DCameraProviderCallbackImpl::StopCapture(const DHBase& dhBase, const std } std::shared_ptr sourceDev = sourceDev_.lock(); if (sourceDev == nullptr) { - DHLOGE("StopCapture failed, can not get device, devId: %s, dhId: %s", + DHLOGE("StopCapture failed, can not get device, devId: %{public}s, dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } int32_t ret = sourceDev->StopCameraCapture(streamIds); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture failed, ret: %d, devId: %s, dhId: %s", ret, + DHLOGE("StopCapture failed, ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } @@ -266,7 +266,7 @@ int32_t DCameraProviderCallbackImpl::StopCapture(const DHBase& dhBase, const std int32_t DCameraProviderCallbackImpl::UpdateSettings(const DHBase& dhBase, const std::vector& settings) { - DHLOGI("UpdateSettings devId: %s dhId: %s", GetAnonyString(devId_).c_str(), + DHLOGI("UpdateSettings devId: %{public}s dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); if (!CheckDHBase(dhBase) || settings.size() > PARAM_MAX_SIZE) { DHLOGE("input is invalid"); @@ -274,7 +274,7 @@ int32_t DCameraProviderCallbackImpl::UpdateSettings(const DHBase& dhBase, const } std::shared_ptr sourceDev = sourceDev_.lock(); if (sourceDev == nullptr) { - DHLOGE("UpdateSettings failed, can not get device, devId: %s, dhId: %s", + DHLOGE("UpdateSettings failed, can not get device, devId: %{public}s, dhId: %{public}s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } @@ -292,7 +292,7 @@ int32_t DCameraProviderCallbackImpl::UpdateSettings(const DHBase& dhBase, const } int32_t ret = sourceDev->UpdateCameraSettings(settingInfos); if (ret != DCAMERA_OK) { - DHLOGE("UpdateSettings failed, ret: %d, devId: %s, dhId: %s", ret, + DHLOGE("UpdateSettings failed, ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_capture_state.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_capture_state.cpp index 0611908d35ccd2dcc4efd67eef76c8a7e5be539f..e908cca4ef0e6683dd42ad7c32383e955f0ed918 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_capture_state.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_capture_state.cpp @@ -40,14 +40,14 @@ int32_t DCameraSourceCaptureState::Execute(std::shared_ptr& ca { auto itFunc = memberFuncMap_.find(eventType); if (itFunc == memberFuncMap_.end()) { - DHLOGE("DCameraSourceCaptureState execute %d in wrong state", eventType); + DHLOGE("DCameraSourceCaptureState execute %{public}d in wrong state", eventType); return DCAMERA_WRONG_STATE; } auto memberFunc = itFunc->second; int32_t ret = (this->*memberFunc)(camDev, event); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceCaptureState execute %d failed, ret: %d", eventType, ret); + DHLOGE("DCameraSourceCaptureState execute %{public}d failed, ret: %{public}d", eventType, ret); } return ret; } @@ -71,25 +71,25 @@ int32_t DCameraSourceCaptureState::DoUnregisterTask(std::shared_ptreventResult_ = DCAMERA_EVENT_CHANNEL_DISCONNECTED; int32_t ret = camDev->CameraEventNotify(camEvent); if (ret != DCAMERA_OK) { - DHLOGE("CameraEventNotify failed: %d", ret); + DHLOGE("CameraEventNotify failed: %{public}d", ret); return ret; } ret = camDev->StopAllCapture(); if (ret != DCAMERA_OK) { - DHLOGE("StopAllCapture failed: %d", ret); + DHLOGE("StopAllCapture failed: %{public}d", ret); return ret; } ret = camDev->CloseCamera(); if (ret != DCAMERA_OK) { - DHLOGE("CloseCamera failed, ret: %d", ret); + DHLOGE("CloseCamera failed, ret: %{public}d", ret); return ret; } ret = camDev->ReleaseAllStreams(); if (ret != DCAMERA_OK) { - DHLOGE("ReleaseAllStreams failed, ret: %d", ret); + DHLOGE("ReleaseAllStreams failed, ret: %{public}d", ret); return ret; } @@ -100,7 +100,7 @@ int32_t DCameraSourceCaptureState::DoUnregisterTask(std::shared_ptrUnRegister(param); if (ret != DCAMERA_OK) { - DHLOGE("UnRegister failed: %d", ret); + DHLOGE("UnRegister failed: %{public}d", ret); return ret; } std::shared_ptr stateMachine = stateMachine_.lock(); @@ -122,19 +122,19 @@ int32_t DCameraSourceCaptureState::DoCloseTask(std::shared_ptr { int32_t ret = camDev->StopAllCapture(); if (ret != DCAMERA_OK) { - DHLOGE("StopAllCapture failed, ret: %d", ret); + DHLOGE("StopAllCapture failed, ret: %{public}d", ret); return ret; } ret = camDev->ReleaseAllStreams(); if (ret != DCAMERA_OK) { - DHLOGE("ReleaseAllStreams failed, ret: %d", ret); + DHLOGE("ReleaseAllStreams failed, ret: %{public}d", ret); return ret; } ret = camDev->CloseCamera(); if (ret != DCAMERA_OK) { - DHLOGE("CloseCamera failed, ret: %d", ret); + DHLOGE("CloseCamera failed, ret: %{public}d", ret); return ret; } std::shared_ptr stateMachine = stateMachine_.lock(); @@ -157,7 +157,7 @@ int32_t DCameraSourceCaptureState::DoStartCaptureTask(std::shared_ptrStartCapture(captureInfos); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceCaptureState DoStartCaptureTask failed, ret: %d", ret); + DHLOGE("DCameraSourceCaptureState DoStartCaptureTask failed, ret: %{public}d", ret); return ret; } return DCAMERA_OK; @@ -175,7 +175,7 @@ int32_t DCameraSourceCaptureState::DoStopCaptureTask(std::shared_ptrStopCapture(streamIds, isAllStop); if (ret != DCAMERA_OK) { - DHLOGE("StopCapture failed, ret: %d", ret); + DHLOGE("StopCapture failed, ret: %{public}d", ret); return ret; } @@ -201,7 +201,7 @@ int32_t DCameraSourceCaptureState::DoUpdateSettingsTask(std::shared_ptrUpdateSettings(settings); if (ret != DCAMERA_OK) { - DHLOGE("UpdateSettings failed, ret: %d", ret); + DHLOGE("UpdateSettings failed, ret: %{public}d", ret); return ret; } return DCAMERA_OK; @@ -218,7 +218,7 @@ int32_t DCameraSourceCaptureState::DoEventNofityTask(std::shared_ptrCameraEventNotify(camEvent); if (ret != DCAMERA_OK) { - DHLOGE("CameraEventNotify failed, ret: %d", ret); + DHLOGE("CameraEventNotify failed, ret: %{public}d", ret); return ret; } return DCAMERA_OK; diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_config_stream_state.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_config_stream_state.cpp index a72f3c15e5b4b22962338addf24bd20a4e26c827..4a67d04e0a3f602024adb187a0228fca7df8519b 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_config_stream_state.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_config_stream_state.cpp @@ -42,14 +42,14 @@ int32_t DCameraSourceConfigStreamState::Execute(std::shared_ptrsecond; int32_t ret = (this->*memberFunc)(camDev, event); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceConfigStreamState execute %d failed, ret: %d", eventType, ret); + DHLOGE("DCameraSourceConfigStreamState execute %{public}d failed, ret: %{public}d", eventType, ret); } return ret; } @@ -74,19 +74,19 @@ int32_t DCameraSourceConfigStreamState::DoUnregisterTask(std::shared_ptreventResult_ = DCAMERA_EVENT_CHANNEL_DISCONNECTED; int32_t ret = camDev->CameraEventNotify(camEvent); if (ret != DCAMERA_OK) { - DHLOGE("CameraEventNotify failed: %d", ret); + DHLOGE("CameraEventNotify failed: %{public}d", ret); return ret; } ret = camDev->CloseCamera(); if (ret != DCAMERA_OK) { - DHLOGE("CloseCamera failed, ret: %d", ret); + DHLOGE("CloseCamera failed, ret: %{public}d", ret); return ret; } ret = camDev->ReleaseAllStreams(); if (ret != DCAMERA_OK) { - DHLOGE("ReleaseAllStreams failed, ret: %d", ret); + DHLOGE("ReleaseAllStreams failed, ret: %{public}d", ret); return ret; } @@ -97,7 +97,7 @@ int32_t DCameraSourceConfigStreamState::DoUnregisterTask(std::shared_ptrUnRegister(param); if (ret != DCAMERA_OK) { - DHLOGE("UnRegister failed: %d", ret); + DHLOGE("UnRegister failed: %{public}d", ret); return ret; } std::shared_ptr stateMachine = stateMachine_.lock(); @@ -120,13 +120,13 @@ int32_t DCameraSourceConfigStreamState::DoCloseTask(std::shared_ptrCloseCamera(); if (ret != DCAMERA_OK) { - DHLOGE("CloseCamera failed, ret: %d", ret); + DHLOGE("CloseCamera failed, ret: %{public}d", ret); return ret; } ret = camDev->ReleaseAllStreams(); if (ret != DCAMERA_OK) { - DHLOGE("ReleaseAllStreams failed, ret: %d", ret); + DHLOGE("ReleaseAllStreams failed, ret: %{public}d", ret); return ret; } std::shared_ptr stateMachine = stateMachine_.lock(); @@ -149,7 +149,7 @@ int32_t DCameraSourceConfigStreamState::DoConfigStreamsTask(std::shared_ptrConfigStreams(streamInfos); if (ret != DCAMERA_OK) { - DHLOGE("ConfigStreams failed, ret: %d", ret); + DHLOGE("ConfigStreams failed, ret: %{public}d", ret); return ret; } @@ -176,7 +176,7 @@ int32_t DCameraSourceConfigStreamState::DoReleaseStreamsTask(std::shared_ptrReleaseStreams(streamIds, isAllRelease); if (ret != DCAMERA_OK) { - DHLOGE("ReleaseStreams failed, ret: %d", ret); + DHLOGE("ReleaseStreams failed, ret: %{public}d", ret); return ret; } @@ -202,7 +202,7 @@ int32_t DCameraSourceConfigStreamState::DoStartCaptureTask(std::shared_ptrStartCapture(captureInfos); if (ret != DCAMERA_OK) { - DHLOGE("StartCapture failed, ret: %d", ret); + DHLOGE("StartCapture failed, ret: %{public}d", ret); return ret; } std::shared_ptr stateMachine = stateMachine_.lock(); @@ -232,7 +232,7 @@ int32_t DCameraSourceConfigStreamState::DoUpdateSettingsTask(std::shared_ptrUpdateSettings(settings); if (ret != DCAMERA_OK) { - DHLOGE("UpdateSettings failed, ret: %d", ret); + DHLOGE("UpdateSettings failed, ret: %{public}d", ret); return ret; } return DCAMERA_OK; @@ -249,7 +249,7 @@ int32_t DCameraSourceConfigStreamState::DoEventNofityTask(std::shared_ptrCameraEventNotify(camEvent); if (ret != DCAMERA_OK) { - DHLOGE("CameraEventNotify failed, ret: %d", ret); + DHLOGE("CameraEventNotify failed, ret: %{public}d", ret); return ret; } return DCAMERA_OK; diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_init_state.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_init_state.cpp index 5238a581ea7e7faa295934662c1d9edc02cc7767..df4a5d5de7eae310bcca5566e570e459e0b0887b 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_init_state.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_init_state.cpp @@ -34,14 +34,14 @@ int32_t DCameraSourceInitState::Execute(std::shared_ptr& camDe { auto itFunc = memberFuncMap_.find(eventType); if (itFunc == memberFuncMap_.end()) { - DHLOGE("DCameraSourceInitState execute %d in wrong state", eventType); + DHLOGE("DCameraSourceInitState execute %{public}d in wrong state", eventType); return DCAMERA_WRONG_STATE; } auto memberFunc = itFunc->second; int32_t ret = (this->*memberFunc)(camDev, event); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceInitState execute %d failed, ret: %d", eventType, ret); + DHLOGE("DCameraSourceInitState execute %{public}d failed, ret: %{public}d", eventType, ret); } return ret; } diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_opened_state.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_opened_state.cpp index 110767a7ff79d1ebac71d449d42b526f29582bff..eae218e33858d3a7cb06bce3008b9e6b36d21364 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_opened_state.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_opened_state.cpp @@ -40,14 +40,14 @@ int32_t DCameraSourceOpenedState::Execute(std::shared_ptr& cam { auto itFunc = memberFuncMap_.find(eventType); if (itFunc == memberFuncMap_.end()) { - DHLOGE("DCameraSourceOpenedState execute %d in wrong state", eventType); + DHLOGE("DCameraSourceOpenedState execute %{public}d in wrong state", eventType); return DCAMERA_WRONG_STATE; } auto memberFunc = itFunc->second; int32_t ret = (this->*memberFunc)(camDev, event); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceOpenedState execute %d failed, ret: %d", eventType, ret); + DHLOGE("DCameraSourceOpenedState execute %{public}d failed, ret: %{public}d", eventType, ret); } return ret; } @@ -72,13 +72,13 @@ int32_t DCameraSourceOpenedState::DoUnregisterTask(std::shared_ptreventResult_ = DCAMERA_EVENT_CHANNEL_DISCONNECTED; int32_t ret = camDev->CameraEventNotify(camEvent); if (ret != DCAMERA_OK) { - DHLOGE("CameraEventNotify failed: %d", ret); + DHLOGE("CameraEventNotify failed: %{public}d", ret); return ret; } ret = camDev->CloseCamera(); if (ret != DCAMERA_OK) { - DHLOGE("CloseCamera failed: %d", ret); + DHLOGE("CloseCamera failed: %{public}d", ret); return ret; } @@ -89,7 +89,7 @@ int32_t DCameraSourceOpenedState::DoUnregisterTask(std::shared_ptrUnRegister(param); if (ret != DCAMERA_OK) { - DHLOGE("UnRegister failed: %d", ret); + DHLOGE("UnRegister failed: %{public}d", ret); return ret; } std::shared_ptr stateMachine = stateMachine_.lock(); @@ -112,7 +112,7 @@ int32_t DCameraSourceOpenedState::DoConfigStreamsTask(std::shared_ptrConfigStreams(streamInfos); if (ret != DCAMERA_OK) { - DHLOGE("ConfigStreams failed, ret: %d", ret); + DHLOGE("ConfigStreams failed, ret: %{public}d", ret); return ret; } std::shared_ptr stateMachine = stateMachine_.lock(); @@ -144,7 +144,7 @@ int32_t DCameraSourceOpenedState::DoUpdateSettingsTask(std::shared_ptrUpdateSettings(settings); if (ret != DCAMERA_OK) { - DHLOGE("UpdateSettings failed, ret: %d", ret); + DHLOGE("UpdateSettings failed, ret: %{public}d", ret); return ret; } return DCAMERA_OK; @@ -162,7 +162,7 @@ int32_t DCameraSourceOpenedState::DoCloseTask(std::shared_ptr& { int32_t ret = camDev->CloseCamera(); if (ret != DCAMERA_OK) { - DHLOGE("CloseCamera failed, ret: %d", ret); + DHLOGE("CloseCamera failed, ret: %{public}d", ret); return ret; } std::shared_ptr stateMachine = stateMachine_.lock(); @@ -185,7 +185,7 @@ int32_t DCameraSourceOpenedState::DoEventNofityTask(std::shared_ptrCameraEventNotify(camEvent); if (ret != DCAMERA_OK) { - DHLOGE("CameraEventNotify failed, ret: %d", ret); + DHLOGE("CameraEventNotify failed, ret: %{public}d", ret); return ret; } return DCAMERA_OK; diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_regist_state.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_regist_state.cpp index 779c41721c15a05b380048e03e0599a1441aa35a..a4162ff9637c699e3c5aa1576e737704c1902661 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_regist_state.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_regist_state.cpp @@ -37,14 +37,14 @@ int32_t DCameraSourceRegistState::Execute(std::shared_ptr& cam { auto itFunc = memberFuncMap_.find(eventType); if (itFunc == memberFuncMap_.end()) { - DHLOGE("DCameraSourceRegistState execute %d in wrong state", eventType); + DHLOGE("DCameraSourceRegistState execute %{public}d in wrong state", eventType); return DCAMERA_WRONG_STATE; } auto memberFunc = itFunc->second; int32_t ret = (this->*memberFunc)(camDev, event); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceRegistState execute %d failed, ret: %d", eventType, ret); + DHLOGE("DCameraSourceRegistState execute %{public}d failed, ret: %{public}d", eventType, ret); } return ret; } @@ -87,7 +87,7 @@ int32_t DCameraSourceRegistState::DoOpenTask(std::shared_ptr& { int32_t ret = camDev->OpenCamera(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceRegistState OpenCamera failed, ret: %d", ret); + DHLOGE("DCameraSourceRegistState OpenCamera failed, ret: %{public}d", ret); return ret; } return DCAMERA_OK; @@ -110,7 +110,7 @@ int32_t DCameraSourceRegistState::DoEventNofityTask(std::shared_ptrCameraEventNotify(camEvent); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceRegistState DoEventNofityTask CameraEventNotify failed, ret: %d", ret); + DHLOGE("DCameraSourceRegistState DoEventNofityTask CameraEventNotify failed, ret: %{public}d", ret); return ret; } return DCAMERA_OK; diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_state_factory.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_state_factory.cpp index 7a80073e14efd76952b45e24282e71168ad81aba..4402b6056e710031079350f50d15eff5627de0dd 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_state_factory.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_state_factory.cpp @@ -54,7 +54,7 @@ std::shared_ptr DCameraSourceStateFactory::CreateState(DCame break; } default: { - DHLOGE("DCameraSourceStateFactory create state failed, wrong type %d", stateType); + DHLOGE("DCameraSourceStateFactory create state failed, wrong type %{public}d", stateType); return nullptr; } } diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_state_machine.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_state_machine.cpp index 31c851044f1c61b7912f49b546d99e0adba46f2e..00e6bfc3c465cfbc9fc58d245e8df09912e02bbc 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_state_machine.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_state_machine.cpp @@ -35,7 +35,7 @@ DCameraSourceStateMachine::~DCameraSourceStateMachine() int32_t DCameraSourceStateMachine::Execute(DCAMERA_EVENT eventType, DCameraSourceEvent& event) { - DHLOGI("In state %d execute event %d", currentState_->GetStateType(), eventType); + DHLOGI("In state %{public}d execute event %{public}d", currentState_->GetStateType(), eventType); std::shared_ptr camDev = camDev_.lock(); if (camDev == nullptr) { DHLOGE("DCameraSourceStateMachine execute failed, camDev is nullptr"); @@ -43,8 +43,8 @@ int32_t DCameraSourceStateMachine::Execute(DCAMERA_EVENT eventType, DCameraSourc } int32_t ret = currentState_->Execute(camDev, event.GetEventType(), event); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceStateMachine currentState_: %d execute event: %d failed", currentState_->GetStateType(), - event.GetEventType()); + DHLOGE("DCameraSourceStateMachine currentState_: %{public}d execute event: %{public}d failed", + currentState_->GetStateType(), event.GetEventType()); } return ret; } @@ -52,9 +52,10 @@ int32_t DCameraSourceStateMachine::Execute(DCAMERA_EVENT eventType, DCameraSourc void DCameraSourceStateMachine::UpdateState(DCameraStateType stateType) { if (stateType != DCAMERA_STATE_INIT) { - DHLOGI("DCameraSourceStateMachine update state from %d to %d", currentState_->GetStateType(), stateType); + DHLOGI("DCameraSourceStateMachine update state from %{public}d to %{public}d", + currentState_->GetStateType(), stateType); } else { - DHLOGI("DCameraSourceStateMachine update state %d", stateType); + DHLOGI("DCameraSourceStateMachine update state %{public}d", stateType); } auto stateMachine = std::shared_ptr(shared_from_this()); currentState_ = DCameraSourceStateFactory::GetInstance().CreateState(stateType, stateMachine); @@ -62,7 +63,7 @@ void DCameraSourceStateMachine::UpdateState(DCameraStateType stateType) int32_t DCameraSourceStateMachine::GetCameraState() { - DHLOGI("GetCameraState In state %d", currentState_->GetStateType()); + DHLOGI("GetCameraState In state %{public}d", currentState_->GetStateType()); return currentState_->GetStateType(); } } // namespace DistributedHardware diff --git a/services/channel/BUILD.gn b/services/channel/BUILD.gn index 4882381f2728c4d3b400696b049bbde5959901ad..3f93ac2ea0e0d3377e5e5372b82ae089dfe5a105 100644 --- a/services/channel/BUILD.gn +++ b/services/channel/BUILD.gn @@ -66,6 +66,7 @@ ohos_shared_library("distributed_camera_channel") { "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", + "hilog:libhilog", ] subsystem_name = "distributedhardware" diff --git a/services/channel/src/dcamera_channel_sink_impl.cpp b/services/channel/src/dcamera_channel_sink_impl.cpp index 846a33bf90c4d5e857cadb2c5be8281f9cdf9e8f..f90338ce9a2646f04485f623fbf7d72d740b8f04 100644 --- a/services/channel/src/dcamera_channel_sink_impl.cpp +++ b/services/channel/src/dcamera_channel_sink_impl.cpp @@ -35,14 +35,15 @@ DCameraChannelSinkImpl::~DCameraChannelSinkImpl() int32_t DCameraChannelSinkImpl::CloseSession() { - DHLOGI("DCameraChannelSinkImpl CloseSession name: %s", GetAnonyString(mySessionName_).c_str()); + DHLOGI("DCameraChannelSinkImpl CloseSession name: %{public}s", GetAnonyString(mySessionName_).c_str()); if (softbusSession_ == nullptr) { - DHLOGE("DCameraChannelSinkImpl CloseSession %s failed", GetAnonyString(mySessionName_).c_str()); + DHLOGE("DCameraChannelSinkImpl CloseSession %{public}s failed", GetAnonyString(mySessionName_).c_str()); return DCAMERA_BAD_OPERATE; } int32_t ret = softbusSession_->CloseSession(); if (ret != DCAMERA_OK) { - DHLOGE("DCameraChannelSinkImpl CloseSession %s ret: %d", GetAnonyString(mySessionName_).c_str(), ret); + DHLOGE("DCameraChannelSinkImpl CloseSession %{public}s ret: %{public}d", + GetAnonyString(mySessionName_).c_str(), ret); } return ret; @@ -55,7 +56,7 @@ int32_t DCameraChannelSinkImpl::CreateSession(std::vector& camInde return DCAMERA_BAD_VALUE; } if (softbusSession_ != nullptr) { - DHLOGI("DCameraChannelSinkImpl session has already create %s", sessionFlag.c_str()); + DHLOGI("DCameraChannelSinkImpl session has already create %{public}s", sessionFlag.c_str()); return DCAMERA_OK; } camIndexs_.assign(camIndexs.begin(), camIndexs.end()); @@ -66,31 +67,32 @@ int32_t DCameraChannelSinkImpl::CreateSession(std::vector& camInde DCameraSoftbusAdapter::GetInstance().GetLocalNetworkId(myDevId); std::string peerDevId = camIndexs[0].devId_; std::string peerSessionName = SESSION_HEAD + sessionFlag; - DHLOGI("DCameraChannelSinkImpl CreateSession Listen Start, devId: %s", GetAnonyString(myDevId).c_str()); + DHLOGI("DCameraChannelSinkImpl CreateSession Listen Start, devId: %{public}s", GetAnonyString(myDevId).c_str()); // sink_server_listen int32_t ret = DCameraSoftbusAdapter::GetInstance().CreatSoftBusSinkSocketServer(mySessionName_, DCAMERA_CHANNLE_ROLE_SINK, sessionMode, peerDevId, peerSessionName); if (ret != DCAMERA_OK) { - DHLOGE("DCameraChannelSinkImpl CreateSession Error, ret %d", ret); + DHLOGE("DCameraChannelSinkImpl CreateSession Error, ret %{public}d", ret); return ret; } softbusSession_ = std::make_shared(myDevId, mySessionName_, peerDevId, peerSessionName, listener, sessionMode); DCameraSoftbusAdapter::GetInstance().sinkSessions_[mySessionName_] = softbusSession_; - DHLOGI("DCameraChannelSinkImpl CreateSession Listen End, devId: %s", GetAnonyString(myDevId).c_str()); + DHLOGI("DCameraChannelSinkImpl CreateSession Listen End, devId: %{public}s", GetAnonyString(myDevId).c_str()); return DCAMERA_OK; } int32_t DCameraChannelSinkImpl::ReleaseSession() { - DHLOGI("DCameraChannelSinkImpl ReleaseSession name: %s", GetAnonyString(mySessionName_).c_str()); + DHLOGI("DCameraChannelSinkImpl ReleaseSession name: %{public}s", GetAnonyString(mySessionName_).c_str()); if (softbusSession_ == nullptr) { return DCAMERA_OK; } DCameraSoftbusAdapter::GetInstance().sinkSessions_.erase(softbusSession_->GetMySessionName()); int32_t ret = DCameraSoftbusAdapter::GetInstance().DestroySoftbusSessionServer(softbusSession_->GetMySessionName()); if (ret != DCAMERA_OK) { - DHLOGE("DCameraChannelSinkImpl ReleaseSession %s failed, ret: %d", GetAnonyString(mySessionName_).c_str(), ret); + DHLOGE("DCameraChannelSinkImpl ReleaseSession %{public}s failed, ret: %{public}d", + GetAnonyString(mySessionName_).c_str(), ret); } softbusSession_ = nullptr; return ret; @@ -99,12 +101,13 @@ int32_t DCameraChannelSinkImpl::ReleaseSession() int32_t DCameraChannelSinkImpl::SendData(std::shared_ptr& buffer) { if (softbusSession_ == nullptr) { - DHLOGE("DCameraChannelSinkImpl SendData %s failed", GetAnonyString(mySessionName_).c_str()); + DHLOGE("DCameraChannelSinkImpl SendData %{public}s failed", GetAnonyString(mySessionName_).c_str()); return DCAMERA_BAD_OPERATE; } int32_t ret = softbusSession_->SendData(mode_, buffer); if (ret != DCAMERA_OK) { - DHLOGE("DCameraChannelSinkImpl SendData %s failed, ret: %d", GetAnonyString(mySessionName_).c_str(), ret); + DHLOGE("DCameraChannelSinkImpl SendData %{public}s failed, ret: %{public}d", + GetAnonyString(mySessionName_).c_str(), ret); } return ret; } diff --git a/services/channel/src/dcamera_channel_source_impl.cpp b/services/channel/src/dcamera_channel_source_impl.cpp index bd426df5f5e77ac1a7a9f615383fb246aef5d0bd..d772283350660f55b2d1aa3e36edb504ae172291 100644 --- a/services/channel/src/dcamera_channel_source_impl.cpp +++ b/services/channel/src/dcamera_channel_source_impl.cpp @@ -34,17 +34,17 @@ DCameraChannelSourceImpl::~DCameraChannelSourceImpl() int32_t DCameraChannelSourceImpl::CloseSession() { - DHLOGI("DCameraChannelSourceImpl CloseSession name: %s", GetAnonyString(mySessionName_).c_str()); + DHLOGI("DCameraChannelSourceImpl CloseSession name: %{public}s", GetAnonyString(mySessionName_).c_str()); if (softbusSessions_.empty()) { - DHLOGE("DCameraChannelSourceImpl CloseSession %s failed", GetAnonyString(mySessionName_).c_str()); + DHLOGE("DCameraChannelSourceImpl CloseSession %{public}s failed", GetAnonyString(mySessionName_).c_str()); return DCAMERA_BAD_OPERATE; } int32_t ret = DCAMERA_OK; for (auto iter = softbusSessions_.begin(); iter != softbusSessions_.end(); iter++) { int32_t retOpen = (*iter)->CloseSession(); if (retOpen != DCAMERA_OK) { - DHLOGE("DCameraChannelSourceImpl CloseSession %s failed, ret: %d", GetAnonyString(mySessionName_).c_str(), - retOpen); + DHLOGE("DCameraChannelSourceImpl CloseSession %{public}s failed, ret: %{public}d", + GetAnonyString(mySessionName_).c_str(), retOpen); ret = DCAMERA_BAD_OPERATE; } } @@ -59,7 +59,7 @@ int32_t DCameraChannelSourceImpl::CreateSession(std::vector& camIn return DCAMERA_BAD_VALUE; } if (!softbusSessions_.empty()) { - DHLOGI("DCameraChannelSourceImpl session has already create %s", sessionFlag.c_str()); + DHLOGI("DCameraChannelSourceImpl session has already create %{public}s", sessionFlag.c_str()); return DCAMERA_OK; } camIndexs_.assign(camIndexs.begin(), camIndexs.end()); @@ -68,8 +68,8 @@ int32_t DCameraChannelSourceImpl::CreateSession(std::vector& camIn mode_ = sessionMode; std::string myDevId; DCameraSoftbusAdapter::GetInstance().GetLocalNetworkId(myDevId); - DHLOGI("DCameraChannelSourceImpl CreateSession Start, name: %s devId: %s", GetAnonyString(mySessionName_).c_str(), - GetAnonyString(myDevId).c_str()); + DHLOGI("DCameraChannelSourceImpl CreateSession Start, name: %{public}s devId: %{public}s", + GetAnonyString(mySessionName_).c_str(), GetAnonyString(myDevId).c_str()); for (auto iter = camIndexs.begin(); iter != camIndexs.end(); iter++) { std::string peerDevId = (*iter).devId_; std::string peerSessionName = SESSION_HEAD + (*iter).dhId_ + std::string("_") + sessionFlag; @@ -77,7 +77,7 @@ int32_t DCameraChannelSourceImpl::CreateSession(std::vector& camIn int32_t ret = DCameraSoftbusAdapter::GetInstance().CreateSoftBusSourceSocketClient(myDevId, peerSessionName, peerDevId, sessionMode, DCAMERA_CHANNLE_ROLE_SOURCE); if (ret != DCAMERA_OK) { - DHLOGE("DCameraChannelSourceImpl CreateSession failed, ret: %d", ret); + DHLOGE("DCameraChannelSourceImpl CreateSession failed, ret: %{public}d", ret); return ret; } int32_t sourceSocket = DCameraSoftbusAdapter::GetInstance().GetSourceSocketId(); @@ -94,7 +94,7 @@ int32_t DCameraChannelSourceImpl::CreateSession(std::vector& camIn int32_t DCameraChannelSourceImpl::ReleaseSession() { - DHLOGI("DCameraChannelSourceImpl ReleaseSession name: %s", GetAnonyString(mySessionName_).c_str()); + DHLOGI("DCameraChannelSourceImpl ReleaseSession name: %{public}s", GetAnonyString(mySessionName_).c_str()); for (auto iter = softbusSessions_.begin(); iter != softbusSessions_.end(); iter++) { std::string sessKey = (*iter)->GetPeerDevId() + (*iter)->GetPeerSessionName(); DCameraSoftbusAdapter::GetInstance().sourceSessions_.erase(sessKey); @@ -102,8 +102,8 @@ int32_t DCameraChannelSourceImpl::ReleaseSession() std::vector>().swap(softbusSessions_); int32_t ret = DCameraSoftbusAdapter::GetInstance().DestroySoftbusSessionServer(mySessionName_); if (ret != DCAMERA_OK) { - DHLOGE("DCameraChannelSourceImpl ReleaseSession %s failed, ret: %d", GetAnonyString(mySessionName_).c_str(), - ret); + DHLOGE("DCameraChannelSourceImpl ReleaseSession %{public}s failed, ret: %{public}d", + GetAnonyString(mySessionName_).c_str(), ret); } return ret; } @@ -111,15 +111,15 @@ int32_t DCameraChannelSourceImpl::ReleaseSession() int32_t DCameraChannelSourceImpl::SendData(std::shared_ptr& buffer) { if (softbusSessions_.empty()) { - DHLOGE("DCameraChannelSourceImpl SendData %s failed", GetAnonyString(mySessionName_).c_str()); + DHLOGE("DCameraChannelSourceImpl SendData %{public}s failed", GetAnonyString(mySessionName_).c_str()); return DCAMERA_BAD_OPERATE; } int32_t ret = DCAMERA_OK; for (auto iter = softbusSessions_.begin(); iter != softbusSessions_.end(); iter++) { int32_t retSend = (*iter)->SendData(mode_, buffer); if (retSend != DCAMERA_OK) { - DHLOGE("DCameraChannelSourceImpl SendData %s failed, ret: %d", GetAnonyString(mySessionName_).c_str(), - retSend); + DHLOGE("DCameraChannelSourceImpl SendData %{public}s failed, ret: %{public}d", + GetAnonyString(mySessionName_).c_str(), retSend); ret = DCAMERA_BAD_OPERATE; } } diff --git a/services/channel/src/dcamera_low_latency.cpp b/services/channel/src/dcamera_low_latency.cpp index f62a0cf9388048f86c17220b287bce526b34acd1..9c80cd851cb97515e95db3ed7d0640b8548cd84b 100644 --- a/services/channel/src/dcamera_low_latency.cpp +++ b/services/channel/src/dcamera_low_latency.cpp @@ -30,7 +30,7 @@ int32_t DCameraLowLatency::EnableLowLatency() DHLOGD("Enable low latency start."); if (refCount_ > REF_INITIAL) { refCount_++; - DHLOGD("No need to enable low latency, refCount just plus one and now is: %d.", refCount_.load()); + DHLOGD("No need to enable low latency, refCount just plus one and now is: %{public}d.", refCount_.load()); return DCAMERA_OK; } std::shared_ptr dHFwkKit = GetDHFwkKit(); @@ -66,7 +66,7 @@ int32_t DCameraLowLatency::DisableLowLatency() } if (refCount_ > REF_NORMAL) { refCount_--; - DHLOGD("No need to disable low latency, refCount just minus one and now is: %d.", refCount_.load()); + DHLOGD("No need to disable low latency, refCount just minus one and now is: %{public}d.", refCount_.load()); return DCAMERA_OK; } std::shared_ptr dHFwkKit = GetDHFwkKit(); diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index df69cfc52e7b5314e00f7a867758f9bc11f0591f..96a4be39e4b364958a41426c39cacbd01324ec06 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -131,7 +131,7 @@ DCameraSoftbusAdapter::~DCameraSoftbusAdapter() int32_t DCameraSoftbusAdapter::CreatSoftBusSinkSocketServer(std::string mySessionName, DCAMERA_CHANNEL_ROLE role, DCameraSessionMode sessionMode, std::string peerDevId, std::string peerSessionName) { - DHLOGI("create socket server start, mySessionName: %s,peerSessionName: %s", + DHLOGI("create socket server start, mySessionName: %{public}s,peerSessionName: %{public}s", GetAnonyString(mySessionName).c_str(), GetAnonyString(peerSessionName).c_str()); { std::lock_guard autoLock(mySessionNameLock_); @@ -164,7 +164,7 @@ int32_t DCameraSoftbusAdapter::CreatSoftBusSinkSocketServer(std::string mySessio std::string peerDevIdMySessionName = peerDevId + std::string("_") + mySessionName; peerDevIdMySessionNameMap_[peerDevIdMySessionName] = mySessionName; } - DHLOGI("create socket server end, mySessionName: %s, peerSessionName: %s", + DHLOGI("create socket server end, mySessionName: %{public}s, peerSessionName: %{public}s", GetAnonyString(mySessionName).c_str(), GetAnonyString(peerSessionName).c_str()); return DCAMERA_OK; } @@ -172,7 +172,7 @@ int32_t DCameraSoftbusAdapter::CreatSoftBusSinkSocketServer(std::string mySessio int32_t DCameraSoftbusAdapter::CreateSoftBusSourceSocketClient(std::string myDevId, std::string peerSessionName, std::string peerDevId, DCameraSessionMode sessionMode, DCAMERA_CHANNEL_ROLE role) { - DHLOGI("create socket client start, myDevId: %s, peerSessionName: %s", + DHLOGI("create socket client start, myDevId: %{public}s, peerSessionName: %{public}s", GetAnonyString(myDevId).c_str(), GetAnonyString(peerSessionName).c_str()); std::string myDevIdPeerSessionName = myDevId + std::string("_") + peerSessionName; SocketInfo clientSocketInfo = { @@ -194,7 +194,7 @@ int32_t DCameraSoftbusAdapter::CreateSoftBusSourceSocketClient(std::string myDev return DCAMERA_BAD_VALUE; } sourceSocketId_ = socketId; - DHLOGI("create socket client end, myDevId: %s, peerSessionName: %s", + DHLOGI("create socket client end, myDevId: %{public}s, peerSessionName: %{public}s", GetAnonyString(myDevId).c_str(), GetAnonyString(peerSessionName).c_str()); return DCAMERA_OK; } @@ -203,12 +203,12 @@ int32_t DCameraSoftbusAdapter::DestroySoftbusSessionServer(std::string sessionNa { std::lock_guard autoLock(optLock_); if (sessionTotal_.find(sessionName) == sessionTotal_.end()) { - DHLOGI("current sessionName already destroy, sessionName: %s", GetAnonyString(sessionName).c_str()); + DHLOGI("current sessionName already destroy, sessionName: %{public}s", GetAnonyString(sessionName).c_str()); return DCAMERA_OK; } sessionTotal_[sessionName]--; - DHLOGI("sessionName destroy %s totalnum: %d", GetAnonyString(sessionName).c_str(), + DHLOGI("sessionName destroy %{public}s totalnum: %{public}d", GetAnonyString(sessionName).c_str(), sessionTotal_[sessionName]); uint32_t total_ = sessionTotal_[sessionName]; if (total_ == 0) { @@ -219,7 +219,7 @@ int32_t DCameraSoftbusAdapter::DestroySoftbusSessionServer(std::string sessionNa int32_t DCameraSoftbusAdapter::CloseSoftbusSession(int32_t socket) { - DHLOGI("Shutdown softbus socket start: %d", socket); + DHLOGI("Shutdown softbus socket start: %{public}d", socket); Shutdown(socket); // shutdown socket { std::lock_guard autoLock(idMapLock_); @@ -233,7 +233,7 @@ int32_t DCameraSoftbusAdapter::CloseSoftbusSession(int32_t socket) std::lock_guard autoLock(sourceSocketLock_); sourceSocketSessionMap_.erase(socket); } - DHLOGI("Shutdown softbus socket: %d end", socket); + DHLOGI("Shutdown softbus socket: %{public}d end", socket); return DCAMERA_OK; } @@ -247,23 +247,23 @@ int32_t DCameraSoftbusAdapter::SendSofbusStream(int32_t socket, std::shared_ptr< StreamData streamData = { reinterpret_cast(buffer->Data()), buffer->Size() }; int64_t timeStamp; if (!buffer->FindInt64(TIME_STAMP_US, timeStamp)) { - DHLOGD("SendSofbusStream find %s failed.", TIME_STAMP_US.c_str()); + DHLOGD("SendSofbusStream find %{public}s failed.", TIME_STAMP_US.c_str()); } int32_t frameType; if (!buffer->FindInt32(FRAME_TYPE, frameType)) { - DHLOGD("SendSofbusStream find %s failed.", FRAME_TYPE.c_str()); + DHLOGD("SendSofbusStream find %{public}s failed.", FRAME_TYPE.c_str()); } int32_t index; if (!buffer->FindInt32(INDEX, index)) { - DHLOGD("SendSofbusStream find %s failed.", INDEX.c_str()); + DHLOGD("SendSofbusStream find %{public}s failed.", INDEX.c_str()); } int64_t startEncodeT; if (!buffer->FindInt64(START_ENCODE_TIME_US, startEncodeT)) { - DHLOGD("SendSofbusStream find %s failed.", START_ENCODE_TIME_US.c_str()); + DHLOGD("SendSofbusStream find %{public}s failed.", START_ENCODE_TIME_US.c_str()); } int64_t finishEncodeT; if (!buffer->FindInt64(FINISH_ENCODE_TIME_US, finishEncodeT)) { - DHLOGD("SendSofbusStream find %s failed.", FINISH_ENCODE_TIME_US.c_str()); + DHLOGD("SendSofbusStream find %{public}s failed.", FINISH_ENCODE_TIME_US.c_str()); } std::string jsonStr = ""; DCameraSinkFrameInfo sinkFrameInfo; @@ -278,7 +278,7 @@ int32_t DCameraSoftbusAdapter::SendSofbusStream(int32_t socket, std::shared_ptr< StreamFrameInfo param = { 0 }; int32_t ret = SendStream(socket, &streamData, &ext, ¶m); if (ret != SOFTBUS_OK) { - DHLOGD("SendSofbusStream failed, ret is %d", ret); + DHLOGD("SendSofbusStream failed, ret is %{public}d", ret); return DCAMERA_BAD_VALUE; } return DCAMERA_OK; @@ -287,11 +287,11 @@ int32_t DCameraSoftbusAdapter::SendSofbusStream(int32_t socket, std::shared_ptr< int32_t DCameraSoftbusAdapter::DCameraSoftbusGetSessionById(int32_t sessionId, std::shared_ptr& session) { - DHLOGI("get softbus session by sessionId: %d", sessionId); + DHLOGI("get softbus session by sessionId: %{public}d", sessionId); std::lock_guard autoLock(idMapLock_); auto iter = sessionIdMap_.find(sessionId); if (iter == sessionIdMap_.end()) { - DHLOGE("get softbus session by id not find session %d", sessionId); + DHLOGE("get softbus session by id not find session %{public}d", sessionId); return DCAMERA_NOT_FOUND; } session = iter->second; @@ -304,7 +304,7 @@ int32_t DCameraSoftbusAdapter::DCameraSoftbusSourceGetSession(int32_t socket, std::lock_guard autoLock(sourceSocketLock_); auto iter = sourceSocketSessionMap_.find(socket); if (iter == sourceSocketSessionMap_.end()) { - DHLOGE("source can not find current socket %d", socket); + DHLOGE("source can not find current socket %{public}d", socket); return DCAMERA_NOT_FOUND; } session = iter->second; @@ -314,32 +314,32 @@ int32_t DCameraSoftbusAdapter::DCameraSoftbusSourceGetSession(int32_t socket, // source int32_t DCameraSoftbusAdapter::SourceOnBind(int32_t socket, PeerSocketInfo info) { - DHLOGI("source bind socket begin, socket: %d", socket); + DHLOGI("source bind socket begin, socket: %{public}d", socket); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusSourceGetSession(socket, session); if (ret != DCAMERA_OK) { - DHLOGE("source bind socket can not find socket %d", socket); + DHLOGE("source bind socket can not find socket %{public}d", socket); return DCAMERA_NOT_FOUND; } ret = session->OnSessionOpened(socket); if (ret != DCAMERA_OK) { - DHLOGE("source bind socket failed, ret: %d socket: %d", ret, socket); + DHLOGE("source bind socket failed, ret: %{public}d socket: %{public}d", ret, socket); } else { std::lock_guard autoLock(idMapLock_); sessionIdMap_.emplace(socket, session); } - DHLOGI("source bind socket end, socket: %d end", socket); + DHLOGI("source bind socket end, socket: %{public}d end", socket); return ret; } void DCameraSoftbusAdapter::SourceOnShutDown(int32_t socket, ShutdownReason reason) { - DHLOGI("source on shutdown socket start, socket: %d", socket); + DHLOGI("source on shutdown socket start, socket: %{public}d", socket); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusGetSessionById(socket, session); if (ret != DCAMERA_OK) { - DHLOGE("SourceOnShutDown can not find socket %d", socket); + DHLOGE("SourceOnShutDown can not find socket %{public}d", socket); return; } { @@ -347,32 +347,32 @@ void DCameraSoftbusAdapter::SourceOnShutDown(int32_t socket, ShutdownReason reas sessionIdMap_.erase(socket); } session->OnSessionClose(socket); - DHLOGI("source on shutdown socket end socket: %d end", socket); + DHLOGI("source on shutdown socket end socket: %{public}d end", socket); return; } void DCameraSoftbusAdapter::SourceOnBytes(int32_t socket, const void *data, uint32_t dataLen) { if (dataLen == 0 || dataLen > DCAMERA_MAX_RECV_DATA_LEN || data == nullptr) { - DHLOGE("source callback send bytes error, dataLen: %d, socket: %d", dataLen, socket); + DHLOGE("source callback send bytes error, dataLen: %{public}d, socket: %{public}d", dataLen, socket); return; } - DHLOGI("source callback send bytes start, socket: %d", socket); + DHLOGI("source callback send bytes start, socket: %{public}d", socket); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusSourceGetSession(socket, session); if (ret != DCAMERA_OK) { - DHLOGE("source callback send bytes not find session %d", socket); + DHLOGE("source callback send bytes not find session %{public}d", socket); return; } std::shared_ptr buffer = std::make_shared(dataLen); ret = memcpy_s(buffer->Data(), buffer->Capacity(), data, dataLen); if (ret != EOK) { - DHLOGE("source callback send bytes memcpy_s failed ret: %d", ret); + DHLOGE("source callback send bytes memcpy_s failed ret: %{public}d", ret); return; } session->OnDataReceived(buffer); - DHLOGI("source callback send bytes end, socket: %d", socket); + DHLOGI("source callback send bytes end, socket: %{public}d", socket); return; } @@ -389,18 +389,18 @@ void DCameraSoftbusAdapter::SourceOnStream(int32_t socket, const StreamData *dat { int64_t recvT = GetNowTimeStampUs(); if (data == nullptr) { - DHLOGE("SourceOnStream Error, data is null, socket: %d.", socket); + DHLOGE("SourceOnStream Error, data is null, socket: %{public}d.", socket); return; } int32_t dataLen = data->bufLen; if (dataLen <= 0 || dataLen > static_cast(DCAMERA_MAX_RECV_DATA_LEN)) { - DHLOGE("SourceOnStream Error, dataLen: %d, socket: %d", dataLen, socket); + DHLOGE("SourceOnStream Error, dataLen: %{public}d, socket: %{public}d", dataLen, socket); return; } std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusSourceGetSession(socket, session); if (ret != DCAMERA_OK) { - DHLOGE("SourceOnStream not find socket %d", socket); + DHLOGE("SourceOnStream not find socket %{public}d", socket); return; } @@ -408,12 +408,12 @@ void DCameraSoftbusAdapter::SourceOnStream(int32_t socket, const StreamData *dat buffer->SetInt64(RECV_TIME_US, recvT); ret = memcpy_s(buffer->Data(), buffer->Capacity(), reinterpret_cast(data->buf), data->bufLen); if (ret != EOK) { - DHLOGE("SourceOnStream memcpy_s failed ret: %d", ret); + DHLOGE("SourceOnStream memcpy_s failed ret: %{public}d", ret); return; } ret = HandleSourceStreamExt(buffer, ext); if (ret != DCAMERA_OK) { - DHLOGE("Handle source stream ext failed, ret is: %d", ret); + DHLOGE("Handle source stream ext failed, ret is: %{public}d", ret); } session->OnDataReceived(buffer); } @@ -426,7 +426,7 @@ int32_t DCameraSoftbusAdapter::HandleSourceStreamExt(std::shared_ptr } int32_t extLen = ext->bufLen; if (extLen <= 0 || extLen > DCAMERA_MAX_RECV_EXT_LEN) { - DHLOGD("ExtLen is: %d.", extLen); + DHLOGD("ExtLen is: %{public}d.", extLen); return DCAMERA_BAD_VALUE; } @@ -439,7 +439,7 @@ int32_t DCameraSoftbusAdapter::HandleSourceStreamExt(std::shared_ptr } int64_t recvT; if (!buffer->FindInt64(RECV_TIME_US, recvT)) { - DHLOGD("HandleSourceStreamExt find %s failed.", RECV_TIME_US.c_str()); + DHLOGD("HandleSourceStreamExt find %{public}s failed.", RECV_TIME_US.c_str()); } DCameraFrameInfo frameInfo; frameInfo.type = sinkFrameInfo.type_; @@ -474,12 +474,12 @@ void DCameraSoftbusAdapter::RecordSourceSocketSession(int32_t socket, std::share int32_t DCameraSoftbusAdapter::DCameraSoftbusSinkGetSession(int32_t socket, std::shared_ptr& session) { - DHLOGI("sink find session start, socket: %d", socket); + DHLOGI("sink find session start, socket: %{public}d", socket); { std::lock_guard autoLock(sinkSocketLock_); auto iter = sinkSocketSessionMap_.find(socket); if (iter == sinkSocketSessionMap_.end()) { - DHLOGE("sink can not find socket %d", socket); + DHLOGE("sink can not find socket %{public}d", socket); return DCAMERA_NOT_FOUND; } session = iter->second; @@ -488,27 +488,27 @@ int32_t DCameraSoftbusAdapter::DCameraSoftbusSinkGetSession(int32_t socket, return DCAMERA_BAD_VALUE; } } - DHLOGI("sink find session end, socket: %d", socket); + DHLOGI("sink find session end, socket: %{public}d", socket); return DCAMERA_OK; } int32_t DCameraSoftbusAdapter::DCameraSoftBusGetSessionByPeerSocket(int32_t socket, std::shared_ptr &session, PeerSocketInfo info) { - DHLOGI("find session by peer socket start, socket %d", socket); + DHLOGI("find session by peer socket start, socket %{public}d", socket); std::string mySessionName = ""; { std::lock_guard autoLock(mySessionNamePeerDevIdLock_); auto sessionNameIter = peerDevIdMySessionNameMap_.find(info.name); if (sessionNameIter == peerDevIdMySessionNameMap_.end()) { - DHLOGE("find session by peer socket error, socket %d", socket); + DHLOGE("find session by peer socket error, socket %{public}d", socket); return DCAMERA_NOT_FOUND; } mySessionName = sessionNameIter->second; } auto iter = sinkSessions_.find(std::string(mySessionName)); if (iter == sinkSessions_.end()) { - DHLOGE("find session by peer socket error, mySessionName %s", + DHLOGE("find session by peer socket error, mySessionName %{public}s", GetAnonyString(mySessionName).c_str()); return DCAMERA_NOT_FOUND; } @@ -517,39 +517,39 @@ int32_t DCameraSoftbusAdapter::DCameraSoftBusGetSessionByPeerSocket(int32_t sock std::lock_guard autoLock(sinkSocketLock_); sinkSocketSessionMap_[socket] = session; } - DHLOGI("find session by peer socket end, socket %d", socket); + DHLOGI("find session by peer socket end, socket %{public}d", socket); return DCAMERA_OK; } // sink int32_t DCameraSoftbusAdapter::SinkOnBind(int32_t socket, PeerSocketInfo info) { - DHLOGI("sink bind socket start, socket: %d", socket); + DHLOGI("sink bind socket start, socket: %{public}d", socket); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftBusGetSessionByPeerSocket(socket, session, info); if (ret != DCAMERA_OK) { - DHLOGE("sink bind socket error, can not find socket %d", socket); + DHLOGE("sink bind socket error, can not find socket %{public}d", socket); return DCAMERA_NOT_FOUND; } ret = session->OnSessionOpened(socket); if (ret != DCAMERA_OK) { - DHLOGE("sink bind socket error, not find socket %d", socket); + DHLOGE("sink bind socket error, not find socket %{public}d", socket); } else { std::lock_guard autoLock(idMapLock_); sessionIdMap_.emplace(socket, session); } - DHLOGI("sink bind socket end, socket: %d", socket); + DHLOGI("sink bind socket end, socket: %{public}d", socket); return ret; } void DCameraSoftbusAdapter::SinkOnShutDown(int32_t socket, ShutdownReason reason) { - DHLOGI("sink on shutdown socket start, socket: %d", socket); + DHLOGI("sink on shutdown socket start, socket: %{public}d", socket); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusGetSessionById(socket, session); if (ret != DCAMERA_OK) { - DHLOGE("sink on shutdown socket can not find socket %d", socket); + DHLOGE("sink on shutdown socket can not find socket %{public}d", socket); return; } { @@ -557,31 +557,31 @@ void DCameraSoftbusAdapter::SinkOnShutDown(int32_t socket, ShutdownReason reason sessionIdMap_.erase(socket); } session->OnSessionClose(socket); - DHLOGI("sink on shutdown socket end, socket: %d", socket); + DHLOGI("sink on shutdown socket end, socket: %{public}d", socket); return; } void DCameraSoftbusAdapter::SinkOnBytes(int32_t socket, const void *data, uint32_t dataLen) { if (dataLen == 0 || dataLen > DCAMERA_MAX_RECV_DATA_LEN || data == nullptr) { - DHLOGE("sink on bytes error, dataLen: %d, socket: %d", dataLen, socket); + DHLOGE("sink on bytes error, dataLen: %{public}d, socket: %{public}d", dataLen, socket); return; } - DHLOGI("sink on bytes start, socket: %d", socket); + DHLOGI("sink on bytes start, socket: %{public}d", socket); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusSinkGetSession(socket, session); if (ret != DCAMERA_OK) { - DHLOGE("sink on bytes error, can not find session %d", socket); + DHLOGE("sink on bytes error, can not find session %{public}d", socket); return; } std::shared_ptr buffer = std::make_shared(dataLen); ret = memcpy_s(buffer->Data(), buffer->Capacity(), data, dataLen); if (ret != EOK) { - DHLOGE("sink on bytes memcpy_s failed ret: %d", ret); + DHLOGE("sink on bytes memcpy_s failed ret: %{public}d", ret); return; } session->OnDataReceived(buffer); - DHLOGI("sink on bytes end, socket: %d", socket); + DHLOGI("sink on bytes end, socket: %{public}d", socket); return; } @@ -594,25 +594,25 @@ void DCameraSoftbusAdapter::SinkOnStream(int32_t socket, const StreamData *data, const StreamFrameInfo *param) { if (data == nullptr) { - DHLOGE("SinkOnStream error, data is null, socket: %d.", socket); + DHLOGE("SinkOnStream error, data is null, socket: %{public}d.", socket); return; } int32_t dataLen = data->bufLen; if (dataLen <= 0 || dataLen > static_cast(DCAMERA_MAX_RECV_DATA_LEN)) { - DHLOGE("SinkOnStream error, dataLen: %d socket: %d", dataLen, socket); + DHLOGE("SinkOnStream error, dataLen: %{public}d socket: %{public}d", dataLen, socket); return; } std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusSinkGetSession(socket, session); if (ret != DCAMERA_OK) { - DHLOGE("SinkOnStream error, can not find socket %d", socket); + DHLOGE("SinkOnStream error, can not find socket %{public}d", socket); return; } std::shared_ptr buffer = std::make_shared(data->bufLen); ret = memcpy_s(buffer->Data(), buffer->Capacity(), reinterpret_cast(data->buf), data->bufLen); if (ret != EOK) { - DHLOGE("SinkOnStream error, memcpy_s failed ret: %d", ret); + DHLOGE("SinkOnStream error, memcpy_s failed ret: %{public}d", ret); return; } session->OnDataReceived(buffer); @@ -624,7 +624,7 @@ int32_t DCameraSoftbusAdapter::GetLocalNetworkId(std::string& myDevId) NodeBasicInfo basicInfo = { { 0 } }; int32_t ret = GetLocalNodeDeviceInfo(PKG_NAME.c_str(), &basicInfo); if (ret != DCAMERA_OK) { - DHLOGE("GetLocalNodeDeviceInfo failed ret: %d", ret); + DHLOGE("GetLocalNodeDeviceInfo failed ret: %{public}d", ret); return ret; } diff --git a/services/channel/src/dcamera_softbus_latency.cpp b/services/channel/src/dcamera_softbus_latency.cpp index 81d11ba6d7b0ff322e0f1c8fefc8bfb43f7745ad..81d3bfa43143eeb22589afb782ac9f3ceb52c2e9 100644 --- a/services/channel/src/dcamera_softbus_latency.cpp +++ b/services/channel/src/dcamera_softbus_latency.cpp @@ -31,8 +31,8 @@ constexpr static int32_t MICROSECONDS = 1000; static void OnTimeSyncResult(const TimeSyncResultInfo *info, int32_t retCode) { int32_t microsecond = info->result.millisecond * MICROSECONDS + info->result.microsecond; - DHLOGD("DCameraSoftbusLatency OnTimeSyncResult retcode %d, millisecond: %d, microsecond %d microsecond_ %d", - retCode, info->result.millisecond, info->result.microsecond, microsecond); + DHLOGD("DCameraSoftbusLatency OnTimeSyncResult retcode %{public}d, millisecond: %{public}d, microsecond %{public}d " + "microsecond_ %{public}d", retCode, info->result.millisecond, info->result.microsecond, microsecond); DCameraSoftbusLatency::GetInstance().SetTimeSyncInfo(microsecond, info->target.targetNetworkId); } @@ -43,7 +43,7 @@ int32_t DCameraSoftbusLatency::StartSoftbusTimeSync(const std::string& devId) std::lock_guard lock(micLock_); if (refCount_[devId] > REF_INITIAL) { refCount_[devId]++; - DHLOGD("No need to start time offset, refCount just plus one and now is: %d.", refCount_[devId]); + DHLOGD("No need to start time offset, refCount just plus one and now is: %{public}d.", refCount_[devId]); return DCAMERA_OK; } } @@ -52,7 +52,7 @@ int32_t DCameraSoftbusLatency::StartSoftbusTimeSync(const std::string& devId) int32_t ret = StartTimeSync(DCAMERA_PKG_NAME.c_str(), devId.c_str(), LOW_ACCURACY, NORMAL_PERIOD, &timeSyncCb); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusLatency:: StartSoftbusTimeSync failed networkId %s", devId.c_str()); + DHLOGE("DCameraSoftbusLatency:: StartSoftbusTimeSync failed networkId %{public}s", devId.c_str()); } { std::lock_guard lock(micLock_); @@ -74,13 +74,13 @@ int32_t DCameraSoftbusLatency::StopSoftbusTimeSync(const std::string& devId) } if (refCount_[devId] > REF_NORMAL) { refCount_[devId]--; - DHLOGD("No need to stop time offset, refCount just minus one and now is: %d.", refCount_[devId]); + DHLOGD("No need to stop time offset, refCount just minus one and now is: %{public}d.", refCount_[devId]); return DCAMERA_OK; } } int32_t ret = StopTimeSync(DCAMERA_PKG_NAME.c_str(), devId.c_str()); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusLatency:: StopSoftbusTimeSync failed ret:%d", ret); + DHLOGE("DCameraSoftbusLatency:: StopSoftbusTimeSync failed ret:%{public}d", ret); } { std::lock_guard lock(micLock_); diff --git a/services/channel/src/dcamera_softbus_session.cpp b/services/channel/src/dcamera_softbus_session.cpp index c749927732b9a5063690106fbbacf9764a9aeb60..d3c4f23741ca7aa5d7bbbbd0f1c65db77a089d5f 100644 --- a/services/channel/src/dcamera_softbus_session.cpp +++ b/services/channel/src/dcamera_softbus_session.cpp @@ -52,8 +52,9 @@ DCameraSoftbusSession::~DCameraSoftbusSession() if (sessionId_ != -1) { int32_t ret = DCameraSoftbusAdapter::GetInstance().CloseSoftbusSession(sessionId_); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusSession delete failed, ret: %d, sessId: %d peerDevId: %s peerSessionName: %s", ret, - sessionId_, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); + DHLOGE("DCameraSoftbusSession delete failed, ret: %{public}d, sessId: %{public}d peerDevId: %{public}s " + "peerSessionName: %{public}s", ret, sessionId_, GetAnonyString(peerDevId_).c_str(), + GetAnonyString(peerSessionName_).c_str()); } } sendFuncMap_.clear(); @@ -62,16 +63,16 @@ DCameraSoftbusSession::~DCameraSoftbusSession() int32_t DCameraSoftbusSession::CloseSession() { - DHLOGI("close session sessionId: %d peerDevId: %s peerSessionName: %s", sessionId_, + DHLOGI("close session sessionId: %{public}d peerDevId: %{public}s peerSessionName: %{public}s", sessionId_, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); if (sessionId_ == -1) { - DHLOGI("current session has already close peerDevId: %s peerSessionName: %s", + DHLOGI("current session has already close peerDevId: %{public}s peerSessionName: %{public}s", GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); return DCAMERA_OK; } int32_t ret = DCameraSoftbusAdapter::GetInstance().CloseSoftbusSession(sessionId_); if (ret != DCAMERA_OK) { - DHLOGE("close session failed, ret: %d, peerDevId: %s peerSessionName: %s", ret, + DHLOGE("close session failed, ret: %{public}d, peerDevId: %{public}s peerSessionName: %{public}s", ret, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); return ret; } @@ -83,17 +84,17 @@ int32_t DCameraSoftbusSession::CloseSession() int32_t DCameraSoftbusSession::OnSessionOpened(int32_t socket) { - DHLOGI("open current session start, socket: %d", socket); + DHLOGI("open current session start, socket: %{public}d", socket); sessionId_ = socket; state_ = DCAMERA_SOFTBUS_STATE_OPENED; listener_->OnSessionState(DCAMERA_CHANNEL_STATE_CONNECTED); - DHLOGI("open current session end, socket: %d", socket); + DHLOGI("open current session end, socket: %{public}d", socket); return DCAMERA_OK; } int32_t DCameraSoftbusSession::OnSessionClose(int32_t sessionId) { - DHLOGI("OnSessionClose sessionId: %d peerDevId: %s peerSessionName: %s", sessionId, + DHLOGI("OnSessionClose sessionId: %{public}d peerDevId: %{public}s peerSessionName: %{public}s", sessionId, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); sessionId_ = -1; state_ = DCAMERA_SOFTBUS_STATE_CLOSED; @@ -124,9 +125,11 @@ void DCameraSoftbusSession::DealRecvData(std::shared_ptr& buffer) void DCameraSoftbusSession::PackRecvData(std::shared_ptr& buffer) { + uint64_t bufferSize; if (buffer->Size() < BINARY_HEADER_FRAG_LEN) { - DHLOGE("pack recv data error, size: %d, sess: %s peerSess: %s", - buffer->Size(), mySessionName_.c_str(), peerSessionName_.c_str()); + bufferSize = static_cast(buffer->Size()); + DHLOGE("pack recv data error, size: %{public}" PRIu64", sess: %{public}s peerSess: %{public}s", + bufferSize, mySessionName_.c_str(), peerSessionName_.c_str()); return; } uint8_t *ptrPacket = buffer->Data(); @@ -134,33 +137,38 @@ void DCameraSoftbusSession::PackRecvData(std::shared_ptr& buffer) GetFragDataLen(ptrPacket, headerPara); if (buffer->Size() != (headerPara.dataLen + BINARY_HEADER_FRAG_LEN) || headerPara.dataLen > headerPara.totalLen || headerPara.dataLen > BINARY_DATA_MAX_LEN || headerPara.totalLen > BINARY_DATA_MAX_TOTAL_LEN) { - DHLOGE("pack recv data failed, size: %d, dataLen: %d, totalLen: %d sess: %s peerSess: %s", - buffer->Size(), headerPara.dataLen, headerPara.totalLen, mySessionName_.c_str(), peerSessionName_.c_str()); + bufferSize = static_cast(buffer->Size()); + DHLOGE("pack recv data failed, size: %{public}" PRIu64", dataLen: %{public}d, totalLen: %{public}d sess: " + "%{public}s peerSess: %{public}s", bufferSize, headerPara.dataLen, headerPara.totalLen, + mySessionName_.c_str(), peerSessionName_.c_str()); return; } - DHLOGD("pack recv data Assemble, size: %d, dataLen: %d, totalLen: %d, nowTime: %lld start", - buffer->Size(), headerPara.dataLen, headerPara.totalLen, GetNowTimeStampUs()); + bufferSize = static_cast(buffer->Size()); + DHLOGD("pack recv data Assemble, size: %{public}" PRIu64", dataLen: %{public}d, totalLen: %{public}d, nowTime: " + "%{public}" PRId64" start", bufferSize, headerPara.dataLen, headerPara.totalLen, GetNowTimeStampUs()); if (headerPara.fragFlag == FRAG_START_END) { AssembleNoFrag(buffer, headerPara); } else { AssembleFrag(buffer, headerPara); } - DHLOGD("pack recv data Assemble, size: %d, dataLen: %d, totalLen: %d, nowTime: %lld end", - buffer->Size(), headerPara.dataLen, headerPara.totalLen, GetNowTimeStampUs()); + bufferSize = static_cast(buffer->Size()); + DHLOGD("pack recv data Assemble, size: %{public}" PRIu64", dataLen: %{public}d, totalLen: %{public}d, nowTime: " + "%{public}" PRId64" end", bufferSize, headerPara.dataLen, headerPara.totalLen, GetNowTimeStampUs()); } void DCameraSoftbusSession::AssembleNoFrag(std::shared_ptr& buffer, SessionDataHeader& headerPara) { if (headerPara.dataLen != headerPara.totalLen) { - DHLOGE("DCameraSoftbusSession PackRecvData failed, dataLen: %d, totalLen: %d, sess: %s peerSess: %s", - headerPara.dataLen, headerPara.totalLen, mySessionName_.c_str(), peerSessionName_.c_str()); + DHLOGE("DCameraSoftbusSession PackRecvData failed, dataLen: %{public}d, totalLen: %{public}d, sess: " + "%{public}s peerSess: %{public}s", headerPara.dataLen, headerPara.totalLen, mySessionName_.c_str(), + peerSessionName_.c_str()); return; } std::shared_ptr postData = std::make_shared(headerPara.dataLen); int32_t ret = memcpy_s(postData->Data(), postData->Size(), buffer->Data() + BINARY_HEADER_FRAG_LEN, buffer->Size() - BINARY_HEADER_FRAG_LEN); if (ret != EOK) { - DHLOGE("DCameraSoftbusSession PackRecvData failed, ret: %d, sess: %s peerSess: %s", + DHLOGE("DCameraSoftbusSession PackRecvData failed, ret: %{public}d, sess: %{public}s peerSess: %{public}s", ret, mySessionName_.c_str(), peerSessionName_.c_str()); return; } @@ -179,7 +187,7 @@ void DCameraSoftbusSession::AssembleFrag(std::shared_ptr& buffer, Se int32_t ret = memcpy_s(packBuffer_->Data(), packBuffer_->Size(), buffer->Data() + BINARY_HEADER_FRAG_LEN, buffer->Size() - BINARY_HEADER_FRAG_LEN); if (ret != EOK) { - DHLOGE("DCameraSoftbusSession AssembleFrag failed, ret: %d, sess: %s peerSess: %s", + DHLOGE("DCameraSoftbusSession AssembleFrag failed, ret: %{public}d, sess: %{public}s peerSess: %{public}s", ret, mySessionName_.c_str(), peerSessionName_.c_str()); ResetAssembleFrag(); return; @@ -198,8 +206,8 @@ void DCameraSoftbusSession::AssembleFrag(std::shared_ptr& buffer, Se ret = memcpy_s(packBuffer_->Data() + offset_, packBuffer_->Size() - offset_, buffer->Data() + BINARY_HEADER_FRAG_LEN, buffer->Size() - BINARY_HEADER_FRAG_LEN); if (ret != EOK) { - DHLOGE("DCameraSoftbusSession AssembleFrag failed, memcpy_s ret: %d, sess: %s peerSess: %s", - ret, mySessionName_.c_str(), peerSessionName_.c_str()); + DHLOGE("DCameraSoftbusSession AssembleFrag failed, memcpy_s ret: %{public}d, sess: %{public}s peerSess: " + "%{public}s", ret, mySessionName_.c_str(), peerSessionName_.c_str()); ResetAssembleFrag(); return; } @@ -215,26 +223,29 @@ void DCameraSoftbusSession::AssembleFrag(std::shared_ptr& buffer, Se int32_t DCameraSoftbusSession::CheckUnPackBuffer(SessionDataHeader& headerPara) { if (!isWaiting_) { - DHLOGE("DCameraSoftbusSession AssembleFrag failed, not start one, sess: %s peerSess: %s", + DHLOGE("DCameraSoftbusSession AssembleFrag failed, not start one, sess: %{public}s peerSess: %{public}s", mySessionName_.c_str(), peerSessionName_.c_str()); return DCAMERA_BAD_VALUE; } if (nowSeq_ != headerPara.seqNum) { - DHLOGE("DCameraSoftbusSession AssembleFrag seq error nowSeq: %d actualSeq: %d, sess: %s peerSess: %s", - nowSeq_, headerPara.seqNum, mySessionName_.c_str(), peerSessionName_.c_str()); + DHLOGE("DCameraSoftbusSession AssembleFrag seq error nowSeq: %{public}d actualSeq: %{public}d, sess: " + "%{public}s peerSess: %{public}s", nowSeq_, headerPara.seqNum, mySessionName_.c_str(), + peerSessionName_.c_str()); return DCAMERA_BAD_VALUE; } if (nowSubSeq_ + 1 != headerPara.subSeq) { - DHLOGE("DCameraSoftbusSession AssembleFrag subSeq error nowSeq: %d actualSeq: %d, sess: %s peerSess: %s", - nowSubSeq_, headerPara.subSeq, mySessionName_.c_str(), peerSessionName_.c_str()); + DHLOGE("DCameraSoftbusSession AssembleFrag subSeq error nowSeq: %{public}d actualSeq: %{public}d, " + "sess: %{public}s peerSess: %{public}s", nowSubSeq_, headerPara.subSeq, mySessionName_.c_str(), + peerSessionName_.c_str()); return DCAMERA_BAD_VALUE; } if (totalLen_ < headerPara.dataLen + offset_) { - DHLOGE("DCameraSoftbusSession AssembleFrag len error cap: %d size: %d, dataLen: %d sess: %s peerSess: %s", - totalLen_, offset_, headerPara.dataLen, mySessionName_.c_str(), peerSessionName_.c_str()); + DHLOGE("DCameraSoftbusSession AssembleFrag len error cap: %{public}d size: %{public}d, dataLen: " + "%{public}d sess: %{public}s peerSess: %{public}s", totalLen_, offset_, headerPara.dataLen, + mySessionName_.c_str(), peerSessionName_.c_str()); return DCAMERA_BAD_VALUE; } return DCAMERA_OK; @@ -298,7 +309,6 @@ int32_t DCameraSoftbusSession::UnPackSendData(std::shared_ptr& buffe uint32_t seq = 0; uint32_t totalLen = buffer->Size(); SessionDataHeader headPara = { PROTOCOL_VERSION, FRAG_START, mode_, seq, totalLen, subSeq }; - if (buffer->Size() <= BINARY_DATA_PACKET_MAX_LEN) { headPara.fragFlag = FRAG_START_END; headPara.dataLen = buffer->Size(); @@ -307,36 +317,37 @@ int32_t DCameraSoftbusSession::UnPackSendData(std::shared_ptr& buffe int32_t ret = memcpy_s(unpackData->Data() + BINARY_HEADER_FRAG_LEN, unpackData->Size() - BINARY_HEADER_FRAG_LEN, buffer->Data(), buffer->Size()); if (ret != EOK) { - DHLOGE("DCameraSoftbusSession UnPackSendData START_END memcpy_s failed, ret: %d, sess: %s peerSess: %s", - ret, mySessionName_.c_str(), peerSessionName_.c_str()); + DHLOGE("DCameraSoftbusSession UnPackSendData START_END memcpy_s failed, ret: %{public}d, sess: %{public}s " + "peerSess: %{public}s", ret, mySessionName_.c_str(), peerSessionName_.c_str()); return ret; } return (this->*memberFunc)(unpackData); } - uint32_t offset = 0; + uint64_t bufferSize; while (totalLen > offset) { SetHeadParaDataLen(headPara, totalLen, offset); - DHLOGD("DCameraSoftbusSession UnPackSendData, size: %d, dataLen: %d, totalLen: %d, nowTime: %lld start:", - buffer->Size(), headPara.dataLen, headPara.totalLen, GetNowTimeStampUs()); + bufferSize = static_cast(buffer->Size()); + DHLOGD("DCameraSoftbusSession UnPackSendData, size: %" PRIu64", dataLen: %{public}d, totalLen: %{public}d, " + "nowTime: %{public}" PRId64" start:", bufferSize, headPara.dataLen, headPara.totalLen, GetNowTimeStampUs()); std::shared_ptr unpackData = std::make_shared(headPara.dataLen + BINARY_HEADER_FRAG_LEN); MakeFragDataHeader(headPara, unpackData->Data(), BINARY_HEADER_FRAG_LEN); int ret = memcpy_s(unpackData->Data() + BINARY_HEADER_FRAG_LEN, unpackData->Size() - BINARY_HEADER_FRAG_LEN, buffer->Data() + offset, headPara.dataLen); if (ret != EOK) { - DHLOGE("DCameraSoftbusSession UnPackSendData memcpy_s failed, ret: %d, sess: %s peerSess: %s", - ret, mySessionName_.c_str(), peerSessionName_.c_str()); + DHLOGE("DCameraSoftbusSession UnPackSendData memcpy_s failed, ret: %{public}d, sess: %{public}s peerSess: " + "%{public}s", ret, mySessionName_.c_str(), peerSessionName_.c_str()); return ret; } ret = (this->*memberFunc)(unpackData); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusSession sendData failed, ret: %d, sess: %s peerSess: %s", + DHLOGE("DCameraSoftbusSession sendData failed, ret: %{public}d, sess: %{public}s peerSess: %{public}s", ret, mySessionName_.c_str(), peerSessionName_.c_str()); return ret; } - DHLOGD("DCameraSoftbusSession UnPackSendData, size: %d, dataLen: %d, totalLen: %d, nowTime: %lld end:", - buffer->Size(), headPara.dataLen, headPara.totalLen, GetNowTimeStampUs()); + DHLOGD("DCameraSoftbusSession UnPackSendData, size: %" PRIu64", dataLen: %{public}d, totalLen: %{public}d, " + "nowTime: %{public}" PRId64" end:", bufferSize, headPara.dataLen, headPara.totalLen, GetNowTimeStampUs()); headPara.subSeq++; headPara.fragFlag = FRAG_MID; offset += headPara.dataLen; @@ -360,7 +371,7 @@ void DCameraSoftbusSession::MakeFragDataHeader(const SessionDataHeader& headPara uint32_t headerLen = sizeof(uint8_t) * HEADER_UINT8_NUM + sizeof(uint16_t) * HEADER_UINT16_NUM + sizeof(uint32_t) * HEADER_UINT32_NUM; if (headerLen > len) { - DHLOGE("MakeFragDataHeader %d over len %d", headerLen, len); + DHLOGE("MakeFragDataHeader %{public}d over len %{public}d", headerLen, len); return; } uint32_t i = 0; @@ -390,15 +401,17 @@ void DCameraSoftbusSession::MakeFragDataHeader(const SessionDataHeader& headPara int32_t DCameraSoftbusSession::SendBytes(std::shared_ptr& buffer) { if (state_ != DCAMERA_SOFTBUS_STATE_OPENED) { - DHLOGE("DCameraSoftbusSession SendBytes session state %d is not opened sessionId: %d peerDev: %s peerName: %s", - state_, sessionId_, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); + DHLOGE("DCameraSoftbusSession SendBytes session state %{public}d is not opened sessionId: %{public}d " + "peerDev: %{public}s peerName: %{public}s", state_, sessionId_, GetAnonyString(peerDevId_).c_str(), + GetAnonyString(peerSessionName_).c_str()); return DCAMERA_WRONG_STATE; } int32_t ret = DCameraSoftbusAdapter::GetInstance().SendSofbusBytes(sessionId_, buffer); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusSession SendBytes sessionId: %d failed: %d peerDevId: %s peerSessionName: %s", sessionId_, - ret, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); + DHLOGE("DCameraSoftbusSession SendBytes sessionId: %{public}d failed: %{public}d peerDevId: %{public}s " + "peerSessionName: %{public}s", sessionId_, ret, GetAnonyString(peerDevId_).c_str(), + GetAnonyString(peerSessionName_).c_str()); } return ret; } @@ -406,15 +419,17 @@ int32_t DCameraSoftbusSession::SendBytes(std::shared_ptr& buffer) int32_t DCameraSoftbusSession::SendStream(std::shared_ptr& buffer) { if (state_ != DCAMERA_SOFTBUS_STATE_OPENED) { - DHLOGE("DCameraSoftbusSession SendStream session state %d is not opened sessionId: %d peerDev: %s peerName: %s", - state_, sessionId_, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); + DHLOGE("DCameraSoftbusSession SendStream session state %{public}d is not opened sessionId: %{public}d " + "peerDev: %{public}s peerName: %{public}s", state_, sessionId_, GetAnonyString(peerDevId_).c_str(), + GetAnonyString(peerSessionName_).c_str()); return DCAMERA_WRONG_STATE; } int32_t ret = DCameraSoftbusAdapter::GetInstance().SendSofbusStream(sessionId_, buffer); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusSession SendStream sessionId: %d failed: %d peerDevId: %s peerSessionName: %s", - sessionId_, ret, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); + DHLOGE("DCameraSoftbusSession SendStream sessionId: %{public}d failed: %{public}d peerDevId: %{public}s " + "peerSessionName: %{public}s", sessionId_, ret, GetAnonyString(peerDevId_).c_str(), + GetAnonyString(peerSessionName_).c_str()); } return ret; } diff --git a/services/channel/test/unittest/common/channel/BUILD.gn b/services/channel/test/unittest/common/channel/BUILD.gn index 33d38b739e931dc8df028f92daaf733697335b20..4becf8da773e5a7571b520ad738b292026069230 100644 --- a/services/channel/test/unittest/common/channel/BUILD.gn +++ b/services/channel/test/unittest/common/channel/BUILD.gn @@ -88,6 +88,7 @@ ohos_unittest("DCameraChannelTest") { "eventhandler:libeventhandler", "graphic_surface:surface", "hdf_core:libhdi", + "hilog:libhilog", ] defines = [ diff --git a/services/data_process/BUILD.gn b/services/data_process/BUILD.gn index cc4aad20cc654a954effbb2e19766149bc4a8a7f..a96a9c144d1a577aa41f388d06cbf29ad4ee5a6d 100644 --- a/services/data_process/BUILD.gn +++ b/services/data_process/BUILD.gn @@ -105,6 +105,7 @@ ohos_shared_library("distributed_camera_data_process") { "drivers_interface_display:libdisplay_composer_proxy_1.0", "eventhandler:libeventhandler", "graphic_surface:surface", + "hilog:libhilog", "hitrace:hitrace_meter", "media_foundation:media_foundation", "safwk:system_ability_fwk", diff --git a/services/data_process/src/pipeline/dcamera_pipeline_sink.cpp b/services/data_process/src/pipeline/dcamera_pipeline_sink.cpp index 9f28d41725b704e05662244ea0fa86b43df05991..ef3388d3f7fe929833d6a8318461e2a2d5ecbd4c 100644 --- a/services/data_process/src/pipeline/dcamera_pipeline_sink.cpp +++ b/services/data_process/src/pipeline/dcamera_pipeline_sink.cpp @@ -99,7 +99,7 @@ int32_t DCameraPipelineSink::InitDCameraPipNodes(const VideoConfigParams& source VideoConfigParams curNodeProcessedCfg; int32_t err = pipNodeRanks_[i]->InitNode(curNodeSourceCfg, targetConfig, curNodeProcessedCfg); if (err != DCAMERA_OK) { - DHLOGE("Init sink DCamera pipeline Node [%d] failed.", i); + DHLOGE("Init sink DCamera pipeline Node [%{public}zu] failed.", i); return DCAMERA_INIT_ERR; } curNodeSourceCfg = curNodeProcessedCfg; @@ -110,7 +110,7 @@ int32_t DCameraPipelineSink::InitDCameraPipNodes(const VideoConfigParams& source err = pipNodeRanks_[i - 1]->SetNextNode(pipNodeRanks_[i]); if (err != DCAMERA_OK) { - DHLOGE("Set the next node of Node [%d] failed in sink pipeline.", i - 1); + DHLOGE("Set the next node of Node [%{public}zu] failed in sink pipeline.", i - 1); return DCAMERA_INIT_ERR; } } diff --git a/services/data_process/src/pipeline/dcamera_pipeline_source.cpp b/services/data_process/src/pipeline/dcamera_pipeline_source.cpp index a67480dac13201842aa3e6bcfeb37d7215badb64..818cf703ee77d6e124d8cb9f406f85f16cc52fb5 100644 --- a/services/data_process/src/pipeline/dcamera_pipeline_source.cpp +++ b/services/data_process/src/pipeline/dcamera_pipeline_source.cpp @@ -112,14 +112,15 @@ int32_t DCameraPipelineSource::InitDCameraPipNodes(const VideoConfigParams& sour VideoConfigParams curNodeSourceCfg = sourceConfig; for (size_t i = 0; i < pipNodeRanks_.size(); i++) { pipNodeRanks_[i]->SetNodeRank(i); - DHLOGI("DCameraPipelineSource::InitDCameraPipNodes Node %d Source Config: width %d height %d " + - "format %d codecType %d frameRate %d", i, curNodeSourceCfg.GetWidth(), curNodeSourceCfg.GetHeight(), - curNodeSourceCfg.GetVideoformat(), curNodeSourceCfg.GetVideoCodecType(), curNodeSourceCfg.GetFrameRate()); + DHLOGI("DCameraPipelineSource::InitDCameraPipNodes Node %{public}zu Source Config: width %{public}d height " + "%{public}d format %{public}d codecType %{public}d frameRate %{public}d", i, curNodeSourceCfg.GetWidth(), + curNodeSourceCfg.GetHeight(), curNodeSourceCfg.GetVideoformat(), curNodeSourceCfg.GetVideoCodecType(), + curNodeSourceCfg.GetFrameRate()); VideoConfigParams curNodeProcessedCfg; int32_t err = pipNodeRanks_[i]->InitNode(curNodeSourceCfg, targetConfig, curNodeProcessedCfg); if (err != DCAMERA_OK) { - DHLOGE("Init source DCamera pipeline Node [%d] failed.", i); + DHLOGE("Init source DCamera pipeline Node [%{public}zu] failed.", i); return DCAMERA_INIT_ERR; } curNodeSourceCfg = curNodeProcessedCfg; @@ -130,12 +131,13 @@ int32_t DCameraPipelineSource::InitDCameraPipNodes(const VideoConfigParams& sour err = pipNodeRanks_[i - 1]->SetNextNode(pipNodeRanks_[i]); if (err != DCAMERA_OK) { - DHLOGE("Set the next node of Node [%d] failed in source pipeline.", i - 1); + DHLOGE("Set the next node of Node [%{public}zu] failed in source pipeline.", i - 1); return DCAMERA_INIT_ERR; } } - DHLOGD("All nodes have been linked in source pipeline, Target Config: " + - "width %d height %d format %d codecType %d frameRate %d", targetConfig.GetWidth(), targetConfig.GetHeight(), + DHLOGD("All nodes have been linked in source pipeline, Target Config: " + "width %{public}d height %{public}d format %{public}d codecType %{public}d frameRate %{public}d", + targetConfig.GetWidth(), targetConfig.GetHeight(), targetConfig.GetVideoformat(), targetConfig.GetVideoCodecType(), targetConfig.GetFrameRate()); pipelineHead_ = pipNodeRanks_[0]; return DCAMERA_OK; diff --git a/services/data_process/src/pipeline_node/fpscontroller/fps_controller_process.cpp b/services/data_process/src/pipeline_node/fpscontroller/fps_controller_process.cpp index 52dddbb307cbb402413ffe6c8dc89a3d05b1f982..004d954b4e5c8a83660c8e968ce0818f26224419 100644 --- a/services/data_process/src/pipeline_node/fpscontroller/fps_controller_process.cpp +++ b/services/data_process/src/pipeline_node/fpscontroller/fps_controller_process.cpp @@ -33,7 +33,7 @@ int32_t FpsControllerProcess::InitNode(const VideoConfigParams& sourceConfig, co VideoConfigParams& processedConfig) { if (targetConfig.GetFrameRate() > MAX_TARGET_FRAME_RATE) { - DHLOGE("The target framerate : %d is greater than the max framerate : %d.", + DHLOGE("The target framerate : %{public}d is greater than the max framerate : %{public}d.", targetConfig.GetFrameRate(), MAX_TARGET_FRAME_RATE); return DCAMERA_BAD_TYPE; } @@ -49,7 +49,7 @@ int32_t FpsControllerProcess::InitNode(const VideoConfigParams& sourceConfig, co void FpsControllerProcess::ReleaseProcessNode() { - DHLOGD("Start release [%d] node : FPS controller.", nodeRank_); + DHLOGD("Start release [%{public}zu] node : FPS controller.", nodeRank_); isFpsControllerProcess_ = false; isFirstFrame_ = false; targetFrameRate_ = 0; @@ -68,7 +68,7 @@ void FpsControllerProcess::ReleaseProcessNode() nextDataProcess_->ReleaseProcessNode(); nextDataProcess_ = nullptr; } - DHLOGD("Release [%d] node : FPS controller end.", nodeRank_); + DHLOGD("Release [%{public}zu] node : FPS controller end.", nodeRank_); } int32_t FpsControllerProcess::ProcessData(std::vector>& inputBuffers) @@ -93,12 +93,14 @@ int32_t FpsControllerProcess::ProcessData(std::vector FRMAE_MAX_INTERVAL_TIME_WINDOW_MS) { - DHLOGD("frame control, nowMs: %lld mIncomingFrameT[0]: %lld intervalNewAndFirst: %lld", - (long long)nowMs, (long long)incomingFrameTimesMs_[0], (long long)intervalNewAndFirst); + DHLOGD("frame control, nowMs: %{public}lld mIncomingFrameT[0]: %{public}lld intervalNewAndFirst: " + "%{public}lld", (long long)nowMs, (long long)incomingFrameTimesMs_[0], (long long)intervalNewAndFirst); for (int i = 0; i < INCOME_FRAME_TIME_HISTORY_WINDOWS_SIZE; i++) { incomingFrameTimesMs_[i] = 0; } } else { - DHLOGD("frame control shift, nowMs: %lld mIncomingFrameT[0]: %lld intervalNewAndFirst: %lld", - (long long)nowMs, (long long)incomingFrameTimesMs_[0], (long long)intervalNewAndFirst); + DHLOGD("frame control shift, nowMs: %{public}lld mIncomingFrameT[0]: %{public}lld intervalNewAndFirst: " + "%{public}lld", (long long)nowMs, (long long)incomingFrameTimesMs_[0], (long long)intervalNewAndFirst); const int32_t windowLeftNum = 2; for (int i = (INCOME_FRAME_TIME_HISTORY_WINDOWS_SIZE - windowLeftNum); i >= 0; --i) { incomingFrameTimesMs_[i + 1] = incomingFrameTimesMs_[i]; @@ -204,7 +206,7 @@ float FpsControllerProcess::CalculateFrameRate(int64_t nowMs) { DHLOGD("Frame control, calculate frame rate."); if (targetFrameRate_ <= 0) { - DHLOGE("Frame control, targetFrameRate_ : %d", targetFrameRate_); + DHLOGE("Frame control, targetFrameRate_ : %{public}d", targetFrameRate_); return 0.0; } @@ -253,7 +255,7 @@ bool FpsControllerProcess::IsDropFrame(float incomingFps) return false; } bool isDrop = ReduceFrameRateByUniformStrategy(incomingFrmRate); - DHLOGD("drop frame result: %s", isDrop ? "drop" : "no drop"); + DHLOGD("drop frame result: %{public}s", isDrop ? "drop" : "no drop"); return isDrop; } diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp index 66d68bff1993aca5c5cd04136d9f3a4441320dc6..a94f5b5a6d4ffb7d988c8af3ee8c2e0f9dc46f3f 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process.cpp @@ -24,7 +24,6 @@ #include "decode_surface_listener.h" #include "decode_video_callback.h" #include "graphic_common_c.h" -#include "dh_log.h" namespace OHOS { namespace DistributedHardware { @@ -50,7 +49,7 @@ int32_t DecodeDataProcess::InitNode(const VideoConfigParams& sourceConfig, const } if (!IsConvertible(sourceConfig, targetConfig)) { - DHLOGE("The DecodeNode can't convert %d to %d.", sourceConfig.GetVideoCodecType(), + DHLOGE("The DecodeNode can't convert %{public}d to %{public}d.", sourceConfig.GetVideoCodecType(), targetConfig_.GetVideoCodecType()); return DCAMERA_BAD_TYPE; } @@ -58,8 +57,8 @@ int32_t DecodeDataProcess::InitNode(const VideoConfigParams& sourceConfig, const sourceConfig_ = sourceConfig; targetConfig_ = targetConfig; if (sourceConfig_.GetVideoCodecType() == targetConfig_.GetVideoCodecType()) { - DHLOGD("Disable DecodeNode. The target video codec type %d is the same as the source video codec type %d.", - targetConfig_.GetVideoCodecType(), sourceConfig_.GetVideoCodecType()); + DHLOGD("Disable DecodeNode. The target video codec type %{public}d is the same as the source video codec " + "type %{public}d.", targetConfig_.GetVideoCodecType(), sourceConfig_.GetVideoCodecType()); processedConfig_ = sourceConfig; processedConfig = processedConfig_; isDecoderProcess_.store(true); @@ -116,8 +115,8 @@ int32_t DecodeDataProcess::InitDecoder() if (ret != DCAMERA_OK) { DHLOGE("Start Video decoder failed."); ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_DECODE_ERROR, - CreateMsg("start video decoder failed, width: %d, height: %d, format: %s", sourceConfig_.GetWidth(), - sourceConfig_.GetHeight(), + CreateMsg("start video decoder failed, width: %d, height: %d, format: %s", + sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), sourceConfig_.GetHeight(), ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())].c_str())); return ret; } @@ -128,20 +127,20 @@ int32_t DecodeDataProcess::ConfigureVideoDecoder() { int32_t ret = InitDecoderMetadataFormat(); if (ret != DCAMERA_OK) { - DHLOGE("Init video decoder metadata format failed. ret %d.", ret); + DHLOGE("Init video decoder metadata format failed. ret %{public}d.", ret); return ret; } videoDecoder_ = MediaAVCodec::VideoDecoderFactory::CreateByMime(processType_); - CHECK_AND_RETURN_RET_LOG(videoDecoder_ == nullptr, DCAMERA_INIT_ERR, "%s", + CHECK_AND_RETURN_RET_LOG(videoDecoder_ == nullptr, DCAMERA_INIT_ERR, "%{public}s", "Create video decoder failed."); decodeVideoCallback_ = std::make_shared(shared_from_this()); ret = videoDecoder_->SetCallback(decodeVideoCallback_); CHECK_AND_RETURN_RET_LOG(ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK, DCAMERA_INIT_ERR, - "Set video decoder callback failed. ret %d.", ret); + "Set video decoder callback failed. ret %{public}d.", ret); ret = videoDecoder_->Configure(metadataFormat_); CHECK_AND_RETURN_RET_LOG(ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK, DCAMERA_INIT_ERR, - "Set video decoder metadata format failed. ret %d.", ret); + "Set video decoder metadata format failed. ret %{public}d.", ret); ret = SetDecoderOutputSurface(); CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, "Set decoder output surface failed. ret %d.", ret); @@ -150,7 +149,7 @@ int32_t DecodeDataProcess::ConfigureVideoDecoder() int32_t DecodeDataProcess::InitDecoderMetadataFormat() { - DHLOGI("Init video decoder metadata format. codecType: %d", sourceConfig_.GetVideoCodecType()); + DHLOGI("Init video decoder metadata format. codecType: %{public}d", sourceConfig_.GetVideoCodecType()); processedConfig_ = sourceConfig_; processedConfig_.SetVideoCodecType(VideoCodecType::NO_CODEC); processedConfig_.SetVideoformat(Videoformat::YUVI420); @@ -192,7 +191,7 @@ int32_t DecodeDataProcess::SetDecoderOutputSurface() static_cast(sourceConfig_.GetHeight())); GSError ret = decodeConsumerSurface_->SetDefaultUsage(SurfaceBufferUsage::BUFFER_USAGE_MEM_MMZ_CACHE | SurfaceBufferUsage::BUFFER_USAGE_CPU_READ); - CHECK_AND_LOG(ret != GSERROR_OK || decodeConsumerSurface_ == nullptr, "%s", "Set Usage failed."); + CHECK_AND_LOG(ret != GSERROR_OK || decodeConsumerSurface_ == nullptr, "%{public}s", "Set Usage failed."); decodeSurfaceListener_ = new DecodeSurfaceListener(decodeConsumerSurface_, shared_from_this()); if (decodeConsumerSurface_->RegisterConsumerListener(decodeSurfaceListener_) != @@ -202,7 +201,7 @@ int32_t DecodeDataProcess::SetDecoderOutputSurface() } sptr surfaceProducer = decodeConsumerSurface_->GetProducer(); - CHECK_AND_RETURN_RET_LOG(surfaceProducer == nullptr, DCAMERA_INIT_ERR, "%s", + CHECK_AND_RETURN_RET_LOG(surfaceProducer == nullptr, DCAMERA_INIT_ERR, "%{public}s", "Get the surface producer of the decode consumer surface failed."); decodeProducerSurface_ = Surface::CreateSurfaceAsProducer(surfaceProducer); if (decodeProducerSurface_ == nullptr) { @@ -212,7 +211,7 @@ int32_t DecodeDataProcess::SetDecoderOutputSurface() DHLOGD("Set the producer surface to video decoder output surface."); int32_t err = videoDecoder_->SetOutputSurface(decodeProducerSurface_); - CHECK_AND_RETURN_RET_LOG(err != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK, DCAMERA_INIT_ERR, "%s", + CHECK_AND_RETURN_RET_LOG(err != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK, DCAMERA_INIT_ERR, "%{public}s", "Set decoder output surface failed."); return DCAMERA_OK; } @@ -226,10 +225,10 @@ int32_t DecodeDataProcess::StartVideoDecoder() int32_t ret = videoDecoder_->Prepare(); CHECK_AND_RETURN_RET_LOG(ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK, DCAMERA_INIT_ERR, - "Video decoder prepare failed. ret %d.", ret); + "Video decoder prepare failed. ret %{public}d.", ret); ret = videoDecoder_->Start(); CHECK_AND_RETURN_RET_LOG(ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK, DCAMERA_INIT_ERR, - "Video decoder start failed. ret %d.", ret); + "Video decoder start failed. ret %{public}d.", ret); return DCAMERA_OK; } @@ -243,12 +242,12 @@ int32_t DecodeDataProcess::StopVideoDecoder() bool isSuccess = true; int32_t ret = videoDecoder_->Flush(); if (ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK) { - DHLOGE("VideoDecoder flush failed. ret %d.", ret); + DHLOGE("VideoDecoder flush failed. ret %{public}d.", ret); isSuccess = isSuccess && false; } ret = videoDecoder_->Stop(); if (ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK) { - DHLOGE("VideoDecoder stop failed. ret %d.", ret); + DHLOGE("VideoDecoder stop failed. ret %{public}d.", ret); isSuccess = isSuccess && false; } if (!isSuccess) { @@ -268,10 +267,10 @@ void DecodeDataProcess::ReleaseVideoDecoder() return; } int32_t ret = StopVideoDecoder(); - CHECK_AND_LOG(ret != DCAMERA_OK, "%s", "StopVideoDecoder failed."); + CHECK_AND_LOG(ret != DCAMERA_OK, "%{public}s", "StopVideoDecoder failed."); ret = videoDecoder_->Release(); CHECK_AND_LOG(ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK, - "VideoDecoder release failed. ret %d.", ret); + "VideoDecoder release failed. ret %{public}d.", ret); videoDecoder_ = nullptr; decodeVideoCallback_ = nullptr; } @@ -307,7 +306,7 @@ void DecodeDataProcess::ReleaseCodecEvent() void DecodeDataProcess::ReleaseProcessNode() { - DHLOGD("Start release [%zu] node : DecodeNode.", nodeRank_); + DHLOGD("Start release [%{public}zu] node : DecodeNode.", nodeRank_); isDecoderProcess_.store(false); ReleaseVideoDecoder(); ReleaseDecoderSurface(); @@ -327,7 +326,7 @@ void DecodeDataProcess::ReleaseProcessNode() nextDataProcess_->ReleaseProcessNode(); nextDataProcess_ = nullptr; } - DHLOGD("Release [%zu] node : DecodeNode end.", nodeRank_); + DHLOGD("Release [%{public}zu] node : DecodeNode end.", nodeRank_); } int32_t DecodeDataProcess::ProcessData(std::vector>& inputBuffers) @@ -338,7 +337,7 @@ int32_t DecodeDataProcess::ProcessData(std::vector>& return DCAMERA_BAD_VALUE; } if (sourceConfig_.GetVideoCodecType() == processedConfig_.GetVideoCodecType()) { - DHLOGD("The target VideoCodecType : %d is the same as the source VideoCodecType : %d.", + DHLOGD("The target VideoCodecType : %{public}d is the same as the source VideoCodecType : %{public}d.", sourceConfig_.GetVideoCodecType(), processedConfig_.GetVideoCodecType()); return DecodeDone(inputBuffers); } @@ -352,7 +351,7 @@ int32_t DecodeDataProcess::ProcessData(std::vector>& return DCAMERA_INDEX_OVERFLOW; } if (inputBuffers[0]->Size() > MAX_YUV420_BUFFER_SIZE) { - DHLOGE("DecodeNode input buffer size %zu error.", inputBuffers[0]->Size()); + DHLOGE("DecodeNode input buffer size %{public}zu error.", inputBuffers[0]->Size()); return DCAMERA_MEMORY_OPT_ERROR; } if (!isDecoderProcess_.load()) { @@ -360,7 +359,8 @@ int32_t DecodeDataProcess::ProcessData(std::vector>& return DCAMERA_DISABLE_PROCESS; } inputBuffersQueue_.push(inputBuffers[0]); - DHLOGD("Push inputBuf sucess. BufSize %zu, QueueSize %zu.", inputBuffers[0]->Size(), inputBuffersQueue_.size()); + DHLOGD("Push inputBuf sucess. BufSize %{public}zu, QueueSize %{public}zu.", inputBuffers[0]->Size(), + inputBuffersQueue_.size()); int32_t err = FeedDecoderInputBuffer(); if (err != DCAMERA_OK) { int32_t sleepTimeUs = 5000; @@ -370,7 +370,7 @@ int32_t DecodeDataProcess::ProcessData(std::vector>& reFeedInputPacket->SetVideoCodecType(sourceConfig_.GetVideoCodecType()); DCameraCodecEvent dCamCodecEv(*this, reFeedInputPacket, VideoCodecAction::ACTION_ONCE_AGAIN); CHECK_AND_RETURN_RET_LOG(eventBusPipeline_ == nullptr, DCAMERA_BAD_VALUE, - "%s", "eventBusPipeline_ is nullptr."); + "%{public}s", "eventBusPipeline_ is nullptr."); eventBusPipeline_->PostEvent(dCamCodecEv, POSTMODE::POST_ASYNC); } return DCAMERA_OK; @@ -396,7 +396,8 @@ int32_t DecodeDataProcess::FeedDecoderInputBuffer() while ((!inputBuffersQueue_.empty()) && (isDecoderProcess_.load())) { std::shared_ptr buffer = inputBuffersQueue_.front(); if (buffer == nullptr || availableInputIndexsQueue_.empty() || availableInputBufferQueue_.empty()) { - DHLOGE("inputBuffersQueue size %zu, availableInputIndexsQueue size %zu, availableInputBufferQueue size %zu", + DHLOGE("inputBuffersQueue size %{public}zu, availableInputIndexsQueue size %{public}zu, " + "availableInputBufferQueue size %{public}zu", inputBuffersQueue_.size(), availableInputIndexsQueue_.size(), availableInputBufferQueue_.size()); return DCAMERA_BAD_VALUE; } @@ -415,7 +416,7 @@ int32_t DecodeDataProcess::FeedDecoderInputBuffer() uint32_t index = availableInputIndexsQueue_.front(); std::shared_ptr sharedMemoryInput = availableInputBufferQueue_.front(); if (sharedMemoryInput == nullptr) { - DHLOGE("Failed to obtain the input shared memory corresponding to the [%u] index.", index); + DHLOGE("Failed to obtain the input shared memory corresponding to the [%{public}u] index.", index); return DCAMERA_BAD_VALUE; } BeforeDecodeDump(buffer->Data(), buffer->Size()); @@ -425,7 +426,7 @@ int32_t DecodeDataProcess::FeedDecoderInputBuffer() DHLOGE("memcpy_s buffer failed."); return DCAMERA_MEMORY_OPT_ERROR; } - DHLOGD("Decoder input buffer size %zu, timeStamp %ld us.", buffer->Size(), timeStamp); + DHLOGD("Decoder input buffer size %{public}zu, timeStamp %{public}" PRId64"us.", buffer->Size(), timeStamp); MediaAVCodec::AVCodecBufferInfo bufferInfo {timeStamp, static_cast(buffer->Size()), 0}; int32_t ret = videoDecoder_->QueueInputBuffer(index, bufferInfo, MediaAVCodec::AVCODEC_BUFFER_FLAG_NONE); @@ -436,7 +437,7 @@ int32_t DecodeDataProcess::FeedDecoderInputBuffer() } inputBuffersQueue_.pop(); - DHLOGD("Push inputBuffer sucess. inputBuffersQueue size is %d.", inputBuffersQueue_.size()); + DHLOGD("Push inputBuffer sucess. inputBuffersQueue size is %{public}zu.", inputBuffersQueue_.size()); IncreaseWaitDecodeCnt(); } @@ -462,21 +463,21 @@ void DecodeDataProcess::IncreaseWaitDecodeCnt() availableInputIndexsQueue_.pop(); availableInputBufferQueue_.pop(); waitDecoderOutputCount_++; - DHLOGD("Wait decoder output frames number is %d.", waitDecoderOutputCount_); + DHLOGD("Wait decoder output frames number is %{public}d.", waitDecoderOutputCount_); } void DecodeDataProcess::ReduceWaitDecodeCnt() { std::lock_guard lck(mtxHoldCount_); if (waitDecoderOutputCount_ <= 0) { - DHLOGE("The waitDecoderOutputCount_ = %d.", waitDecoderOutputCount_); + DHLOGE("The waitDecoderOutputCount_ = %{public}d.", waitDecoderOutputCount_); } if (outputTimeStampUs_ == 0) { waitDecoderOutputCount_ -= FIRST_FRAME_INPUT_NUM; } else { waitDecoderOutputCount_--; } - DHLOGD("Wait decoder output frames number is %d.", waitDecoderOutputCount_); + DHLOGD("Wait decoder output frames number is %{public}d.", waitDecoderOutputCount_); } void DecodeDataProcess::OnSurfaceOutputBufferAvailable(const sptr& surface) @@ -508,7 +509,7 @@ void DecodeDataProcess::GetDecoderOutputBuffer(const sptr& sur return; } int32_t alignedHeight = alignedHeight_; - DHLOGD("OutputBuffer alignedWidth %d, alignedHeight %d, timeStamp %ld ns.", + DHLOGD("OutputBuffer alignedWidth %{public}d, alignedHeight %{public}d, timeStamp %{public}ld ns.", alignedWidth, alignedHeight, timeStamp); CopyDecodedImage(surfaceBuffer, alignedWidth, alignedHeight); surface->ReleaseBuffer(surfaceBuffer, -1); @@ -524,8 +525,9 @@ void DecodeDataProcess::CopyDecodedImage(const sptr& surBuf, int3 return; } - DHLOGD("Convert NV12 to I420, format=%d, width=[%d, %d], height=[%d, %d]", sourceConfig_.GetVideoformat(), - sourceConfig_.GetWidth(), alignedWidth, sourceConfig_.GetHeight(), alignedHeight); + DHLOGD("Convert NV12 to I420, format=%{public}d, width=[%{public}d, %{public}d], height=[%{public}d, %{public}d]", + sourceConfig_.GetVideoformat(), sourceConfig_.GetWidth(), alignedWidth, sourceConfig_.GetHeight(), + alignedHeight); int srcSizeY = alignedWidth * alignedHeight; uint8_t *srcDataY = static_cast(surBuf->GetVirAddr()); uint8_t *srcDataUV = static_cast(surBuf->GetVirAddr()) + srcSizeY; @@ -581,8 +583,8 @@ bool DecodeDataProcess::IsCorrectSurfaceBuffer(const sptr& surBuf YUV_BYTES_PER_PIXEL / Y2UV_RATIO); size_t surfaceBufSize = static_cast(surBuf->GetSize()); if (yuvImageAlignedSize > surfaceBufSize || yuvImageAlignedSize < yuvImageSize) { - DHLOGE("Buffer size error, yuvImageSize %zu, yuvImageAlignedSize %zu, surBufSize %zu.", - yuvImageSize, yuvImageAlignedSize, surBuf->GetSize()); + DHLOGE("Buffer size error, yuvImageSize %{public}zu, yuvImageAlignedSize %{public}zu, surBufSize %{public}" + PRIu32, yuvImageSize, yuvImageAlignedSize, surBuf->GetSize()); return false; } return true; @@ -637,7 +639,7 @@ void DecodeDataProcess::OnEvent(DCameraCodecEvent& ev) switch (action) { case VideoCodecAction::NO_ACTION: { if (receivedCodecPacket == nullptr) { - DHLOGE("the received codecPacket of action [%d] is null.", action); + DHLOGE("the received codecPacket of action [%{public}d] is null.", action); OnError(); return; } @@ -651,14 +653,14 @@ void DecodeDataProcess::OnEvent(DCameraCodecEvent& ev) return; case VideoCodecAction::ACTION_GET_DECODER_OUTPUT_BUFFER: if (receivedCodecPacket == nullptr) { - DHLOGE("the received codecPacket of action [%d] is null.", action); + DHLOGE("the received codecPacket of action [%{public}d] is null.", action); OnError(); return; } GetDecoderOutputBuffer(receivedCodecPacket->GetSurface()); break; default: - DHLOGD("The action : %d is not supported.", action); + DHLOGD("The action : %{public}d is not supported.", action); return; } } @@ -686,7 +688,7 @@ void DecodeDataProcess::OnInputBufferAvailable(uint32_t index, std::shared_ptr lock(mtxDequeLock_); @@ -732,7 +734,7 @@ void DecodeDataProcess::OnOutputBufferAvailable(uint32_t index, const MediaAVCod } int32_t errRelease = videoDecoder_->ReleaseOutputBuffer(index, true); if (errRelease != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK) { - DHLOGE("The video decoder output decoded data to surface failed, index : [%u].", index); + DHLOGE("The video decoder output decoded data to surfacebuffer failed, index : [%{public}u].", index); } } } diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp index c79a7d74664171ca788ae45957c922a4e8cb7d22..dea6a772a9e5d309026ed33aac53bf338a12ebd8 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp @@ -47,7 +47,7 @@ int32_t DecodeDataProcess::InitNode(const VideoConfigParams& sourceConfig, const return DCAMERA_BAD_VALUE; } if (!IsConvertible(sourceConfig, targetConfig)) { - DHLOGE("The DecodeNode can't convert %d to %d.", sourceConfig.GetVideoCodecType(), + DHLOGE("The DecodeNode can't convert %{public}d to %{public}d.", sourceConfig.GetVideoCodecType(), targetConfig_.GetVideoCodecType()); return DCAMERA_BAD_TYPE; } @@ -55,8 +55,8 @@ int32_t DecodeDataProcess::InitNode(const VideoConfigParams& sourceConfig, const sourceConfig_ = sourceConfig; targetConfig_ = targetConfig; if (sourceConfig_.GetVideoCodecType() == targetConfig_.GetVideoCodecType()) { - DHLOGD("Disable DecodeNode. The target video codec type %d is the same as the source video codec type %d.", - targetConfig_.GetVideoCodecType(), sourceConfig_.GetVideoCodecType()); + DHLOGD("Disable DecodeNode. The target video codec type %{public}d is the same as the source video codec " + "type %{public}d.", targetConfig_.GetVideoCodecType(), sourceConfig_.GetVideoCodecType()); processedConfig_ = sourceConfig; processedConfig = processedConfig_; isDecoderProcess_.store(true); @@ -113,8 +113,8 @@ int32_t DecodeDataProcess::InitDecoder() if (ret != DCAMERA_OK) { DHLOGE("Start Video decoder failed."); ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_DECODE_ERROR, - CreateMsg("start video decoder failed, width: %d, height: %d, format: %s", sourceConfig_.GetWidth(), - sourceConfig_.GetHeight(), + CreateMsg("start video decoder failed, width: %d, height: %d, format: %s", + sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())].c_str())); return ret; } @@ -125,7 +125,7 @@ int32_t DecodeDataProcess::ConfigureVideoDecoder() { int32_t ret = InitDecoderMetadataFormat(); if (ret != DCAMERA_OK) { - DHLOGE("Init video decoder metadata format failed. ret %d.", ret); + DHLOGE("Init video decoder metadata format failed. ret %{public}d.", ret); return ret; } @@ -137,19 +137,19 @@ int32_t DecodeDataProcess::ConfigureVideoDecoder() decodeVideoCallback_ = std::make_shared(shared_from_this()); ret = videoDecoder_->SetCallback(decodeVideoCallback_); if (ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK) { - DHLOGE("Set video decoder callback failed. ret %d.", ret); + DHLOGE("Set video decoder callback failed. ret %{public}d.", ret); return DCAMERA_INIT_ERR; } ret = videoDecoder_->Configure(metadataFormat_); if (ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK) { - DHLOGE("Set video decoder metadata format failed. ret %d.", ret); + DHLOGE("Set video decoder metadata format failed. ret %{public}d.", ret); return DCAMERA_INIT_ERR; } ret = SetDecoderOutputSurface(); if (ret != DCAMERA_OK) { - DHLOGE("Set decoder output surface failed. ret %d.", ret); + DHLOGE("Set decoder outputsurface failed. ret %{public}d.", ret); return ret; } @@ -158,7 +158,7 @@ int32_t DecodeDataProcess::ConfigureVideoDecoder() int32_t DecodeDataProcess::InitDecoderMetadataFormat() { - DHLOGI("Init video decoder metadata format. codecType: %d", sourceConfig_.GetVideoCodecType()); + DHLOGI("Init video decoder metadata format. codecType: %{public}d", sourceConfig_.GetVideoCodecType()); processedConfig_ = sourceConfig_; processedConfig_.SetVideoCodecType(VideoCodecType::NO_CODEC); switch (sourceConfig_.GetVideoCodecType()) { @@ -173,7 +173,7 @@ int32_t DecodeDataProcess::InitDecoderMetadataFormat() return DCAMERA_NOT_FOUND; } - DHLOGI("Init video decoder metadata format. videoformat: %d", processedConfig_.GetVideoformat()); + DHLOGI("Init video decoder metadata format. videoformat: %{public}d", processedConfig_.GetVideoformat()); switch (processedConfig_.GetVideoformat()) { case Videoformat::YUVI420: metadataFormat_.PutIntValue("pixel_format", static_cast(MediaAVCodec::VideoPixelFormat::YUVI420)); @@ -261,12 +261,12 @@ int32_t DecodeDataProcess::StartVideoDecoder() int32_t ret = videoDecoder_->Prepare(); if (ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK) { - DHLOGE("Video decoder prepare failed. ret %d.", ret); + DHLOGE("Video decoder prepare failed. ret %{public}d.", ret); return DCAMERA_INIT_ERR; } ret = videoDecoder_->Start(); if (ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK) { - DHLOGE("Video decoder start failed. ret %d.", ret); + DHLOGE("Video decoder start failed. ret %{public}d.", ret); return DCAMERA_INIT_ERR; } return DCAMERA_OK; @@ -282,12 +282,12 @@ int32_t DecodeDataProcess::StopVideoDecoder() bool isSuccess = true; int32_t ret = videoDecoder_->Flush(); if (ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK) { - DHLOGE("VideoDecoder flush failed. ret %d.", ret); + DHLOGE("VideoDecoder flush failed. ret %{public}d.", ret); isSuccess = isSuccess && false; } ret = videoDecoder_->Stop(); if (ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK) { - DHLOGE("VideoDecoder stop failed. ret %d.", ret); + DHLOGE("VideoDecoder stop failed. ret %{public}d.", ret); isSuccess = isSuccess && false; } if (!isSuccess) { @@ -312,7 +312,7 @@ void DecodeDataProcess::ReleaseVideoDecoder() } ret = videoDecoder_->Release(); if (ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK) { - DHLOGE("VideoDecoder release failed. ret %d.", ret); + DHLOGE("VideoDecoder release failed. ret %{public}d.", ret); } videoDecoder_ = nullptr; decodeVideoCallback_ = nullptr; @@ -327,7 +327,7 @@ void DecodeDataProcess::ReleaseDecoderSurface() } int32_t ret = decodeConsumerSurface_->UnregisterConsumerListener(); if (ret != SURFACE_ERROR_OK) { - DHLOGE("Unregister consumer listener failed. ret %d.", ret); + DHLOGE("Unregister consumer listener failed. ret %{public}d.", ret); } decodeConsumerSurface_ = nullptr; decodeProducerSurface_ = nullptr; @@ -351,7 +351,7 @@ void DecodeDataProcess::ReleaseCodecEvent() void DecodeDataProcess::ReleaseProcessNode() { - DHLOGD("Start release [%zu] node : DecodeNode.", nodeRank_); + DHLOGD("Start release [%{public}zu] node : DecodeNode.", nodeRank_); isDecoderProcess_.store(false); ReleaseVideoDecoder(); ReleaseDecoderSurface(); @@ -371,7 +371,7 @@ void DecodeDataProcess::ReleaseProcessNode() nextDataProcess_->ReleaseProcessNode(); nextDataProcess_ = nullptr; } - DHLOGD("Release [%zu] node : DecodeNode end.", nodeRank_); + DHLOGD("Release [%{public}zu] node : DecodeNode end.", nodeRank_); } int32_t DecodeDataProcess::ProcessData(std::vector>& inputBuffers) @@ -382,7 +382,7 @@ int32_t DecodeDataProcess::ProcessData(std::vector>& return DCAMERA_BAD_VALUE; } if (sourceConfig_.GetVideoCodecType() == processedConfig_.GetVideoCodecType()) { - DHLOGD("The target VideoCodecType : %d is the same as the source VideoCodecType : %d.", + DHLOGD("The target VideoCodecType : %{public}d is the same as the source VideoCodecType : %{public}d.", sourceConfig_.GetVideoCodecType(), processedConfig_.GetVideoCodecType()); return DecodeDone(inputBuffers); } @@ -396,7 +396,7 @@ int32_t DecodeDataProcess::ProcessData(std::vector>& return DCAMERA_INDEX_OVERFLOW; } if (inputBuffers[0]->Size() > MAX_BUFFER_SIZE) { - DHLOGE("DecodeNode input buffer size %zu error.", inputBuffers[0]->Size()); + DHLOGE("DecodeNode input buffer size %{public}zu error.", inputBuffers[0]->Size()); return DCAMERA_MEMORY_OPT_ERROR; } if (!isDecoderProcess_.load()) { @@ -404,7 +404,8 @@ int32_t DecodeDataProcess::ProcessData(std::vector>& return DCAMERA_DISABLE_PROCESS; } inputBuffersQueue_.push(inputBuffers[0]); - DHLOGD("Push inputBuf sucess. BufSize %zu, QueueSize %zu.", inputBuffers[0]->Size(), inputBuffersQueue_.size()); + DHLOGD("Push inputBuf sucess. BufSize %{public}zu, QueueSize %{public}zu.", inputBuffers[0]->Size(), + inputBuffersQueue_.size()); int32_t err = FeedDecoderInputBuffer(); if (err != DCAMERA_OK) { int32_t sleepTimeUs = 5000; @@ -442,7 +443,8 @@ int32_t DecodeDataProcess::FeedDecoderInputBuffer() while ((!inputBuffersQueue_.empty()) && (isDecoderProcess_.load())) { std::shared_ptr buffer = inputBuffersQueue_.front(); if (buffer == nullptr || availableInputIndexsQueue_.empty() || availableInputBufferQueue_.empty()) { - DHLOGE("inputBuffersQueue size %zu, availableInputIndexsQueue size %zu, availableInputBufferQueue size %zu", + DHLOGE("inputBuffersQueue size %{public}zu, availableInputIndexsQueue size %{public}zu, " + "availableInputBufferQueue size %{public}zu", inputBuffersQueue_.size(), availableInputIndexsQueue_.size(), availableInputBufferQueue_.size()); return DCAMERA_BAD_VALUE; } @@ -461,7 +463,7 @@ int32_t DecodeDataProcess::FeedDecoderInputBuffer() uint32_t index = availableInputIndexsQueue_.front(); std::shared_ptr sharedMemoryInput = availableInputBufferQueue_.front(); if (sharedMemoryInput == nullptr) { - DHLOGE("Failed to obtain the input shared memory corresponding to the [%u] index.", index); + DHLOGE("Failed to obtain the input shared memory corresponding to the [%{public}u] index.", index); return DCAMERA_BAD_VALUE; } BeforeDecodeDump(buffer->Data(), buffer->Size()); @@ -471,7 +473,7 @@ int32_t DecodeDataProcess::FeedDecoderInputBuffer() DHLOGE("memcpy_s buffer failed."); return DCAMERA_MEMORY_OPT_ERROR; } - DHLOGD("Decoder input buffer size %zu, timeStamp %ld us.", buffer->Size(), timeStamp); + DHLOGD("Decoder input buffer size %{public}zu, timeStamp %{public}" PRId64"us.", buffer->Size(), timeStamp); MediaAVCodec::AVCodecBufferInfo bufferInfo {timeStamp, static_cast(buffer->Size()), 0}; int32_t ret = videoDecoder_->QueueInputBuffer(index, bufferInfo, MediaAVCodec::AVCODEC_BUFFER_FLAG_NONE); @@ -482,7 +484,7 @@ int32_t DecodeDataProcess::FeedDecoderInputBuffer() } inputBuffersQueue_.pop(); - DHLOGD("Push inputBuffer sucess. inputBuffersQueue size is %d.", inputBuffersQueue_.size()); + DHLOGD("Push inputBuffer sucess. inputBuffersQueue size is %{public}d.", inputBuffersQueue_.size()); IncreaseWaitDecodeCnt(); } @@ -508,21 +510,21 @@ void DecodeDataProcess::IncreaseWaitDecodeCnt() availableInputIndexsQueue_.pop(); availableInputBufferQueue_.pop(); waitDecoderOutputCount_++; - DHLOGD("Wait decoder output frames number is %d.", waitDecoderOutputCount_); + DHLOGD("Wait decoder output frames number is %{public}d.", waitDecoderOutputCount_); } void DecodeDataProcess::ReduceWaitDecodeCnt() { std::lock_guard lck(mtxHoldCount_); if (waitDecoderOutputCount_ <= 0) { - DHLOGE("The waitDecoderOutputCount_ = %d.", waitDecoderOutputCount_); + DHLOGE("The waitDecoderOutputCount_ = %{public}d.", waitDecoderOutputCount_); } if (outputTimeStampUs_ == 0) { waitDecoderOutputCount_ -= FIRST_FRAME_INPUT_NUM; } else { waitDecoderOutputCount_--; } - DHLOGD("Wait decoder output frames number is %d.", waitDecoderOutputCount_); + DHLOGD("Wait decoder output frames number is %{public}d.", waitDecoderOutputCount_); } void DecodeDataProcess::OnSurfaceOutputBufferAvailable(const sptr& surface) @@ -554,7 +556,7 @@ void DecodeDataProcess::GetDecoderOutputBuffer(const sptr& sur return; } int32_t alignedHeight = alignedHeight_; - DHLOGD("OutputBuffer alignedWidth %d, alignedHeight %d, timeStamp %ld ns.", + DHLOGD("OutputBuffer alignedWidth %{public}d, alignedHeight %{public}d, timeStamp %{public}" PRId64" ns.", alignedWidth, alignedHeight, timeStamp); CopyDecodedImage(surfaceBuffer, alignedWidth, alignedHeight); surface->ReleaseBuffer(surfaceBuffer, -1); @@ -618,7 +620,8 @@ bool DecodeDataProcess::IsCorrectSurfaceBuffer(const sptr& surBuf RGB32_MEMORY_COEFFICIENT); size_t surfaceBufSize = static_cast(surBuf->GetSize()); if (rgbImageSize > surfaceBufSize) { - DHLOGE("Buffer size error, rgbImageSize %zu, surBufSize %zu.", rgbImageSize, surBuf->GetSize()); + DHLOGE("Buffer size error, rgbImageSize %{public}zu, surBufSize %{public}zu.", rgbImageSize, + surBuf->GetSize()); return false; } } else { @@ -628,8 +631,8 @@ bool DecodeDataProcess::IsCorrectSurfaceBuffer(const sptr& surBuf size_t yuvImageSize = static_cast( sourceConfig_.GetWidth() * sourceConfig_.GetHeight() * YUV_BYTES_PER_PIXEL / Y2UV_RATIO); if (yuvImageAlignedSize > surfaceBufSize || yuvImageAlignedSize < yuvImageSize) { - DHLOGE("Buffer size error, yuvImageSize %zu, yuvImageAlignedSize %zu, surBufSize %zu.", - yuvImageSize, yuvImageAlignedSize, surBuf->GetSize()); + DHLOGE("Buffer size error, yuvImageSize %{public}zu, yuvImageAlignedSize %{public}zu, surBufSize " + "%{public}zu.", yuvImageSize, yuvImageAlignedSize, surBuf->GetSize()); return false; } } @@ -685,7 +688,7 @@ void DecodeDataProcess::OnEvent(DCameraCodecEvent& ev) switch (action) { case VideoCodecAction::NO_ACTION: { if (receivedCodecPacket == nullptr) { - DHLOGE("the received codecPacket of action [%d] is null.", action); + DHLOGE("the received codecPacket of action [%{public}d] is null.", action); OnError(); return; } @@ -699,14 +702,14 @@ void DecodeDataProcess::OnEvent(DCameraCodecEvent& ev) return; case VideoCodecAction::ACTION_GET_DECODER_OUTPUT_BUFFER: if (receivedCodecPacket == nullptr) { - DHLOGE("the received codecPacket of action [%d] is null.", action); + DHLOGE("the received codecPacket of action [%{public}d] is null.", action); OnError(); return; } GetDecoderOutputBuffer(receivedCodecPacket->GetSurface()); break; default: - DHLOGD("The action : %d is not supported.", action); + DHLOGD("The action : %{public}d is not supported.", action); return; } } @@ -734,7 +737,7 @@ void DecodeDataProcess::OnInputBufferAvailable(uint32_t index, std::shared_ptr lock(mtxDequeLock_); @@ -780,7 +783,7 @@ void DecodeDataProcess::OnOutputBufferAvailable(uint32_t index, const MediaAVCod } int32_t errRelease = videoDecoder_->ReleaseOutputBuffer(index, true); if (errRelease != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK) { - DHLOGE("The video decoder output decoded data to surface failed, index : [%u].", index); + DHLOGE("The video decoder output decoded data to surfacebuffer failed, index : [%{public}u].", index); } } } diff --git a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_video_callback.cpp b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_video_callback.cpp index ad4a7083b36edafef032b29f9421f4217b888e4d..316ddbf47c16ae38fa2d0aed134fda4b166c16b0 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_video_callback.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_video_callback.cpp @@ -16,15 +16,14 @@ #include "decode_video_callback.h" #include "distributed_hardware_log.h" -#include "dh_log.h" namespace OHOS { namespace DistributedHardware { void DecodeVideoCallback::OnError(MediaAVCodec::AVCodecErrorType errorType, int32_t errorCode) { - DHLOGE("DecodeVideoCallback : OnError. Error type: %d. Error code: %d ", errorType, errorCode); + DHLOGE("DecodeVideoCallback : OnError. Error type: %{public}d. Error code: %{public}d ", errorType, errorCode); std::shared_ptr targetDecoderNode = decodeVideoNode_.lock(); - CHECK_AND_RETURN_LOG(targetDecoderNode == nullptr, "%s", "decodeVideoNode_ is nullptr."); + CHECK_AND_RETURN_LOG(targetDecoderNode == nullptr, "%{public}s", "decodeVideoNode_ is nullptr."); targetDecoderNode->OnError(); } diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp index d798c32c34facf620201011219431683b4d55fc6..8e79e671df615fbbcbda03ea0fe5b84741acdfc5 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp @@ -21,7 +21,6 @@ #include "encode_video_callback.h" #include "graphic_common_c.h" #include -#include "dh_log.h" #ifndef DH_LOG_TAG #define DH_LOG_TAG "DCDP_NODE_ENCODEC" @@ -62,7 +61,7 @@ int32_t EncodeDataProcess::InitNode(const VideoConfigParams& sourceConfig, const return DCAMERA_BAD_VALUE; } if (!IsConvertible(sourceConfig, targetConfig)) { - DHLOGE("The EncodeNode cannot convert source VideoCodecType %d to target VideoCodecType %d.", + DHLOGE("The EncodeNode cannot convert source VideoCodecType %{public}d to target VideoCodecType %{public}d.", sourceConfig.GetVideoCodecType(), targetConfig.GetVideoCodecType()); return DCAMERA_BAD_TYPE; } @@ -70,8 +69,8 @@ int32_t EncodeDataProcess::InitNode(const VideoConfigParams& sourceConfig, const sourceConfig_ = sourceConfig; targetConfig_ = targetConfig; if (sourceConfig_.GetVideoCodecType() == targetConfig_.GetVideoCodecType()) { - DHLOGD("Disable EncodeNode. The target VideoCodecType %d is the same as the source VideoCodecType %d.", - sourceConfig_.GetVideoCodecType(), targetConfig_.GetVideoCodecType()); + DHLOGD("Disable EncodeNode. The target VideoCodecType %{public}d is the same as the source VideoCodecType " + "%{public}d.", sourceConfig_.GetVideoCodecType(), targetConfig_.GetVideoCodecType()); processedConfig_ = sourceConfig; processedConfig = processedConfig_; isEncoderProcess_.store(true); @@ -107,7 +106,7 @@ int32_t EncodeDataProcess::InitEncoder() DHLOGD("Init video encoder."); int32_t ret = ConfigureVideoEncoder(); if (ret != DCAMERA_OK) { - DHLOGE("Init video encoder metadata format failed. ret %d.", ret); + DHLOGE("Init video encoder metadata format failed. ret %{public}d.", ret); return ret; } @@ -115,8 +114,8 @@ int32_t EncodeDataProcess::InitEncoder() if (ret != DCAMERA_OK) { DHLOGE("Start Video encoder failed."); ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_ENCODE_ERROR, - CreateMsg("start video encoder failed, width: %d, height: %d, format: %s", sourceConfig_.GetWidth(), - sourceConfig_.GetHeight(), + CreateMsg("start video encoder failed, width: %d, height: %d, format: %s", + sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())].c_str())); return ret; } @@ -128,10 +127,10 @@ int32_t EncodeDataProcess::ConfigureVideoEncoder() { int32_t ret = InitEncoderMetadataFormat(); CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, - "Init video encoder metadata format failed. ret %d.", ret); + "Init video encoder metadata format failed. ret %{public}d.", ret); ret = InitEncoderBitrateFormat(); CHECK_AND_RETURN_RET_LOG(ret != DCAMERA_OK, ret, - "Init video encoder bitrate format failed. ret %d.", ret); + "Init video encoder bitrate format failed. ret %{public}d.", ret); videoEncoder_ = MediaAVCodec::VideoEncoderFactory::CreateByMime(processType_); if (videoEncoder_ == nullptr) { DHLOGE("Create video encoder failed."); @@ -140,13 +139,13 @@ int32_t EncodeDataProcess::ConfigureVideoEncoder() encodeVideoCallback_ = std::make_shared(shared_from_this()); ret = videoEncoder_->SetCallback(encodeVideoCallback_); if (ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK) { - DHLOGE("Set video encoder callback failed. ret %d.", ret); + DHLOGE("Set video encoder callback failed. ret %{public}d.", ret); return DCAMERA_INIT_ERR; } ret = videoEncoder_->Configure(metadataFormat_); CHECK_AND_RETURN_RET_LOG(ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK, DCAMERA_INIT_ERR, - "Set video encoder metadata format failed. ret %d.", ret); + "Set video encoder metadata format failed. ret %{public}d.", ret); encodeProducerSurface_ = videoEncoder_->CreateInputSurface(); CHECK_AND_RETURN_RET_LOG(encodeProducerSurface_ == nullptr, DCAMERA_INIT_ERR, @@ -210,11 +209,11 @@ int32_t EncodeDataProcess::InitEncoderBitrateFormat() { DHLOGD("Init video encoder bitrate format."); CHECK_AND_RETURN_RET_LOG(!(IsInEncoderRange(sourceConfig_) && IsInEncoderRange(targetConfig_)), DCAMERA_BAD_VALUE, - "%s", "Source config or target config are invalid."); + "%{public}s", "Source config or target config are invalid."); metadataFormat_.PutIntValue("i_frame_interval", IDR_FRAME_INTERVAL_MS); metadataFormat_.PutIntValue("video_encode_bitrate_mode", MediaAVCodec::VideoEncodeBitrateMode::VBR); - CHECK_AND_RETURN_RET_LOG(ENCODER_BITRATE_TABLE.empty(), DCAMERA_OK, "%s", + CHECK_AND_RETURN_RET_LOG(ENCODER_BITRATE_TABLE.empty(), DCAMERA_OK, "%{public}s", "ENCODER_BITRATE_TABLE is null, use the default bitrate of the encoder."); int64_t pixelformat = static_cast(sourceConfig_.GetWidth() * sourceConfig_.GetHeight()); int32_t matchedBitrate = BITRATE_6000000; @@ -230,8 +229,8 @@ int32_t EncodeDataProcess::InitEncoderBitrateFormat() matchedBitrate = it->second; } } - DHLOGD("Source config: width : %d, height : %d, matched bitrate %d.", sourceConfig_.GetWidth(), - sourceConfig_.GetHeight(), matchedBitrate); + DHLOGD("Source config: width : %{public}d, height : %{public}d, matched bitrate %{public}d.", + sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), matchedBitrate); metadataFormat_.PutIntValue("bitrate", matchedBitrate); return DCAMERA_OK; } @@ -245,10 +244,10 @@ int32_t EncodeDataProcess::StartVideoEncoder() int32_t ret = videoEncoder_->Prepare(); CHECK_AND_RETURN_RET_LOG(ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK, DCAMERA_INIT_ERR, - "Video encoder prepare failed. ret %d.", ret); + "Video encoder prepare failed. ret %{public}d.", ret); ret = videoEncoder_->Start(); CHECK_AND_RETURN_RET_LOG(ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK, DCAMERA_INIT_ERR, - "Video encoder start failed. ret %d.", ret); + "Video encoder start failed. ret %{public}d.", ret); return DCAMERA_OK; } @@ -262,12 +261,12 @@ int32_t EncodeDataProcess::StopVideoEncoder() bool isSuccess = true; int32_t ret = videoEncoder_->Flush(); if (ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK) { - DHLOGE("VideoEncoder flush failed. ret %d.", ret); + DHLOGE("VideoEncoder flush failed. ret %{public}d.", ret); isSuccess = isSuccess && false; } ret = videoEncoder_->Stop(); if (ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK) { - DHLOGE("VideoEncoder stop failed. ret %d.", ret); + DHLOGE("VideoEncoder stop failed. ret %{public}d.", ret); isSuccess = isSuccess && false; } @@ -288,9 +287,10 @@ void EncodeDataProcess::ReleaseVideoEncoder() return; } int32_t ret = StopVideoEncoder(); - CHECK_AND_LOG(ret != DCAMERA_OK, "%s", "StopVideoEncoder failed."); + CHECK_AND_LOG(ret != DCAMERA_OK, "%{public}s", "StopVideoEncoder failed."); ret = videoEncoder_->Release(); - CHECK_AND_LOG(ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK, "VideoEncoder release failed. ret %d.", ret); + CHECK_AND_LOG(ret != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK, + "VideoEncoder release failed. ret %{public}d.", ret); encodeProducerSurface_ = nullptr; videoEncoder_ = nullptr; encodeVideoCallback_ = nullptr; @@ -299,7 +299,7 @@ void EncodeDataProcess::ReleaseVideoEncoder() void EncodeDataProcess::ReleaseProcessNode() { - DHLOGD("Start release [%zu] node : EncodeNode.", nodeRank_); + DHLOGD("Start release [%{public}zu] node : EncodeNode.", nodeRank_); isEncoderProcess_.store(false); ReleaseVideoEncoder(); @@ -312,7 +312,7 @@ void EncodeDataProcess::ReleaseProcessNode() nextDataProcess_->ReleaseProcessNode(); nextDataProcess_ = nullptr; } - DHLOGD("Release [%zu] node : EncodeNode end.", nodeRank_); + DHLOGD("Release [%{public}zu] node : EncodeNode end.", nodeRank_); } int32_t EncodeDataProcess::ProcessData(std::vector>& inputBuffers) @@ -323,7 +323,7 @@ int32_t EncodeDataProcess::ProcessData(std::vector>& return DCAMERA_BAD_VALUE; } if (sourceConfig_.GetVideoCodecType() == processedConfig_.GetVideoCodecType()) { - DHLOGD("The target VideoCodecType : %d is the same as the source VideoCodecType : %d.", + DHLOGD("The target VideoCodecType : %{public}d is the same as the source VideoCodecType : %{public}d.", sourceConfig_.GetVideoCodecType(), processedConfig_.GetVideoCodecType()); return EncodeDone(inputBuffers); } @@ -332,24 +332,24 @@ int32_t EncodeDataProcess::ProcessData(std::vector>& return DCAMERA_INIT_ERR; } if (inputBuffers[0]->Size() > NORM_YUV420_BUFFER_SIZE) { - DHLOGE("EncodeNode input buffer size %d error.", inputBuffers[0]->Size()); + DHLOGE("EncodeNode input buffer size %{public}zu error.", inputBuffers[0]->Size()); return DCAMERA_MEMORY_OPT_ERROR; } - CHECK_AND_RETURN_RET_LOG(!isEncoderProcess_.load(), DCAMERA_DISABLE_PROCESS, "%s", + CHECK_AND_RETURN_RET_LOG(!isEncoderProcess_.load(), DCAMERA_DISABLE_PROCESS, "%{public}s", "EncodeNode occurred error or start release."); int32_t err = FeedEncoderInputBuffer(inputBuffers[0]); - CHECK_AND_RETURN_RET_LOG(err != DCAMERA_OK, err, "%s", "Feed encoder input Buffer failed."); + CHECK_AND_RETURN_RET_LOG(err != DCAMERA_OK, err, "%{public}s", "Feed encoder input Buffer failed."); return DCAMERA_OK; } int32_t EncodeDataProcess::FeedEncoderInputBuffer(std::shared_ptr& inputBuffer) { std::lock_guard lck(mtxEncoderState_); - DHLOGD("Feed encoder input buffer, buffer size %d.", inputBuffer->Size()); - CHECK_AND_RETURN_RET_LOG(encodeProducerSurface_ == nullptr, DCAMERA_INIT_ERR, "%s", + DHLOGD("Feed encoder input buffer, buffer size %{public}zu.", inputBuffer->Size()); + CHECK_AND_RETURN_RET_LOG(encodeProducerSurface_ == nullptr, DCAMERA_INIT_ERR, "%{public}s", "Get encoder input producer surface failed."); sptr surfacebuffer = GetEncoderInputSurfaceBuffer(); - CHECK_AND_RETURN_RET_LOG(surfacebuffer == nullptr, DCAMERA_BAD_OPERATE, "%s", + CHECK_AND_RETURN_RET_LOG(surfacebuffer == nullptr, DCAMERA_BAD_OPERATE, "%{public}s", "Get encoder input producer surface buffer failed."); uint8_t *addr = static_cast(surfacebuffer->GetVirAddr()); if (addr == nullptr) { @@ -360,10 +360,11 @@ int32_t EncodeDataProcess::FeedEncoderInputBuffer(std::shared_ptr& i size_t size = static_cast(surfacebuffer->GetSize()); errno_t err = memcpy_s(addr, size, inputBuffer->Data(), inputBuffer->Size()); CHECK_AND_RETURN_RET_LOG(err != EOK, DCAMERA_MEMORY_OPT_ERROR, - "memcpy_s encoder input producer surface buffer failed, surBufSize %zu.", size); + "memcpy_s encoder input producer surfacebuffer failed, surBufSize %{public}zu.", size); inputTimeStampUs_ = GetEncoderTimeStamp(); - DHLOGD("Encoder input buffer size %d, timeStamp %lld.", inputBuffer->Size(), (long long)inputTimeStampUs_); + DHLOGD("Encoder input buffer size %{public}zu, timeStamp %{public}lld.", inputBuffer->Size(), + (long long)inputTimeStampUs_); surfacebuffer->GetExtraData()->ExtraSet("timeStamp", inputTimeStampUs_); BufferFlushConfig flushConfig = { {0, 0, sourceConfig_.GetWidth(), sourceConfig_.GetHeight()}, 0}; @@ -425,17 +426,17 @@ void EncodeDataProcess::IncreaseWaitEncodeCnt() } else { waitEncoderOutputCount_++; } - DHLOGD("Wait encoder output frames number is %d.", waitEncoderOutputCount_); + DHLOGD("Wait encoder output frames number is %{public}d.", waitEncoderOutputCount_); } void EncodeDataProcess::ReduceWaitEncodeCnt() { std::lock_guard lck(mtxHoldCount_); if (waitEncoderOutputCount_ <= 0) { - DHLOGE("The waitEncoderOutputCount_ = %d.", waitEncoderOutputCount_); + DHLOGE("The waitEncoderOutputCount_ = %{public}d.", waitEncoderOutputCount_); } waitEncoderOutputCount_--; - DHLOGD("Wait encoder output frames number is %d.", waitEncoderOutputCount_); + DHLOGD("Wait encoder output frames number is %{public}d.", waitEncoderOutputCount_); } int32_t EncodeDataProcess::GetEncoderOutputBuffer(uint32_t index, MediaAVCodec::AVCodecBufferInfo info, @@ -447,18 +448,18 @@ int32_t EncodeDataProcess::GetEncoderOutputBuffer(uint32_t index, MediaAVCodec:: return DCAMERA_BAD_VALUE; } if (buffer == nullptr) { - DHLOGE("Failed to get the output shared memory, index : %u", index); + DHLOGE("Failed to get the output shared memory, index : %{public}u", index); return DCAMERA_BAD_OPERATE; } CHECK_AND_RETURN_RET_LOG(info.size <= 0 || info.size > DATABUFF_MAX_SIZE, DCAMERA_BAD_VALUE, - "AVCodecBufferInfo error, buffer size : %d", info.size); + "AVCodecBufferInfo error, buffer size : %{public}d", info.size); size_t outputMemoDataSize = static_cast(info.size); - DHLOGD("Encoder output buffer size : %d", outputMemoDataSize); + DHLOGD("Encoder output buffer size : %{public}zu", outputMemoDataSize); std::shared_ptr bufferOutput = std::make_shared(outputMemoDataSize); errno_t err = memcpy_s(bufferOutput->Data(), bufferOutput->Size(), buffer->GetBase(), outputMemoDataSize); - CHECK_AND_RETURN_RET_LOG(err != EOK, DCAMERA_MEMORY_OPT_ERROR, "%s", "memcpy_s buffer failed."); + CHECK_AND_RETURN_RET_LOG(err != EOK, DCAMERA_MEMORY_OPT_ERROR, "%{public}s", "memcpy_s buffer failed."); int64_t timeStamp = info.presentationTimeUs; struct timespec time = {0, 0}; clock_gettime(CLOCK_MONOTONIC, &time); @@ -488,7 +489,7 @@ int32_t EncodeDataProcess::EncodeDone(std::vector>& if (nextDataProcess_ != nullptr) { DHLOGD("Send to the next node of the encoder for processing."); int32_t err = nextDataProcess_->ProcessData(outputBuffers); - CHECK_AND_LOG(err != DCAMERA_OK, "%s", "Someone node after the encoder processes failed."); + CHECK_AND_LOG(err != DCAMERA_OK, "%{public}s", "Someone node after the encoder processes failed."); return err; } DHLOGD("The current node is the last node, and Output the processed video buffer"); @@ -510,13 +511,13 @@ void EncodeDataProcess::OnError() videoEncoder_->Stop(); } std::shared_ptr targetPipelineSink = callbackPipelineSink_.lock(); - CHECK_AND_RETURN_LOG(targetPipelineSink == nullptr, "%s", "callbackPipelineSink_ is nullptr."); + CHECK_AND_RETURN_LOG(targetPipelineSink == nullptr, "%{public}s", "callbackPipelineSink_ is nullptr."); targetPipelineSink->OnError(DataProcessErrorType::ERROR_PIPELINE_ENCODER); } void EncodeDataProcess::OnInputBufferAvailable(uint32_t index, std::shared_ptr buffer) { - DHLOGD("The available input buffer index : %u. No operation when using surface input.", index); + DHLOGD("The available input buffer index : %{public}u. No operation when using input.", index); } void EncodeDataProcess::OnOutputFormatChanged(const Media::Format &format) @@ -535,18 +536,18 @@ void EncodeDataProcess::OnOutputBufferAvailable(uint32_t index, MediaAVCodec::AV DHLOGE("EncodeNode occurred error or start release."); return; } - DHLOGD("Video encode buffer info: presentation TimeUs %lld, size %d, offset %d, flag %d", - info.presentationTimeUs, info.size, info.offset, flag); + DHLOGD("Video encode buffer info: presentation TimeUs %{public}" PRId64", size %{public}d, offset %{public}d, " + "flag %{public}d", info.presentationTimeUs, info.size, info.offset, flag); int32_t err = GetEncoderOutputBuffer(index, info, flag, buffer); if (err != DCAMERA_OK) { DHLOGE("Get encode output Buffer failed."); return; } - CHECK_AND_RETURN_LOG(videoEncoder_ == nullptr, "%s", + CHECK_AND_RETURN_LOG(videoEncoder_ == nullptr, "%{public}s", "The video encoder does not exist before release output buffer index."); int32_t errRelease = videoEncoder_->ReleaseOutputBuffer(index); CHECK_AND_LOG(errRelease != MediaAVCodec::AVCodecServiceErrCode::AVCS_ERR_OK, - "The video encoder release output buffer failed, index : [%u].", index); + "The video encoder release output buffer failed, index : [%{public}u].", index); } VideoConfigParams EncodeDataProcess::GetSourceConfig() const @@ -564,7 +565,7 @@ int32_t EncodeDataProcess::GetProperty(const std::string& propertyName, Property if (propertyName != surfaceStr_) { return DCAMERA_OK; } - CHECK_AND_RETURN_RET_LOG(encodeProducerSurface_ == nullptr, DCAMERA_BAD_VALUE, "%s", + CHECK_AND_RETURN_RET_LOG(encodeProducerSurface_ == nullptr, DCAMERA_BAD_VALUE, "%{public}s", "EncodeDataProcess::GetProperty: encode dataProcess get property fail, encode surface is nullptr."); return propertyCarrier.CarrySurfaceProperty(encodeProducerSurface_); } diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_video_callback.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_video_callback.cpp index 4467986fc85879ec44ce82084e1e97cf6d32cc4d..b360475e03983dff89558dcf4d423076e88aa288 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_video_callback.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_video_callback.cpp @@ -15,15 +15,14 @@ #include "encode_video_callback.h" #include "distributed_hardware_log.h" -#include "dh_log.h" namespace OHOS { namespace DistributedHardware { void EncodeVideoCallback::OnError(MediaAVCodec::AVCodecErrorType errorType, int32_t errorCode) { - DHLOGD("EncodeVideoCallback : OnError. Error type: %d. Error code: %d ", errorType, errorCode); + DHLOGD("EncodeVideoCallback : OnError. Error type: %{public}d. Error code: %{public}d ", errorType, errorCode); std::shared_ptr targetEncoderNode = encodeVideoNode_.lock(); - CHECK_AND_RETURN_LOG(targetEncoderNode == nullptr, "%s", "encodeVideoNode_ is nullptr."); + CHECK_AND_RETURN_LOG(targetEncoderNode == nullptr, "%{public}s", "encodeVideoNode_ is nullptr."); targetEncoderNode->OnError(); } diff --git a/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process.cpp b/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process.cpp index 5d218787d84280b5eaf3d96b6f187482dd053af7..659598875cfaf048a4c7194509bb97aca8b8ac87 100644 --- a/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process.cpp +++ b/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process.cpp @@ -44,8 +44,8 @@ int32_t ScaleConvertProcess::InitNode(const VideoConfigParams& sourceConfig, con processedConfig = processedConfig_; if (!IsConvertible(sourceConfig, targetConfig)) { - DHLOGI("sourceConfig: Videoformat %d Width %d, Height %d is the same as the targetConfig: " - "Videoformat %d Width %d, Height %d.", + DHLOGI("sourceConfig: Videoformat %{public}d Width %{public}d, Height %{public}d is the same as the " + "targetConfig: Videoformat %{public}d Width %{public}d, Height %{public}d.", sourceConfig.GetVideoformat(), sourceConfig.GetWidth(), sourceConfig.GetHeight(), targetConfig.GetVideoformat(), targetConfig.GetWidth(), targetConfig.GetHeight()); } @@ -63,14 +63,14 @@ bool ScaleConvertProcess::IsConvertible(const VideoConfigParams& sourceConfig, c void ScaleConvertProcess::ReleaseProcessNode() { - DHLOGI("Start release [%zu] node : ScaleConvertNode.", nodeRank_); + DHLOGI("Start release [%{public}zu] node : ScaleConvertNode.", nodeRank_); isScaleConvert_.store(false); if (nextDataProcess_ != nullptr) { nextDataProcess_->ReleaseProcessNode(); nextDataProcess_ = nullptr; } - DHLOGI("Release [%zu] node : ScaleConvertNode end.", nodeRank_); + DHLOGI("Release [%{public}zu] node : ScaleConvertNode end.", nodeRank_); } int ScaleConvertProcess::ProcessData(std::vector>& inputBuffers) @@ -89,7 +89,8 @@ int ScaleConvertProcess::ProcessData(std::vector>& i inputBuffers[0]->frameInfo_.timePonit.startScale = startScaleTime; if (!IsConvertible(sourceConfig_, processedConfig_)) { - DHLOGD("The target resolution: %dx%d format: %d is the same as the source resolution: %dx%d format: %d", + DHLOGD("The target resolution: %{public}dx%{public}d format: %{public}d is the same as the source " + "resolution: %{public}dx%{public}d format: %{public}d", processedConfig_.GetWidth(), processedConfig_.GetHeight(), processedConfig_.GetVideoformat(), sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), sourceConfig_.GetVideoformat()); return ConvertDone(inputBuffers); @@ -152,7 +153,7 @@ int32_t ScaleConvertProcess::GetImageUnitInfo(ImageUnitInfo& imgInfo, const std: if (colorFormat != static_cast(Videoformat::YUVI420) && colorFormat != static_cast(Videoformat::NV12) && colorFormat != static_cast(Videoformat::NV21)) { - DHLOGE("GetImageUnitInfo failed, colorFormat %d are not supported.", colorFormat); + DHLOGE("GetImageUnitInfo failed, colorFormat %{public}d are not supported.", colorFormat); return DCAMERA_NOT_FOUND; } imgInfo.colorFormat = static_cast(colorFormat); @@ -161,8 +162,8 @@ int32_t ScaleConvertProcess::GetImageUnitInfo(ImageUnitInfo& imgInfo, const std: findErr = findErr && imgBuf->FindInt32("alignedWidth", imgInfo.alignedWidth); findErr = findErr && imgBuf->FindInt32("alignedHeight", imgInfo.alignedHeight); if (!findErr) { - DHLOGE("GetImageUnitInfo failed, width %d, height %d, alignedWidth %d, alignedHeight %d.", - imgInfo.width, imgInfo.height, imgInfo.alignedWidth, imgInfo.alignedHeight); + DHLOGE("GetImageUnitInfo failed, width %{public}d, height %{public}d, alignedWidth %{public}d, " + "alignedHeight %{public}d.", imgInfo.width, imgInfo.height, imgInfo.alignedWidth, imgInfo.alignedHeight); return DCAMERA_NOT_FOUND; } @@ -170,8 +171,9 @@ int32_t ScaleConvertProcess::GetImageUnitInfo(ImageUnitInfo& imgInfo, const std: imgInfo.imgSize = imgBuf->Size(); imgInfo.imgData = imgBuf; - DHLOGD("ScaleConvertProcess imgBuf info : Videoformat %d, alignedWidth %d, alignedHeight %d, width %d, height %d" + - ", chromaOffset %zu, imgSize %zu.", imgInfo.colorFormat, imgInfo.alignedWidth, imgInfo.alignedHeight, + DHLOGD("ScaleConvertProcess imgBuf info : Videoformat %{public}d, alignedWidth %{public}d, alignedHeight " + "%{public}d, width %{public}d, height %{public}d, chromaOffset %{public}zu, imgSize %{public}zu.", + imgInfo.colorFormat, imgInfo.alignedWidth, imgInfo.alignedHeight, imgInfo.width, imgInfo.height, imgInfo.chromaOffset, imgInfo.imgSize); return DCAMERA_OK; } @@ -192,23 +194,23 @@ bool ScaleConvertProcess::CheckScaleConvertInfo(const ImageUnitInfo& srcImgInfo, } if (!IsCorrectImageUnitInfo(srcImgInfo)) { - DHLOGE("srcImginfo fail: width %d, height %d, alignedWidth %d, alignedHeight %d, chromaOffset %lld, " + - "imgSize %lld.", srcImgInfo.width, srcImgInfo.height, srcImgInfo.alignedWidth, srcImgInfo.alignedHeight, - srcImgInfo.chromaOffset, srcImgInfo.imgSize); + DHLOGE("srcImginfo fail: width %{public}d, height %{public}d, alignedWidth %{public}d, alignedHeight " + "%{public}d, chromaOffset %{public}zu, imgSize %{public}zu.", srcImgInfo.width, srcImgInfo.height, + srcImgInfo.alignedWidth, srcImgInfo.alignedHeight, srcImgInfo.chromaOffset, srcImgInfo.imgSize); return false; } if (!IsCorrectImageUnitInfo(dstImgInfo)) { - DHLOGE("dstImginfo fail: width %d, height %d, alignedWidth %d, alignedHeight %d, chromaOffset %lld, " + - "imgSize %lld.", dstImgInfo.width, dstImgInfo.height, dstImgInfo.alignedWidth, dstImgInfo.alignedHeight, - dstImgInfo.chromaOffset, dstImgInfo.imgSize); + DHLOGE("dstImginfo fail: width %{public}d, height %{public}d, alignedWidth %{public}d, alignedHeight " + "%{public}d, chromaOffset %{public}zu, imgSize %{public}zu.", dstImgInfo.width, dstImgInfo.height, + dstImgInfo.alignedWidth, dstImgInfo.alignedHeight, dstImgInfo.chromaOffset, dstImgInfo.imgSize); return false; } if ((dstImgInfo.width == srcImgInfo.alignedWidth) && (dstImgInfo.height == srcImgInfo.alignedHeight) && (dstImgInfo.colorFormat == srcImgInfo.colorFormat)) { - DHLOGE("Comparison ImgInfo fail: dstwidth %d, dstheight %d, dstColorFormat %d, " - "srcAlignedWidth %d, srcAlignedHeight %d, srcColorFormat %d.", + DHLOGE("Comparison ImgInfo fail: dstwidth %{public}d, dstheight %{public}d, dstColorFormat %{public}d, " + "srcAlignedWidth %{public}d, srcAlignedHeight %{public}d, srcColorFormat %{public}d.", dstImgInfo.width, dstImgInfo.height, dstImgInfo.colorFormat, srcImgInfo.alignedWidth, srcImgInfo.alignedHeight, srcImgInfo.colorFormat); return false; @@ -248,7 +250,7 @@ int32_t ScaleConvertProcess::ScaleConvert(ImageUnitInfo& srcImgInfo, ImageUnitIn ret = ConvertFormatToRGBA(srcImgInfo, dstImgInfo, dstBuf); } if (ret != DCAMERA_OK) { - DHLOGE("Convert I420 to format: %d failed.", processedConfig_.GetVideoformat()); + DHLOGE("Convert I420 to format: %{public}d failed.", processedConfig_.GetVideoformat()); return ret; } @@ -265,8 +267,8 @@ int32_t ScaleConvertProcess::ConvertResolution(ImageUnitInfo& srcImgInfo, ImageU return DCAMERA_OK; } - DHLOGD("Convert I420 Scale: format=%d, width=[%d, %d], height=[%d, %d]", srcImgInfo.colorFormat, - srcImgInfo.width, srcImgInfo.alignedWidth, srcImgInfo.height, srcImgInfo.alignedHeight); + DHLOGD("Convert I420 Scale: format=%{public}d, width=[%{public}d, %{public}d], height=[%{public}d, %{public}d]", + srcImgInfo.colorFormat, srcImgInfo.width, srcImgInfo.alignedWidth, srcImgInfo.height, srcImgInfo.alignedHeight); int srcSizeY = srcImgInfo.width * srcImgInfo.height; int srcSizeUV = (static_cast(srcImgInfo.width) >> MEMORY_RATIO_UV) * (static_cast(srcImgInfo.height) >> MEMORY_RATIO_UV); @@ -315,8 +317,9 @@ int32_t ScaleConvertProcess::ConvertFormatToNV21(ImageUnitInfo& srcImgInfo, Imag return DCAMERA_OK; } - DHLOGD("Convert I420 to NV21: format=%d, width=[%d, %d], height=[%d, %d]", srcImgInfo.colorFormat, - srcImgInfo.width, srcImgInfo.alignedWidth, srcImgInfo.height, srcImgInfo.alignedHeight); + DHLOGD("Convert I420 to NV21: format=%{public}d, width=[%{public}d, %{public}d], height=[%{public}d, %{public}d]", + srcImgInfo.colorFormat, srcImgInfo.width, srcImgInfo.alignedWidth, srcImgInfo.height, + srcImgInfo.alignedHeight); int srcSizeY = srcImgInfo.width * srcImgInfo.height; int srcSizeUV = (static_cast(srcImgInfo.width) >> MEMORY_RATIO_UV) * (static_cast(srcImgInfo.height) >> MEMORY_RATIO_UV); @@ -352,8 +355,8 @@ int32_t ScaleConvertProcess::ConvertFormatToRGBA(ImageUnitInfo& srcImgInfo, Imag return DCAMERA_OK; } - DHLOGI("Convert I420 to RGBA: format=%d, width=[%d, %d], height=[%d, %d]", srcImgInfo.colorFormat, - srcImgInfo.width, srcImgInfo.alignedWidth, srcImgInfo.height, srcImgInfo.alignedHeight); + DHLOGI("Convert I420 to RGBA: format=%{public}d, width=[%{public}d, %{public}d], height=[%{public}d, %{public}d]", + srcImgInfo.colorFormat, srcImgInfo.width, srcImgInfo.alignedWidth, srcImgInfo.height, srcImgInfo.alignedHeight); int srcSizeY = srcImgInfo.width * srcImgInfo.height; int srcSizeUV = (static_cast(srcImgInfo.width) >> MEMORY_RATIO_UV) * (static_cast(srcImgInfo.height) >> MEMORY_RATIO_UV); diff --git a/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process_common.cpp b/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process_common.cpp index 64c53f66f7eed724d98bed7717c1a9d880031002..f3b1375fdc4ce45e7af5d937ac0d43a9f794cf04 100644 --- a/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process_common.cpp +++ b/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process_common.cpp @@ -42,7 +42,8 @@ int32_t ScaleConvertProcess::InitNode(const VideoConfigParams& sourceConfig, con processedConfig = processedConfig_; if (!IsConvertible(sourceConfig, targetConfig)) { - DHLOGI("sourceConfig: Videoformat %d Width %d, Height %d, targetConfig: Videoformat %d Width %d, Height %d.", + DHLOGI("sourceConfig: Videoformat %{public}d Width %{public}d, Height %{public}d, targetConfig: " + "Videoformat %{public}d Width %{public}d, Height %{public}d.", sourceConfig.GetVideoformat(), sourceConfig.GetWidth(), sourceConfig.GetHeight(), targetConfig.GetVideoformat(), targetConfig.GetWidth(), targetConfig.GetHeight()); isScaleConvert_.store(true); @@ -84,7 +85,7 @@ bool ScaleConvertProcess::IsConvertible(const VideoConfigParams& sourceConfig, c void ScaleConvertProcess::ReleaseProcessNode() { - DHLOGI("Start release [%zu] node : ScaleConvertNode.", nodeRank_); + DHLOGI("Start release [%{public}zu] node : ScaleConvertNode.", nodeRank_); isScaleConvert_.store(false); { @@ -101,7 +102,7 @@ void ScaleConvertProcess::ReleaseProcessNode() nextDataProcess_->ReleaseProcessNode(); nextDataProcess_ = nullptr; } - DHLOGI("Release [%zu] node : ScaleConvertNode end.", nodeRank_); + DHLOGI("Release [%{public}zu] node : ScaleConvertNode end.", nodeRank_); } int ScaleConvertProcess::ProcessData(std::vector>& inputBuffers) @@ -120,7 +121,8 @@ int ScaleConvertProcess::ProcessData(std::vector>& i inputBuffers[0]->frameInfo_.timePonit.startScale = startScaleTime; if (!IsConvertible(sourceConfig_, processedConfig_)) { - DHLOGD("The target resolution: %dx%d format: %d is the same as the source resolution: %dx%d format: %d", + DHLOGD("The target resolution: %{public}dx%{public}d format: %{public}d is the same as the source " + "resolution: %{public}dx%{public}d format: %{public}d", processedConfig_.GetWidth(), processedConfig_.GetHeight(), processedConfig_.GetVideoformat(), sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), sourceConfig_.GetVideoformat()); return ConvertDone(inputBuffers); @@ -171,7 +173,7 @@ int32_t ScaleConvertProcess::GetImageUnitInfo(ImageUnitInfo& imgInfo, const std: if (colorFormat != static_cast(Videoformat::YUVI420) && colorFormat != static_cast(Videoformat::NV12) && colorFormat != static_cast(Videoformat::NV21)) { - DHLOGE("GetImageUnitInfo failed, colorFormat %d are not supported.", colorFormat); + DHLOGE("GetImageUnitInfo failed, colorFormat %{public}d are not supported.", colorFormat); return DCAMERA_NOT_FOUND; } imgInfo.colorFormat = static_cast(colorFormat); @@ -180,8 +182,8 @@ int32_t ScaleConvertProcess::GetImageUnitInfo(ImageUnitInfo& imgInfo, const std: findErr = findErr && imgBuf->FindInt32("alignedWidth", imgInfo.alignedWidth); findErr = findErr && imgBuf->FindInt32("alignedHeight", imgInfo.alignedHeight); if (!findErr) { - DHLOGE("GetImageUnitInfo failed, width %d, height %d, alignedWidth %d, alignedHeight %d.", - imgInfo.width, imgInfo.height, imgInfo.alignedWidth, imgInfo.alignedHeight); + DHLOGE("GetImageUnitInfo failed, width %{public}d, height %{public}d, alignedWidth %{public}d, " + "alignedHeight %{public}d.", imgInfo.width, imgInfo.height, imgInfo.alignedWidth, imgInfo.alignedHeight); return DCAMERA_NOT_FOUND; } @@ -192,8 +194,9 @@ int32_t ScaleConvertProcess::GetImageUnitInfo(ImageUnitInfo& imgInfo, const std: DHLOGE("Get the imgData of the imgBuf failed."); return DCAMERA_BAD_VALUE; } - DHLOGD("ScaleConvertProcess imgBuf info : Videoformat %d, alignedWidth %d, alignedHeight %d, width %d, height %d" + - ", chromaOffset %zu, imgSize %zu.", imgInfo.colorFormat, imgInfo.alignedWidth, imgInfo.alignedHeight, + DHLOGD("ScaleConvertProcess imgBuf info : Videoformat %{public}d, alignedWidth %{public}d, alignedHeight " + "%{public}d, width %{public}d, height %{public}d, chromaOffset %{public}zu, imgSize %{public}zu.", + imgInfo.colorFormat, imgInfo.alignedWidth, imgInfo.alignedHeight, imgInfo.width, imgInfo.height, imgInfo.chromaOffset, imgInfo.imgSize); return DCAMERA_OK; } @@ -214,23 +217,24 @@ bool ScaleConvertProcess::CheckScaleConvertInfo(const ImageUnitInfo& srcImgInfo, } if (!IsCorrectImageUnitInfo(srcImgInfo)) { - DHLOGE("srcImginfo fail: width %d, height %d, alignedWidth %d, alignedHeight %d, chromaOffset %lld, " + - "imgSize %lld.", srcImgInfo.width, srcImgInfo.height, srcImgInfo.alignedWidth, srcImgInfo.alignedHeight, - srcImgInfo.chromaOffset, srcImgInfo.imgSize); + DHLOGE("srcImginfo fail: width %{public}d, height %{public}d, alignedWidth %{public}d, alignedHeight " + "%{public}d, chromaOffset %{public}zu, imgSize %{public}zu.", srcImgInfo.width, srcImgInfo.height, + srcImgInfo.alignedWidth, srcImgInfo.alignedHeight, srcImgInfo.chromaOffset, srcImgInfo.imgSize); return false; } if (!IsCorrectImageUnitInfo(dstImgInfo)) { - DHLOGE("dstImginfo fail: width %d, height %d, alignedWidth %d, alignedHeight %d, chromaOffset %lld, " + - "imgSize %lld.", dstImgInfo.width, dstImgInfo.height, dstImgInfo.alignedWidth, dstImgInfo.alignedHeight, - dstImgInfo.chromaOffset, dstImgInfo.imgSize); + DHLOGE("dstImginfo fail: width %{public}d, height %{public}d, alignedWidth %{public}d, alignedHeight " + "%{public}d, chromaOffset %{public}zu, imgSize %{public}zu.", dstImgInfo.width, dstImgInfo.height, + dstImgInfo.alignedWidth, dstImgInfo.alignedHeight, dstImgInfo.chromaOffset, dstImgInfo.imgSize); return false; } if ((dstImgInfo.width == srcImgInfo.alignedWidth) && (dstImgInfo.height == srcImgInfo.alignedHeight) && (dstImgInfo.colorFormat == srcImgInfo.colorFormat)) { - DHLOGE("Comparison ImgInfo fail: dstwidth %d, dstheight %d, srcAlignedWidth %d, srcAlignedHeight %d.", - dstImgInfo.width, dstImgInfo.height, srcImgInfo.alignedWidth, srcImgInfo.alignedHeight); + DHLOGE("Comparison ImgInfo fail: dstwidth %{public}d, dstheight %{public}d, srcAlignedWidth %{public}d, " + "srcAlignedHeight %{public}d.", dstImgInfo.width, dstImgInfo.height, srcImgInfo.alignedWidth, + srcImgInfo.alignedHeight); return false; } @@ -289,7 +293,7 @@ int32_t ScaleConvertProcess::ScaleConvert(ImageUnitInfo& srcImgInfo, ImageUnitIn dstData_, dstLineSize_); int32_t ret = memcpy_s(dstImgInfo.imgData->Data(), dstImgInfo.imgSize, dstData_[0], dstBuffSize_); if (ret != EOK) { - DHLOGE("ScaleConvertProcess::ScaleConvert copy dst image info failed, ret = %d", ret); + DHLOGE("ScaleConvertProcess::ScaleConvert copy dst image info failed, ret = %{public}d", ret); return DCAMERA_MEMORY_OPT_ERROR; } return DCAMERA_OK; @@ -300,7 +304,7 @@ int32_t ScaleConvertProcess::CopyYUV420SrcData(const ImageUnitInfo& srcImgInfo) int32_t ret = memcpy_s(srcData_[0], srcImgInfo.width * srcImgInfo.height, srcImgInfo.imgData->Data(), srcImgInfo.width * srcImgInfo.height); if (ret != EOK) { - DHLOGE("ScaleConvertProcess::CopyYUV420SrcData memory copy failed, ret = %d", ret); + DHLOGE("ScaleConvertProcess::CopyYUV420SrcData memory copy failed, ret = %{public}d", ret); return DCAMERA_MEMORY_OPT_ERROR; } @@ -308,7 +312,7 @@ int32_t ScaleConvertProcess::CopyYUV420SrcData(const ImageUnitInfo& srcImgInfo) srcImgInfo.imgData->Data() + srcImgInfo.alignedWidth * srcImgInfo.alignedHeight, srcImgInfo.width * srcImgInfo.height / MEMORY_RATIO_YUV); if (ret != EOK) { - DHLOGE("ScaleConvertProcess::CopyYUV420SrcData memory copy failed, ret = %d", ret); + DHLOGE("ScaleConvertProcess::CopyYUV420SrcData memory copy failed, ret = %{public}d", ret); return DCAMERA_MEMORY_OPT_ERROR; } @@ -317,7 +321,7 @@ int32_t ScaleConvertProcess::CopyYUV420SrcData(const ImageUnitInfo& srcImgInfo) srcImgInfo.alignedWidth * srcImgInfo.alignedHeight / MEMORY_RATIO_YUV, srcImgInfo.width * srcImgInfo.height / MEMORY_RATIO_YUV); if (ret != EOK) { - DHLOGE("ScaleConvertProcess::CopyYUV420SrcData memory copy failed, ret = %d", ret); + DHLOGE("ScaleConvertProcess::CopyYUV420SrcData memory copy failed, ret = %{public}d", ret); return DCAMERA_MEMORY_OPT_ERROR; } return DCAMERA_OK; @@ -328,7 +332,7 @@ int32_t ScaleConvertProcess::CopyNV12SrcData(const ImageUnitInfo& srcImgInfo) int32_t ret = memcpy_s(srcData_[0], srcImgInfo.width * srcImgInfo.height, srcImgInfo.imgData->Data(), srcImgInfo.width * srcImgInfo.height); if (ret != EOK) { - DHLOGE("ScaleConvertProcess::CopyNV12SrcData memory copy failed, ret = %d", ret); + DHLOGE("ScaleConvertProcess::CopyNV12SrcData memory copy failed, ret = %{public}d", ret); return DCAMERA_MEMORY_OPT_ERROR; } @@ -336,7 +340,7 @@ int32_t ScaleConvertProcess::CopyNV12SrcData(const ImageUnitInfo& srcImgInfo) srcImgInfo.imgData->Data() + srcImgInfo.alignedWidth * srcImgInfo.alignedHeight, srcImgInfo.width * srcImgInfo.height / MEMORY_RATIO_NV); if (ret != EOK) { - DHLOGE("ScaleConvertProcess::CopyNV12SrcData memory copy failed, ret = %d", ret); + DHLOGE("ScaleConvertProcess::CopyNV12SrcData memory copy failed, ret = %{public}d", ret); return DCAMERA_MEMORY_OPT_ERROR; } return DCAMERA_OK; @@ -347,7 +351,7 @@ int32_t ScaleConvertProcess::CopyNV21SrcData(const ImageUnitInfo& srcImgInfo) int32_t ret = memcpy_s(srcData_[0], srcImgInfo.width * srcImgInfo.height, srcImgInfo.imgData->Data(), srcImgInfo.width * srcImgInfo.height); if (ret != EOK) { - DHLOGE("ScaleConvertProcess::CopyNV21SrcData memory copy failed, ret = %d", ret); + DHLOGE("ScaleConvertProcess::CopyNV21SrcData memory copy failed, ret = %{public}d", ret); return DCAMERA_MEMORY_OPT_ERROR; } @@ -355,7 +359,7 @@ int32_t ScaleConvertProcess::CopyNV21SrcData(const ImageUnitInfo& srcImgInfo) srcImgInfo.imgData->Data() + srcImgInfo.alignedWidth * srcImgInfo.alignedHeight, srcImgInfo.width * srcImgInfo.height / MEMORY_RATIO_NV); if (ret != EOK) { - DHLOGE("ScaleConvertProcess::CopyNV21SrcData memory copy failed, ret = %d", ret); + DHLOGE("ScaleConvertProcess::CopyNV21SrcData memory copy failed, ret = %{public}d", ret); return DCAMERA_MEMORY_OPT_ERROR; } return DCAMERA_OK; diff --git a/services/data_process/test/unittest/common/pipeline/BUILD.gn b/services/data_process/test/unittest/common/pipeline/BUILD.gn index 512307c502b8438d8961beb19b000e4dd8c394de..581aa8d51bb800bd2dc429b26e9f29202fb02a95 100644 --- a/services/data_process/test/unittest/common/pipeline/BUILD.gn +++ b/services/data_process/test/unittest/common/pipeline/BUILD.gn @@ -61,6 +61,7 @@ ohos_unittest("DCameraDataProcessPipelineTest") { "distributed_hardware_fwk:distributedhardwareutils", "eventhandler:libeventhandler", "graphic_surface:surface", + "hilog:libhilog", "hitrace:hitrace_meter", ] diff --git a/services/data_process/test/unittest/common/pipeline_node/BUILD.gn b/services/data_process/test/unittest/common/pipeline_node/BUILD.gn index 68ce24c4596938467ab37c08b3dc5b33e7782f22..efe157d880adb60ce8e7ccaac53d65363f615daa 100644 --- a/services/data_process/test/unittest/common/pipeline_node/BUILD.gn +++ b/services/data_process/test/unittest/common/pipeline_node/BUILD.gn @@ -74,6 +74,7 @@ ohos_unittest("DCameraDataProcessPipelineNodeTest") { "drivers_interface_display:libdisplay_composer_proxy_1.0", "eventhandler:libeventhandler", "graphic_surface:surface", + "hilog:libhilog", "hitrace:hitrace_meter", "media_foundation:media_foundation", ] diff --git a/test/distributedcameraclienttest/dcamera_client_demo.cpp b/test/distributedcameraclienttest/dcamera_client_demo.cpp index 3ac3d3cb9009637ff620865a1dcd8ebde7b4c44f..9a82486911341b06a4625732bc090a80799a8b9a 100644 --- a/test/distributedcameraclienttest/dcamera_client_demo.cpp +++ b/test/distributedcameraclienttest/dcamera_client_demo.cpp @@ -65,7 +65,7 @@ int32_t InitCameraStandard(CameraPosition position) int rv = g_cameraManager->CreateCaptureSession(&g_captureSession); if (rv != DCAMERA_OK) { - DHLOGE("InitCameraStandard create captureSession failed, rv: %d", rv); + DHLOGE("InitCameraStandard create captureSession failed, rv: %{public}d", rv); return rv; } std::shared_ptr sessionCallback = std::make_shared(); @@ -74,7 +74,8 @@ int32_t InitCameraStandard(CameraPosition position) std::vector> cameraObjList = g_cameraManager->GetSupportedCameras(); for (auto info : cameraObjList) { - DHLOGI("Camera: %s, position: %d, camera type: %d, connection type: %d", GetAnonyString(info->GetID()).c_str(), + DHLOGI("Camera: %{public}s, position: %{public}d, camera type: %{public}d, connection type: %{public}d", + GetAnonyString(info->GetID()).c_str(), info->GetPosition(), info->GetCameraType(), info->GetConnectionType()); // CAMERA_POSITION_BACK or CAMERA_POSITION_FRONT if ((info->GetPosition() == position) && @@ -91,12 +92,12 @@ int32_t InitCameraStandard(CameraPosition position) rv = g_cameraManager->CreateCameraInput(g_cameraInfo, &((sptr &)g_cameraInput)); if (rv != DCAMERA_OK) { - DHLOGE("InitCameraStandard create cameraInput failed, rv: %d", rv); + DHLOGE("InitCameraStandard create cameraInput failed, rv: %{public}d", rv); return rv; } int32_t ret = ((sptr &)g_cameraInput)->Open(); if (ret != DCAMERA_OK) { - DHLOGE("InitCameraStandard g_cameraInput Open failed, ret: %d", ret); + DHLOGE("InitCameraStandard g_cameraInput Open failed, ret: %{public}d", ret); return ret; } std::shared_ptr inputCallback = std::make_shared(); @@ -152,7 +153,7 @@ CameraFormat ConvertToCameraFormat(int32_t format) void InitPhotoOutput(void) { - DHLOGI("Distributed Camera Demo: Create PhotoOutput, width = %d, height = %d, format = %d", + DHLOGI("Distributed Camera Demo: Create PhotoOutput, width = %{public}d, height = %{public}d, format = %{public}d", g_photoInfo->width_, g_photoInfo->height_, g_photoInfo->format_); sptr photoSurface = IConsumerSurface::Create(); sptr photoListener = new DemoDCameraPhotoSurfaceListener(photoSurface); @@ -163,7 +164,7 @@ void InitPhotoOutput(void) sptr photoProducer = photoSurface->GetProducer(); int rv = g_cameraManager->CreatePhotoOutput(photoProfile, photoProducer, &((sptr &)g_photoOutput)); if (rv != DCAMERA_OK) { - DHLOGE("InitPhotoOutput create photoOutput failed, rv: %d", rv); + DHLOGE("InitPhotoOutput create photoOutput failed, rv: %{public}d", rv); return; } ((sptr &)g_photoOutput)->SetCallback(std::make_shared()); @@ -171,8 +172,8 @@ void InitPhotoOutput(void) void InitPreviewOutput(void) { - DHLOGI("Distributed Camera Demo: Create PreviewOutput, width = %d, height = %d, format = %d", - g_previewInfo->width_, g_previewInfo->height_, g_previewInfo->format_); + DHLOGI("Distributed Camera Demo: Create PreviewOutput, width = %{public}d, height = %{public}d, format = " + "%{public}d", g_previewInfo->width_, g_previewInfo->height_, g_previewInfo->format_); sptr previewSurface = IConsumerSurface::Create(); sptr previewListener = new DemoDCameraPreviewSurfaceListener(previewSurface); previewSurface->RegisterConsumerListener(previewListener); @@ -184,7 +185,7 @@ void InitPreviewOutput(void) int rv = g_cameraManager->CreatePreviewOutput( previewProfile, previewProducerSurface, &((sptr &)g_previewOutput)); if (rv != DCAMERA_OK) { - DHLOGE("InitPhotoOutput create previewOutput failed, rv: %d", rv); + DHLOGE("InitPhotoOutput create previewOutput failed, rv: %{public}d", rv); return; } ((sptr &)g_previewOutput)->SetCallback(std::make_shared()); @@ -192,7 +193,7 @@ void InitPreviewOutput(void) void InitVideoOutput(void) { - DHLOGI("Distributed Camera Demo: Create VideoOutput, width = %d, height = %d, format = %d", + DHLOGI("Distributed Camera Demo: Create VideoOutput, width = %{public}d, height = %{public}d, format = %{public}d", g_videoInfo->width_, g_videoInfo->height_, g_videoInfo->format_); sptr videoSurface = IConsumerSurface::Create(); sptr videoListener = new DemoDCameraVideoSurfaceListener(videoSurface); @@ -205,7 +206,7 @@ void InitVideoOutput(void) sptr pSurface = Surface::CreateSurfaceAsProducer(videoProducer); int rv = g_cameraManager->CreateVideoOutput(videoSettings, pSurface, &((sptr &)g_videoOutput)); if (rv != DCAMERA_OK) { - DHLOGE("InitPhotoOutput create videoOutput failed, rv: %d", rv); + DHLOGE("InitPhotoOutput create videoOutput failed, rv: %{public}d", rv); return; } ((sptr &)g_videoOutput)->SetCallback(std::make_shared()); @@ -223,12 +224,12 @@ void ConfigCaptureSession(void) std::vector stabilizationModes; int32_t rv = g_captureSession->GetSupportedStabilizationMode(stabilizationModes); if (rv != DCAMERA_OK) { - DHLOGE("ConfigCaptureSession get supported stabilization mode failed, rv: %d", rv); + DHLOGE("ConfigCaptureSession get supported stabilization mode failed, rv: %{public}d", rv); return; } if (!stabilizationModes.empty()) { for (auto mode : stabilizationModes) { - DHLOGI("Distributed Camera Demo: video stabilization mode %d", mode); + DHLOGI("Distributed Camera Demo: video stabilization mode %{public}d", mode); } g_captureSession->SetVideoStabilizationMode(stabilizationModes.back()); } @@ -244,11 +245,11 @@ void ConfigFocusFlashAndExposure(bool isVideo) std::vector biasRange; int32_t rv = g_captureSession->GetExposureBiasRange(biasRange); if (rv != DCAMERA_OK) { - DHLOGE("ConfigFocusAndExposure get exposure bias range failed, rv: %d", rv); + DHLOGE("ConfigFocusAndExposure get exposure bias range failed, rv: %{public}d", rv); return; } if (!biasRange.empty()) { - DHLOGI("Distributed Camera Demo: get %d exposure compensation range", biasRange.size()); + DHLOGI("Distributed Camera Demo: get %{public}d exposure compensation range", biasRange.size()); exposureValue = biasRange[0]; } FlashMode flash = FLASH_MODE_OPEN; @@ -316,7 +317,7 @@ int32_t Capture() { int32_t ret = ((sptr &)g_photoOutput)->Capture(ConfigPhotoCaptureSetting()); if (ret != DCAMERA_OK) { - DHLOGE("main g_photoOutput Capture failed, ret: %d", ret); + DHLOGE("main g_photoOutput Capture failed, ret: %{public}d", ret); return ret; } return DCAMERA_OK; @@ -326,7 +327,7 @@ int32_t Video() { int32_t ret = ((sptr &)g_videoOutput)->Start(); if (ret != DCAMERA_OK) { - DHLOGE("main VideoOutput Start failed, ret: %d", ret); + DHLOGE("main VideoOutput Start failed, ret: %{public}d", ret); return ret; } return DCAMERA_OK; @@ -340,10 +341,10 @@ int32_t GetPreviewProfiles(std::vector &previewResolution) return DCAMERA_BAD_VALUE; } std::vector previewProfiles = capability->GetPreviewProfiles(); - DHLOGI("size: %d", previewProfiles.size()); + DHLOGI("size: %{public}d", previewProfiles.size()); for (auto& profile : previewProfiles) { CameraStandard::Size picSize = profile.GetSize(); - DHLOGI("width: %d, height: %d", picSize.width, picSize.height); + DHLOGI("width: %{public}d, height: %{public}d", picSize.width, picSize.height); if (IsValid(picSize)) { previewResolution.push_back(picSize); } diff --git a/test/distributedcameraclienttest/dcamera_client_demo.h b/test/distributedcameraclienttest/dcamera_client_demo.h index dcaed170ba0d19ddbcce45f712b6d30553968b7f..be614d338b57b2f349b659ffb3091cfbc7386715 100644 --- a/test/distributedcameraclienttest/dcamera_client_demo.h +++ b/test/distributedcameraclienttest/dcamera_client_demo.h @@ -107,10 +107,10 @@ public: protected: void SaveFile() const override { - DHLOGI("DemoDCameraPhotoSurfaceListener::SaveFile width: %d, height: %d, size: %d, dataSize: %d, " + - "actualSize: %d", width_, height_, size_, dataSize_, actualSize_); + DHLOGI("DemoDCameraPhotoSurfaceListener::SaveFile width: %{public}d, height: %{public}d, size: %{public}d, " + "dataSize: %{public}d, actualSize: %{public}d", width_, height_, size_, dataSize_, actualSize_); if ((address_ == nullptr) || (dataSize_ <= 0)) { - DHLOGE("DemoDCameraPhotoSurfaceListener invalid params, dataSize: %d", dataSize_); + DHLOGE("DemoDCameraPhotoSurfaceListener invalid params, dataSize: %{public}d", dataSize_); return; } @@ -138,10 +138,10 @@ public: protected: void SaveFile() const override { - DHLOGI("DemoDCameraPreviewSurfaceListener::SaveFile width: %d, height: %d, size: %d, dataSize: %d, " + - "actualSize: %d", width_, height_, size_, dataSize_, actualSize_); + DHLOGI("DemoDCameraPreviewSurfaceListener::SaveFile width: %{public}d, height: %{public}d, size: %{public}d, " + "dataSize: %{public}d, actualSize: %{public}d", width_, height_, size_, dataSize_, actualSize_); if ((address_ == nullptr) || (actualSize_ <= 0)) { - DHLOGE("DemoDCameraPreviewSurfaceListener invalid params, actualSize: %d", actualSize_); + DHLOGE("DemoDCameraPreviewSurfaceListener invalid params, actualSize: %{public}d", actualSize_); return; } @@ -170,10 +170,10 @@ public: protected: void SaveFile() const override { - DHLOGI("DemoDCameraVideoSurfaceListener::SaveFile width: %d, height: %d, size: %d, dataSize: %d, " + - "actualSize: %d", width_, height_, size_, dataSize_, actualSize_); + DHLOGI("DemoDCameraVideoSurfaceListener::SaveFile width: %{public}d, height: %{public}d, size: %{public}d, " + "dataSize: %{public}d, actualSize: %{public}d", width_, height_, size_, dataSize_, actualSize_); if ((address_ == nullptr) || (actualSize_ <= 0)) { - DHLOGE("DemoDCameraVideoSurfaceListener invalid params, actualSize: %d", actualSize_); + DHLOGE("DemoDCameraVideoSurfaceListener invalid params, actualSize: %{public}d", actualSize_); return; } @@ -196,27 +196,31 @@ class DemoDCameraPhotoCallback : public CameraStandard::PhotoStateCallback { public: void OnCaptureStarted(const int32_t captureID) const { - DHLOGI("DemoDCameraPhotoCallback::OnCaptureStarted captureID: %d", captureID); + DHLOGI("DemoDCameraPhotoCallback::OnCaptureStarted captureID: %{public}d", captureID); } void OnCaptureStarted(const int32_t captureID, uint32_t exposureTime) const { - DHLOGI("DemoDCameraPhotoCallback::OnCaptureStarted captureID: %d, exposureTime: %u", captureID, exposureTime); + DHLOGI("DemoDCameraPhotoCallback::OnCaptureStarted captureID: %{public}d, exposureTime: %{public}u", + captureID, exposureTime); } void OnCaptureEnded(const int32_t captureID, int32_t frameCount) const { - DHLOGI("DemoDCameraPhotoCallback::OnCaptureEnded captureID: %d frameCount: %d", captureID, frameCount); + DHLOGI("DemoDCameraPhotoCallback::OnCaptureEnded captureID: %{public}d frameCount: %{public}d", + captureID, frameCount); } void OnFrameShutter(const int32_t captureId, const uint64_t timestamp) const { - DHLOGI("DemoDCameraPhotoCallback::OnFrameShutter captureID: %d timestamp: %llu", captureId, timestamp); + DHLOGI("DemoDCameraPhotoCallback::OnFrameShutter captureID: %{public}d timestamp: %{public}llu", + captureId, timestamp); } void OnCaptureError(const int32_t captureId, const int32_t errorCode) const { - DHLOGI("DemoDCameraPhotoCallback::OnCaptureError captureID: %d errorCode: %d", captureId, errorCode); + DHLOGI("DemoDCameraPhotoCallback::OnCaptureError captureID: %{public}d errorCode: %{public}d", + captureId, errorCode); } }; @@ -229,12 +233,12 @@ public: void OnFrameEnded(const int32_t frameCount) const { - DHLOGI("DemoDCameraPreviewCallback::OnFrameEnded frameCount: %d", frameCount); + DHLOGI("DemoDCameraPreviewCallback::OnFrameEnded frameCount: %{public}d", frameCount); } void OnError(const int32_t errorCode) const { - DHLOGI("DemoDCameraPreviewCallback::OnError errorCode: %d", errorCode); + DHLOGI("DemoDCameraPreviewCallback::OnError errorCode: %{public}d", errorCode); } void OnSketchStatusDataChanged(const CameraStandard::SketchStatusData& statusData) const @@ -252,12 +256,12 @@ public: void OnFrameEnded(const int32_t frameCount) const { - DHLOGI("DemoDCameraVideoCallback::OnFrameEnded frameCount: %d", frameCount); + DHLOGI("DemoDCameraVideoCallback::OnFrameEnded frameCount: %{public}d", frameCount); } void OnError(const int32_t errorCode) const { - DHLOGI("DemoDCameraVideoCallback::OnError errorCode: %d", errorCode); + DHLOGI("DemoDCameraVideoCallback::OnError errorCode: %{public}d", errorCode); } }; @@ -265,7 +269,7 @@ class DemoDCameraInputCallback : public CameraStandard::ErrorCallback { public: void OnError(const int32_t errorType, const int32_t errorMsg) const { - DHLOGI("DemoDCameraInputCallback::OnError errorType: %d errorMsg: %d", errorType, errorMsg); + DHLOGI("DemoDCameraInputCallback::OnError errorType: %{public}d errorMsg: %{public}d", errorType, errorMsg); } }; @@ -273,13 +277,14 @@ class DemoDCameraManagerCallback : public CameraStandard::CameraManagerCallback public: void OnCameraStatusChanged(const CameraStandard::CameraStatusInfo &cameraStatusInfo) const { - DHLOGI("DemoDCameraManagerCallback::OnCameraStatusChanged cameraStatus: %d", cameraStatusInfo.cameraStatus); + DHLOGI("DemoDCameraManagerCallback::OnCameraStatusChanged cameraStatus: %{public}d", + cameraStatusInfo.cameraStatus); } void OnFlashlightStatusChanged(const std::string &cameraID, const CameraStandard::FlashStatus flashStatus) const { - DHLOGI("DemoDCameraManagerCallback::OnFlashlightStatusChanged cameraID: %s, flashStatus: %d", + DHLOGI("DemoDCameraManagerCallback::OnFlashlightStatusChanged cameraID: %{public}s, flashStatus: %{public}d", GetAnonyString(cameraID).c_str(), flashStatus); } }; @@ -288,12 +293,12 @@ class DemoDCameraSessionCallback : public CameraStandard::SessionCallback, publi public: void OnError(int32_t errorCode) { - DHLOGI("DemoDCameraSessionCallback::OnError errorCode: %d", errorCode); + DHLOGI("DemoDCameraSessionCallback::OnError errorCode: %{public}d", errorCode); } void OnFocusState(FocusState state) { - DHLOGI("DemoDCameraSessionCallback::OnFocusState state: %d", state); + DHLOGI("DemoDCameraSessionCallback::OnFocusState state: %{public}d", state); } };