From f95074853ee76510c9b8ae1a41edff25d67003d2 Mon Sep 17 00:00:00 2001 From: chen0088 Date: Tue, 14 Jun 2022 15:34:58 +0800 Subject: [PATCH 1/5] modify hisysevent Signed-off-by: chen0088 --- .../utils/dcamera_hisysevent_adapter.h | 36 +++---- .../src/utils/dcamera_hisysevent_adapter.cpp | 102 +++++------------- hisysevent.yaml | 47 ++------ .../src/dcamera_sink_load_callback.cpp | 5 +- .../src/dcamera_source_load_callback.cpp | 5 +- .../distributed_camera_sink_service.cpp | 5 +- .../distributed_camera_source_service.cpp | 5 +- .../channel/src/dcamera_softbus_adapter.cpp | 12 ++- .../decoder/decode_data_process.cpp | 11 +- .../decoder/decode_data_process_common.cpp | 11 +- .../encoder/encode_data_process.cpp | 11 +- .../encoder/encode_data_process_common.cpp | 11 +- 12 files changed, 106 insertions(+), 155 deletions(-) diff --git a/common/include/utils/dcamera_hisysevent_adapter.h b/common/include/utils/dcamera_hisysevent_adapter.h index b28c2aa..78edcbd 100644 --- a/common/include/utils/dcamera_hisysevent_adapter.h +++ b/common/include/utils/dcamera_hisysevent_adapter.h @@ -20,14 +20,9 @@ namespace OHOS { namespace DistributedHardware { -const std::string SA_ERROR = "DCAMERA_SA_START_FAIL"; -const std::string HDF_ERROR = "DCAMERA_HDF_START_FAIL"; -const std::string REGISTER_CAMERA_ERROR = "DCAMERA_REGISTER_FAIL"; -const std::string SOFTBUS_SESSIONSERVER_ERROR = "DCAMERA_CREATE_SESSIONSVR_FAIL"; -const std::string SOFTBUS_SESSION_ERROR = "DCAMERA_OPEN_SESSION_FAIL"; -const std::string SINK_OPEN_CAMERA_ERROR = "DCAMERA_SINK_OPEN_CAM_FAIL"; -const std::string START_VIDEO_ENCODER_ERROR = "DCAMERA_ENCODE_FAIL"; -const std::string START_VIDEO_DECODER_ERROR = "DCAMERA_DECODE_FAIL"; +const std::string DCAMERA_INIT_FAIL = "DCAMERA_INIT_FAIL"; +const std::string DCAMERA_REGISTER_FAIL = "DCAMERA_REGISTER_FAIL"; +const std::string DCAMERA_OPT_FAIL = "DCAMERA_OPT_FAIL"; const std::string INIT_SA_EVENT = "DCAMERA_INIT"; const std::string RELEASE_SA_EVENT = "DCAMERA_EXIT"; @@ -37,6 +32,16 @@ const std::string OPEN_CAMERA_EVENT = "DCAMERA_OPEN"; const std::string CLOSE_CAMERA_EVENT = "DCAMERA_CLOSE"; const std::string START_CAPTURE_EVENT = "DCAMERA_CAPTURE"; +enum DcameraHisyseventErrno { + DCAMERA_SA_ERROR = 0, + DCAMERA_HDF_ERROR = 1, + DCAMERA_CREATE_SESSIONSVR_ERROR = 2, + DCAMERA_OPEN_SESSION_ERROR = 3, + DCAMERA_SINK_OPEN_CAM_ERROR = 4, + DCAMERA_ENCODE_ERROR = 5, + DCAMERA_DECODE_ERROR = 6, +}; + using EventCaptureInfo = struct _EventCaptureInfo { int32_t width_; int32_t height_; @@ -46,19 +51,10 @@ using EventCaptureInfo = struct _EventCaptureInfo { int32_t type_; }; -void ReportStartSaFail(const std::string eventName, int32_t saId, const std::string& errMsg); -void ReportStartHDFFail(const std::string eventName, const std::string& errMsg); +void ReportDcamerInitFail(const std::string eventName, int32_t errCode, const std::string& errMsg); void ReportRegisterCameraFail(const std::string eventName, const std::string& devId, const std::string& dhId, std::string version, const std::string& errMsg); -void ReportSoftbusSessionServerFail(const std::string eventName, const std::string& pkgName, - std::string sessionName, const std::string& errMsg); -void ReportSoftbusSessionFail(const std::string eventName, std::string mySessName, - std::string peerSessName, std::string peerDevId, const std::string& errMsg); -void ReportSinkOpenCamFail(const std::string eventName, const std::string& dhId, const std::string& errMsg); -void ReportStartVideoEncoderFail(const std::string eventName, int32_t width, int32_t height, - std::string format, const std::string& errMsg); -void ReportStartVideoDecoderFail(const std::string eventName, int32_t width, int32_t height, - std::string format, const std::string& errMsg); +void ReportDcamerOptFail(const std::string eventName, int32_t errCode, const std::string& errMsg); void ReportSaEvent(const std::string eventName, int32_t saId, const std::string& errMsg); void ReportRegisterCameraEvent(const std::string eventName, const std::string& devId, const std::string& dhId, @@ -66,6 +62,8 @@ void ReportRegisterCameraEvent(const std::string eventName, const std::string& d void ReportCameraOperaterEvent(const std::string eventName, const std::string& devId, const std::string& dhId, const std::string& errMsg); void ReportStartCaptureEvent(const std::string eventName, EventCaptureInfo& capture, const std::string& errMsg); + +std::string CreateMsg(const char *format, ...); } // namespace DistributedHardware } // namespace OHOS #endif // OHOS_DCAMERA_HISYSEVENT_ADAPTER_H \ No newline at end of file diff --git a/common/src/utils/dcamera_hisysevent_adapter.cpp b/common/src/utils/dcamera_hisysevent_adapter.cpp index cd39760..2e0edfc 100644 --- a/common/src/utils/dcamera_hisysevent_adapter.cpp +++ b/common/src/utils/dcamera_hisysevent_adapter.cpp @@ -15,7 +15,10 @@ #include "dcamera_hisysevent_adapter.h" +#include "constants.h" #include "hisysevent.h" +#include "securec.h" + #include "distributed_camera_errno.h" #include "distributed_hardware_log.h" @@ -32,23 +35,12 @@ const std::string ENUM_ENCODETYPE_STRINGS[] = { }; } -void ReportStartSaFail(const std::string eventName, int32_t saId, const std::string& errMsg) +void ReportDcamerInitFail(const std::string eventName, int32_t errCode, const std::string& errMsg) { - int ret = HiSysEventNameSpace::Write(DOMAIN_STR, - eventName, - HiSysEventNameSpace::EventType::FAULT, - "SAID", saId, - "MSG", errMsg); - if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error ret %d, saId %d, errMsg %s.", ret, saId, errMsg.c_str()); - } -} - -void ReportStartHDFFail(const std::string eventName, const std::string& errMsg) -{ - int ret = HiSysEventNameSpace::Write(DOMAIN_STR, + int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, eventName, HiSysEventNameSpace::EventType::FAULT, + "ERRCODE", errCode, "MSG", errMsg); if (ret != DCAMERA_OK) { DHLOGE("Write HiSysEvent error ret %d, errMsg %s.", ret, errMsg.c_str()); @@ -71,74 +63,15 @@ void ReportRegisterCameraFail(const std::string eventName, const std::string& de } } -void ReportSoftbusSessionServerFail(const std::string eventName, const std::string& pkgName, - std::string sessionName, const std::string& errMsg) +void ReportDcamerOptFail(const std::string eventName, int32_t errCode, const std::string& errMsg) { int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, eventName, HiSysEventNameSpace::EventType::FAULT, - "PKGNAME", pkgName, - "SESSIONNAME", sessionName, + "ERRCODE", errCode, "MSG", errMsg); if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); - } -} - -void ReportSoftbusSessionFail(const std::string eventName, std::string mySessName, - std::string peerSessName, std::string peerDevId, const std::string& errMsg) -{ - int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - eventName, - HiSysEventNameSpace::EventType::FAULT, - "MYSESSIONNAME", mySessName, - "PEERSESSIONNAME", peerSessName, - "PEERDEVID", peerDevId, - "MSG", errMsg); - if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); - } -} - -void ReportSinkOpenCamFail(const std::string eventName, const std::string& dhId, const std::string& errMsg) -{ - int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - eventName, - HiSysEventNameSpace::EventType::FAULT, - "DHID", dhId, - "MSG", errMsg); - if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, dhId %s, errMsg %s.", ret, dhId.c_str(), errMsg.c_str()); - } -} - -void ReportStartVideoEncoderFail(const std::string eventName, int32_t width, int32_t height, - std::string format, const std::string& errMsg) -{ - int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - eventName, - HiSysEventNameSpace::EventType::FAULT, - "WIDTH", width, - "HEIGHT", height, - "FORMAT", format, - "MSG", errMsg); - if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); - } -} - -void ReportStartVideoDecoderFail(const std::string eventName, int32_t width, int32_t height, - std::string format, const std::string& errMsg) -{ - int32_t ret = HiSysEventNameSpace::Write(DOMAIN_STR, - eventName, - HiSysEventNameSpace::EventType::FAULT, - "WIDTH", width, - "HEIGHT", height, - "FORMAT", format, - "MSG", errMsg); - if (ret != DCAMERA_OK) { - DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); + DHLOGE("Write HiSysEvent error ret %d, errMsg %s.", ret, errMsg.c_str()); } } @@ -199,5 +132,22 @@ void ReportStartCaptureEvent(const std::string eventName, EventCaptureInfo& capt DHLOGE("Write HiSysEvent error, ret:%d, errMsg %s.", ret, errMsg.c_str()); } } + +std::string CreateMsg(const char *format, ...) +{ + DHLOGE("cmh CreateMsg enter....."); + va_list args; + (void)memset_s(&args, sizeof(va_list), 0, sizeof(va_list)); + va_start(args, format); + char msg[LOG_MAX_LEN] = {0}; + if (vsnprintf_s(msg, sizeof(msg), sizeof(msg) - 1, format, args) < 0) { + DHLOGE("failed to call vsnprintf_s"); + va_end(args); + return ""; + } + va_end(args); + DHLOGE("cmh CreateMsg end....."); + return msg; +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/hisysevent.yaml b/hisysevent.yaml index 020c451..5d16eed 100644 --- a/hisysevent.yaml +++ b/hisysevent.yaml @@ -39,14 +39,10 @@ domain: DISTCAMERA -DCAMERA_SA_START_FAIL: - __BASE: {type: FAULT, level: CRITICAL, desc: dcamera sa start error occured} - SAID: {type: INT32, desc: dcamera SAID} - MSG: {type: STRING, desc: dcamera sa error info} - -DCAMERA_HDF_START_FAIL: - __BASE: {type: FAULT, level: CRITICAL, desc: dcamera hdf start error occured} - MSG: {type: STRING, desc: dcamera hdf error info} +DCAMERA_INIT_FAIL: + __BASE: {type: FAULT, level: CRITICAL, desc: dcamera init process error occured} + ERRCODE: {type: INT32, desc: dcamera init process fail error code} + MSG: {type: STRING, desc: dcamera init process error info} DCAMERA_REGISTER_FAIL: __BASE: {type: FAULT, level: CRITICAL, desc: dcamera register error occured} @@ -55,37 +51,10 @@ DCAMERA_REGISTER_FAIL: VERSION: {type: STRING, desc: dcamera version} MSG: {type: STRING, desc: register dcamera error info} -DCAMERA_CREATE_SESSIONSVR_FAIL: - __BASE: {type: FAULT, level: CRITICAL, desc: dcamera softbus sessionserver error occured} - PKGNAME: {type: STRING, desc: softbus package name} - SESSIONNAME: {type: STRING, desc: softbus session name} - MSG: {type: STRING, desc: dcamera softbus sessionserver error info} - -DCAMERA_OPEN_SESSION_FAIL: - __BASE: {type: FAULT, level: CRITICAL, desc: dcamera softbus session error occured} - MYSESSIONNAME: {type: STRING, desc: softbus my session name} - PEERSESSIONNAME: {type: STRING, desc: softbus peer session name} - PEERDEVID: {type: STRING, desc: peer network id} - MSG: {type: STRING, desc: dcamera softbus session error info} - -DCAMERA_SINK_OPEN_CAM_FAIL: - __BASE: {type: FAULT, level: CRITICAL, desc: dcamera sink open camera error occured} - DHID: {type: STRING, desc: dcamera dhId} - MSG: {type: STRING, desc: dcamera sink open camera error info} - -DCAMERA_ENCODE_FAIL: - __BASE: {type: FAULT, level: CRITICAL, desc: dcamera video encoder error occured} - WIDTH: {type: INT32, desc: dcamera width} - HEIGHT: {type: INT32, desc: dcamera height} - FORMAT: {type: STRING, desc: dcamera FORMAT} - MSG: {type: STRING, desc: dcamera video encoder error info} - -DCAMERA_DECODE_FAIL: - __BASE: {type: FAULT, level: CRITICAL, desc: dcamera video decoder error occured} - WIDTH: {type: INT32, desc: dcamera width} - HEIGHT: {type: INT32, desc: dcamera height} - FORMAT: {type: STRING, desc: dcamera format} - MSG: {type: STRING, desc: dcamera video decoder error info} +DCAMERA_OPT_FAIL: + __BASE: {type: FAULT, level: CRITICAL, desc: dcamera operate error occured} + ERRCODE: {type: STRING, desc: dcamera init process fail error code} + MSG: {type: STRING, desc: dcamera init process error info} DCAMERA_INIT: __BASE: {type: BEHAVIOR, level: MINOR, desc: dcamera init sa event} 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 a380242..2d8055e 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 @@ -42,9 +42,12 @@ void DCameraSinkLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbilityId void DCameraSinkLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) { DHLOGI("OnLoadSystemAbilityFail systemAbilityId: %d.", systemAbilityId); + ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_SA_ERROR, + CreateMsg("dcamera sink OnLoadSystemAbilityFail, systemAbilityId: %d", systemAbilityId)); if (systemAbilityId != DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID) { DHLOGE("start aystemabilityId is not sinkSAId!"); - ReportStartSaFail(SA_ERROR, systemAbilityId, "dcamera sink OnLoadSystemAbilityFail."); + ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_SA_ERROR, + CreateMsg("dcamera sink OnLoadSystemAbilityFail, systemAbilityId: %d", systemAbilityId)); return; } DCameraSinkHandler::GetInstance().FinishStartSAFailed(systemAbilityId); 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 41c7eda..c373bd2 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 @@ -42,9 +42,12 @@ void DCameraSourceLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbility void DCameraSourceLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) { DHLOGI("OnLoadSystemAbilityFail systemAbilityId: %d.", systemAbilityId); + ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_SA_ERROR, + CreateMsg("dcamera source OnLoadSystemAbilityFail, systemAbilityId: %d", systemAbilityId)); if (systemAbilityId != DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID) { DHLOGE("start systemabilityId is not sourceSAId!"); - ReportStartSaFail(SA_ERROR, systemAbilityId, "dcamera source OnLoadSystemAbilityFail."); + ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_SA_ERROR, + CreateMsg("dcamera source OnLoadSystemAbilityFail, systemAbilityId: %d", systemAbilityId)); return; } DCameraSourceHandler::GetInstance().FinishStartSAFailed(systemAbilityId); 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 402cfb5..434a864 100644 --- a/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp +++ b/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp @@ -234,9 +234,12 @@ int32_t DistributedCameraSinkService::OpenChannel(const std::string& dhId, std:: std::shared_ptr sinkDevice = iter->second; int32_t ret = sinkDevice->OpenChannel(openInfo); + ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_SINK_OPEN_CAM_ERROR, + CreateMsg("sink service open channel failed, dhId %s", GetAnonyString(dhId).c_str())); if (ret != DCAMERA_OK) { DHLOGE("DistributedCameraSinkService::OpenChannel failed, ret: %d", ret); - ReportSinkOpenCamFail(SINK_OPEN_CAMERA_ERROR, dhId, "sink service open channel failed."); + ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_SINK_OPEN_CAM_ERROR, + CreateMsg("sink service open channel failed, dhId %s", GetAnonyString(dhId).c_str())); return ret; } DHLOGI("DistributedCameraSinkService::OpenChannel success"); 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 db1905f..022f7cc 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp @@ -143,7 +143,7 @@ int32_t DistributedCameraSourceService::RegisterDistributedHardware(const std::s ret = camDev->RegisterDistributedHardware(devId, dhId, reqId, param.version, param.attrs); if (ret != DCAMERA_OK) { DHLOGE("DistributedCameraSourceService RegisterDistributedHardware failed, ret: %d", ret); - ReportRegisterCameraFail(REGISTER_CAMERA_ERROR, GetAnonyString(devId), dhId, param.version, + ReportRegisterCameraFail(DCAMERA_REGISTER_FAIL, GetAnonyString(devId), dhId, param.version, "dcamera source RegisterDistributedHardware fail."); camerasMap_.erase(camIndex); } @@ -196,9 +196,10 @@ int32_t DistributedCameraSourceService::LoadDCameraHDF() { DHLOGI("load hdf driver start"); int32_t ret = DCameraHdfOperate::GetInstance().LoadDcameraHDFImpl(); + ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_HDF_ERROR, CreateMsg("dcamera load hdf driver fail.")); if (ret != DCAMERA_OK) { DHLOGE("load hdf driver failed, ret %d", ret); - ReportStartHDFFail(HDF_ERROR, "dcamera load hdf driver fail."); + ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_HDF_ERROR, CreateMsg("dcamera load hdf driver fail.")); return ret; } DHLOGI("load hdf driver end"); diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index 92a7124..95eae78 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -126,8 +126,8 @@ int32_t DCameraSoftbusAdapter::CreateSoftbusSessionServer(std::string sessionNam int32_t ret = CreateSessionServer(PKG_NAME.c_str(), sessionName.c_str(), &sessListeners_[role]); if (ret != DCAMERA_OK) { DHLOGE("DCameraSoftbusAdapter CreateSessionServer failed, ret: %d", ret); - ReportSoftbusSessionServerFail(SOFTBUS_SESSIONSERVER_ERROR, PKG_NAME, - sessionName, "create session server failed"); + ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_CREATE_SESSIONSVR_ERROR, + CreateMsg("create session server failed, sessionName %s", sessionName.c_str())); return ret; } sessionTotal_[sessionName]++; @@ -198,10 +198,14 @@ int32_t DCameraSoftbusAdapter::OpenSoftbusSession(std::string mySessName, std::s } attr.attr.streamAttr.streamType = (StreamType)streamType; int32_t sessionId = OpenSession(mySessName.c_str(), peerSessName.c_str(), peerDevId.c_str(), "0", &attr); + ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_OPEN_SESSION_ERROR, + CreateMsg("open softbus session failed, mySessName %s, peerSessName %s, peerDevId %s", + mySessName.c_str(), peerSessName.c_str(), peerDevId.c_str())); if (sessionId < 0) { DHLOGE("DCameraSoftbusAdapter OpenSoftbusSession failed %d", sessionId); - ReportSoftbusSessionFail(SOFTBUS_SESSION_ERROR, mySessName, peerSessName, - peerDevId, "open softbus session failed."); + ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_OPEN_SESSION_ERROR, + CreateMsg("open softbus session failed, mySessName %s, peerSessName %s, peerDevId %s", + mySessName.c_str(), peerSessName.c_str(), peerDevId.c_str())); return DCAMERA_BAD_OPERATE; } return DCAMERA_OK; 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 85de274..8a45046 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 @@ -109,11 +109,16 @@ int32_t DecodeDataProcess::InitDecoder() } ret = StartVideoDecoder(); + ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_DECODE_ERROR, + CreateMsg("start video decoder failed, width %d, height %d, format %s", sourceConfig_.GetWidth(), + sourceConfig_.GetHeight(), + ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())].c_str())); if (ret != DCAMERA_OK) { DHLOGE("Start Video decoder failed."); - ReportStartVideoDecoderFail(START_VIDEO_DECODER_ERROR, sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), - ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())], - "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(), + ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())].c_str())); return ret; } return DCAMERA_OK; 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 89d0726..c1a370a 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 @@ -109,11 +109,16 @@ int32_t DecodeDataProcess::InitDecoder() } ret = StartVideoDecoder(); + ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_DECODE_ERROR, + CreateMsg("start video decoder failed, width %d, height %d, format %s", sourceConfig_.GetWidth(), + sourceConfig_.GetHeight(), + ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())].c_str())); if (ret != DCAMERA_OK) { DHLOGE("Start Video decoder failed."); - ReportStartVideoDecoderFail(START_VIDEO_DECODER_ERROR, sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), - ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())], - "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(), + ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())].c_str())); return ret; } return DCAMERA_OK; 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 2eaf3ef..10e4e60 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 @@ -114,11 +114,16 @@ int32_t EncodeDataProcess::InitEncoder() } ret = StartVideoEncoder(); + ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_ENCODE_ERROR, + CreateMsg("start video encoder failed, width %d, height %d, format %s", sourceConfig_.GetWidth(), + sourceConfig_.GetHeight(), + ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())].c_str())); if (ret != DCAMERA_OK) { DHLOGE("Start Video encoder failed."); - ReportStartVideoEncoderFail(START_VIDEO_ENCODER_ERROR, sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), - ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())], - "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(), + ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())].c_str())); return ret; } diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp index feb27c6..61f6c6c 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp @@ -114,11 +114,16 @@ int32_t EncodeDataProcess::InitEncoder() } ret = StartVideoEncoder(); + ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_ENCODE_ERROR, + CreateMsg("start video encoder failed, width %d, height %d, format %s", sourceConfig_.GetWidth(), + sourceConfig_.GetHeight(), + ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())].c_str())); if (ret != DCAMERA_OK) { DHLOGE("Start Video encoder failed."); - ReportStartVideoEncoderFail(START_VIDEO_ENCODER_ERROR, sourceConfig_.GetWidth(), sourceConfig_.GetHeight(), - ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())], - "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(), + ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())].c_str())); return ret; } From bd2ffc39575aec1c46bc4c70d7d9d1691e6d344c Mon Sep 17 00:00:00 2001 From: chen0088 Date: Tue, 14 Jun 2022 16:21:50 +0800 Subject: [PATCH 2/5] modify hisysevent Signed-off-by: chen0088 --- common/include/utils/dcamera_hisysevent_adapter.h | 2 +- .../native_cpp/camera_sink/src/dcamera_sink_handler.cpp | 2 ++ .../camera_sink/src/dcamera_sink_load_callback.cpp | 2 -- .../native_cpp/camera_source/src/dcamera_source_handler.cpp | 2 ++ .../camera_source/src/dcamera_source_load_callback.cpp | 2 -- services/channel/src/dcamera_softbus_adapter.cpp | 2 ++ .../multimedia_codec/decoder/decode_data_process_common.cpp | 6 +++--- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/common/include/utils/dcamera_hisysevent_adapter.h b/common/include/utils/dcamera_hisysevent_adapter.h index 78edcbd..fec7474 100644 --- a/common/include/utils/dcamera_hisysevent_adapter.h +++ b/common/include/utils/dcamera_hisysevent_adapter.h @@ -32,7 +32,7 @@ const std::string OPEN_CAMERA_EVENT = "DCAMERA_OPEN"; const std::string CLOSE_CAMERA_EVENT = "DCAMERA_CLOSE"; const std::string START_CAPTURE_EVENT = "DCAMERA_CAPTURE"; -enum DcameraHisyseventErrno { +enum DcameraHisyseventErrno : int32_t { DCAMERA_SA_ERROR = 0, DCAMERA_HDF_ERROR = 1, DCAMERA_CREATE_SESSIONSVR_ERROR = 2, 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 9fa16d9..2358c3c 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 @@ -42,6 +42,8 @@ int32_t DCameraSinkHandler::InitSink(const std::string& params) DHLOGE("GetSourceLocalDHMS GetSystemAbilityManager failed"); return DCAMERA_INIT_ERR; } + ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_SA_ERROR, + CreateMsg("dcamera sink OnLoadSystemAbilityFail, systemAbilityId: %d", DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID)); ReportSaEvent(INIT_SA_EVENT, DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, "init sink sa event."); sptr loadCallback = new DCameraSinkLoadCallback(params); int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, loadCallback); 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 2d8055e..b372c4c 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 @@ -42,8 +42,6 @@ void DCameraSinkLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbilityId void DCameraSinkLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) { DHLOGI("OnLoadSystemAbilityFail systemAbilityId: %d.", systemAbilityId); - ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_SA_ERROR, - CreateMsg("dcamera sink OnLoadSystemAbilityFail, systemAbilityId: %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_source/src/dcamera_source_handler.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp index 4b688c2..b32bd9f 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 @@ -44,6 +44,8 @@ int32_t DCameraSourceHandler::InitSource(const std::string& params) DHLOGE("GetSourceLocalDHMS GetSystemAbilityManager failed"); return DCAMERA_INIT_ERR; } + ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_SA_ERROR, + CreateMsg("dcamera source OnLoadSystemAbilityFail, systemAbilityId: %d", DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID)); ReportSaEvent(INIT_SA_EVENT, DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, "init source sa event."); sptr loadCallback = new DCameraSourceLoadCallback(params); int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, loadCallback); 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 c373bd2..90150c2 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 @@ -42,8 +42,6 @@ void DCameraSourceLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbility void DCameraSourceLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) { DHLOGI("OnLoadSystemAbilityFail systemAbilityId: %d.", systemAbilityId); - ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_SA_ERROR, - CreateMsg("dcamera source OnLoadSystemAbilityFail, systemAbilityId: %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/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index 95eae78..c04631c 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -124,6 +124,8 @@ int32_t DCameraSoftbusAdapter::CreateSoftbusSessionServer(std::string sessionNam } int32_t ret = CreateSessionServer(PKG_NAME.c_str(), sessionName.c_str(), &sessListeners_[role]); + ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_CREATE_SESSIONSVR_ERROR, + CreateMsg("create session server failed, sessionName %s", sessionName.c_str())); if (ret != DCAMERA_OK) { DHLOGE("DCameraSoftbusAdapter CreateSessionServer failed, ret: %d", ret); ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_CREATE_SESSIONSVR_ERROR, 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 c1a370a..b85c5fb 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 @@ -110,9 +110,9 @@ int32_t DecodeDataProcess::InitDecoder() ret = StartVideoDecoder(); ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_DECODE_ERROR, - CreateMsg("start video decoder failed, width %d, height %d, format %s", sourceConfig_.GetWidth(), - sourceConfig_.GetHeight(), - ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())].c_str())); + CreateMsg("start video decoder failed, width %d, height %d, format %s", sourceConfig_.GetWidth(), + sourceConfig_.GetHeight(), + ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())].c_str())); if (ret != DCAMERA_OK) { DHLOGE("Start Video decoder failed."); ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_DECODE_ERROR, From de160f7d45aeceda797dec041a14fc6f43eb775c Mon Sep 17 00:00:00 2001 From: chen0088 Date: Tue, 14 Jun 2022 16:59:48 +0800 Subject: [PATCH 3/5] modify hisysevent Signed-off-by: chen0088 --- common/src/utils/dcamera_hisysevent_adapter.cpp | 2 -- hisysevent.yaml | 2 +- .../src/distributedcamera/distributed_camera_source_service.cpp | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/utils/dcamera_hisysevent_adapter.cpp b/common/src/utils/dcamera_hisysevent_adapter.cpp index 2e0edfc..dd09dd2 100644 --- a/common/src/utils/dcamera_hisysevent_adapter.cpp +++ b/common/src/utils/dcamera_hisysevent_adapter.cpp @@ -135,7 +135,6 @@ void ReportStartCaptureEvent(const std::string eventName, EventCaptureInfo& capt std::string CreateMsg(const char *format, ...) { - DHLOGE("cmh CreateMsg enter....."); va_list args; (void)memset_s(&args, sizeof(va_list), 0, sizeof(va_list)); va_start(args, format); @@ -146,7 +145,6 @@ std::string CreateMsg(const char *format, ...) return ""; } va_end(args); - DHLOGE("cmh CreateMsg end....."); return msg; } } // namespace DistributedHardware diff --git a/hisysevent.yaml b/hisysevent.yaml index 5d16eed..6266852 100644 --- a/hisysevent.yaml +++ b/hisysevent.yaml @@ -53,7 +53,7 @@ DCAMERA_REGISTER_FAIL: DCAMERA_OPT_FAIL: __BASE: {type: FAULT, level: CRITICAL, desc: dcamera operate error occured} - ERRCODE: {type: STRING, desc: dcamera init process fail error code} + ERRCODE: {type: INT32, desc: dcamera init process fail error code} MSG: {type: STRING, desc: dcamera init process error info} DCAMERA_INIT: 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 022f7cc..9e993e5 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp @@ -141,6 +141,8 @@ int32_t DistributedCameraSourceService::RegisterDistributedHardware(const std::s } ret = camDev->RegisterDistributedHardware(devId, dhId, reqId, param.version, param.attrs); + ReportRegisterCameraFail(DCAMERA_REGISTER_FAIL, GetAnonyString(devId), dhId, param.version, + "dcamera source RegisterDistributedHardware fail."); if (ret != DCAMERA_OK) { DHLOGE("DistributedCameraSourceService RegisterDistributedHardware failed, ret: %d", ret); ReportRegisterCameraFail(DCAMERA_REGISTER_FAIL, GetAnonyString(devId), dhId, param.version, From 92616889a7936a66d27e26a41b75b891a3a87b00 Mon Sep 17 00:00:00 2001 From: chen0088 Date: Tue, 14 Jun 2022 18:07:13 +0800 Subject: [PATCH 4/5] modify hisysevent Signed-off-by: chen0088 --- .../native_cpp/camera_sink/src/dcamera_sink_handler.cpp | 2 -- .../camera_source/src/dcamera_source_handler.cpp | 2 -- .../distributed_camera_sink_service.cpp | 4 +--- .../distributed_camera_source_service.cpp | 3 --- services/channel/src/dcamera_softbus_adapter.cpp | 9 ++------- .../multimedia_codec/decoder/decode_data_process.cpp | 6 +----- .../decoder/decode_data_process_common.cpp | 6 +----- .../multimedia_codec/encoder/encode_data_process.cpp | 6 +----- .../encoder/encode_data_process_common.cpp | 6 +----- 9 files changed, 7 insertions(+), 37 deletions(-) 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 2358c3c..9fa16d9 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 @@ -42,8 +42,6 @@ int32_t DCameraSinkHandler::InitSink(const std::string& params) DHLOGE("GetSourceLocalDHMS GetSystemAbilityManager failed"); return DCAMERA_INIT_ERR; } - ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_SA_ERROR, - CreateMsg("dcamera sink OnLoadSystemAbilityFail, systemAbilityId: %d", DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID)); ReportSaEvent(INIT_SA_EVENT, DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, "init sink sa event."); sptr loadCallback = new DCameraSinkLoadCallback(params); int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, loadCallback); 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 b32bd9f..4b688c2 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 @@ -44,8 +44,6 @@ int32_t DCameraSourceHandler::InitSource(const std::string& params) DHLOGE("GetSourceLocalDHMS GetSystemAbilityManager failed"); return DCAMERA_INIT_ERR; } - ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_SA_ERROR, - CreateMsg("dcamera source OnLoadSystemAbilityFail, systemAbilityId: %d", DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID)); ReportSaEvent(INIT_SA_EVENT, DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, "init source sa event."); sptr loadCallback = new DCameraSourceLoadCallback(params); int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, loadCallback); 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 434a864..1ae84ce 100644 --- a/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp +++ b/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp @@ -234,12 +234,10 @@ int32_t DistributedCameraSinkService::OpenChannel(const std::string& dhId, std:: std::shared_ptr sinkDevice = iter->second; int32_t ret = sinkDevice->OpenChannel(openInfo); - ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_SINK_OPEN_CAM_ERROR, - CreateMsg("sink service open channel failed, dhId %s", GetAnonyString(dhId).c_str())); if (ret != DCAMERA_OK) { DHLOGE("DistributedCameraSinkService::OpenChannel failed, ret: %d", ret); ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_SINK_OPEN_CAM_ERROR, - CreateMsg("sink service open channel failed, dhId %s", GetAnonyString(dhId).c_str())); + CreateMsg("sink service open channel failed, dhId: %s", GetAnonyString(dhId).c_str())); return ret; } DHLOGI("DistributedCameraSinkService::OpenChannel success"); 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 9e993e5..2caed4a 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp @@ -141,8 +141,6 @@ int32_t DistributedCameraSourceService::RegisterDistributedHardware(const std::s } ret = camDev->RegisterDistributedHardware(devId, dhId, reqId, param.version, param.attrs); - ReportRegisterCameraFail(DCAMERA_REGISTER_FAIL, GetAnonyString(devId), dhId, param.version, - "dcamera source RegisterDistributedHardware fail."); if (ret != DCAMERA_OK) { DHLOGE("DistributedCameraSourceService RegisterDistributedHardware failed, ret: %d", ret); ReportRegisterCameraFail(DCAMERA_REGISTER_FAIL, GetAnonyString(devId), dhId, param.version, @@ -198,7 +196,6 @@ int32_t DistributedCameraSourceService::LoadDCameraHDF() { DHLOGI("load hdf driver start"); int32_t ret = DCameraHdfOperate::GetInstance().LoadDcameraHDFImpl(); - ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_HDF_ERROR, CreateMsg("dcamera load hdf driver fail.")); if (ret != DCAMERA_OK) { DHLOGE("load hdf driver failed, ret %d", ret); ReportDcamerInitFail(DCAMERA_INIT_FAIL, DCAMERA_HDF_ERROR, CreateMsg("dcamera load hdf driver fail.")); diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index c04631c..24a33a9 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -124,12 +124,10 @@ int32_t DCameraSoftbusAdapter::CreateSoftbusSessionServer(std::string sessionNam } int32_t ret = CreateSessionServer(PKG_NAME.c_str(), sessionName.c_str(), &sessListeners_[role]); - ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_CREATE_SESSIONSVR_ERROR, - CreateMsg("create session server failed, sessionName %s", sessionName.c_str())); if (ret != DCAMERA_OK) { DHLOGE("DCameraSoftbusAdapter CreateSessionServer failed, ret: %d", ret); ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_CREATE_SESSIONSVR_ERROR, - CreateMsg("create session server failed, sessionName %s", sessionName.c_str())); + CreateMsg("create session server failed, sessionName: %s", sessionName.c_str())); return ret; } sessionTotal_[sessionName]++; @@ -200,13 +198,10 @@ int32_t DCameraSoftbusAdapter::OpenSoftbusSession(std::string mySessName, std::s } attr.attr.streamAttr.streamType = (StreamType)streamType; int32_t sessionId = OpenSession(mySessName.c_str(), peerSessName.c_str(), peerDevId.c_str(), "0", &attr); - ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_OPEN_SESSION_ERROR, - CreateMsg("open softbus session failed, mySessName %s, peerSessName %s, peerDevId %s", - mySessName.c_str(), peerSessName.c_str(), peerDevId.c_str())); if (sessionId < 0) { DHLOGE("DCameraSoftbusAdapter OpenSoftbusSession failed %d", sessionId); ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_OPEN_SESSION_ERROR, - CreateMsg("open softbus session failed, mySessName %s, peerSessName %s, peerDevId %s", + CreateMsg("open softbus session failed, mySessName: %s, peerSessName: %s, peerDevId: %s", mySessName.c_str(), peerSessName.c_str(), peerDevId.c_str())); return DCAMERA_BAD_OPERATE; } 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 8a45046..f7daa46 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 @@ -109,14 +109,10 @@ int32_t DecodeDataProcess::InitDecoder() } ret = StartVideoDecoder(); - ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_DECODE_ERROR, - CreateMsg("start video decoder failed, width %d, height %d, format %s", sourceConfig_.GetWidth(), - sourceConfig_.GetHeight(), - ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())].c_str())); 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(), + 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; 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 b85c5fb..b00dfa5 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 @@ -109,14 +109,10 @@ int32_t DecodeDataProcess::InitDecoder() } ret = StartVideoDecoder(); - ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_DECODE_ERROR, - CreateMsg("start video decoder failed, width %d, height %d, format %s", sourceConfig_.GetWidth(), - sourceConfig_.GetHeight(), - ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())].c_str())); 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(), + 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; 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 10e4e60..9d67bc1 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 @@ -114,14 +114,10 @@ int32_t EncodeDataProcess::InitEncoder() } ret = StartVideoEncoder(); - ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_ENCODE_ERROR, - CreateMsg("start video encoder failed, width %d, height %d, format %s", sourceConfig_.GetWidth(), - sourceConfig_.GetHeight(), - ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())].c_str())); 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(), + 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; diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp index 61f6c6c..36b6166 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process_common.cpp @@ -114,14 +114,10 @@ int32_t EncodeDataProcess::InitEncoder() } ret = StartVideoEncoder(); - ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_ENCODE_ERROR, - CreateMsg("start video encoder failed, width %d, height %d, format %s", sourceConfig_.GetWidth(), - sourceConfig_.GetHeight(), - ENUM_VIDEOFORMAT_STRINGS[static_cast(sourceConfig_.GetVideoformat())].c_str())); 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(), + 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; From 643e5d5ddd3bc83f057bfbcbd512b82d30718a54 Mon Sep 17 00:00:00 2001 From: chen0088 Date: Tue, 14 Jun 2022 19:53:12 +0800 Subject: [PATCH 5/5] modify hisysevent Signed-off-by: chen0088 --- common/src/utils/dcamera_hisysevent_adapter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/utils/dcamera_hisysevent_adapter.cpp b/common/src/utils/dcamera_hisysevent_adapter.cpp index dd09dd2..411e1d4 100644 --- a/common/src/utils/dcamera_hisysevent_adapter.cpp +++ b/common/src/utils/dcamera_hisysevent_adapter.cpp @@ -15,7 +15,6 @@ #include "dcamera_hisysevent_adapter.h" -#include "constants.h" #include "hisysevent.h" #include "securec.h" @@ -25,6 +24,7 @@ namespace OHOS { namespace DistributedHardware { namespace { +constexpr int32_t MSG_MAX_LEN = 2048; using HiSysEventNameSpace = OHOS::HiviewDFX::HiSysEvent; const std::string DOMAIN_STR = std::string(HiSysEventNameSpace::Domain::DISTRIBUTED_CAMERA); const std::string ENUM_STREAMTYPE_STRINGS[] = { @@ -138,7 +138,7 @@ std::string CreateMsg(const char *format, ...) va_list args; (void)memset_s(&args, sizeof(va_list), 0, sizeof(va_list)); va_start(args, format); - char msg[LOG_MAX_LEN] = {0}; + char msg[MSG_MAX_LEN] = {0}; if (vsnprintf_s(msg, sizeof(msg), sizeof(msg) - 1, format, args) < 0) { DHLOGE("failed to call vsnprintf_s"); va_end(args);