diff --git a/common/include/utils/dcamera_hisysevent_adapter.h b/common/include/utils/dcamera_hisysevent_adapter.h index b28c2aa..fec7474 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 : int32_t { + 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..411e1d4 100644 --- a/common/src/utils/dcamera_hisysevent_adapter.cpp +++ b/common/src/utils/dcamera_hisysevent_adapter.cpp @@ -16,12 +16,15 @@ #include "dcamera_hisysevent_adapter.h" #include "hisysevent.h" +#include "securec.h" + #include "distributed_camera_errno.h" #include "distributed_hardware_log.h" 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[] = { @@ -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,20 @@ 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, ...) +{ + va_list args; + (void)memset_s(&args, sizeof(va_list), 0, sizeof(va_list)); + va_start(args, format); + 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); + return ""; + } + va_end(args); + return msg; +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/hisysevent.yaml b/hisysevent.yaml index 020c451..6266852 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: INT32, 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..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 @@ -44,7 +44,8 @@ void DCameraSinkLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) DHLOGI("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..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 @@ -44,7 +44,8 @@ void DCameraSourceLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) DHLOGI("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..1ae84ce 100644 --- a/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp +++ b/services/cameraservice/sinkservice/src/distributedcamera/distributed_camera_sink_service.cpp @@ -236,7 +236,8 @@ int32_t DistributedCameraSinkService::OpenChannel(const std::string& dhId, std:: int32_t ret = sinkDevice->OpenChannel(openInfo); 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 d02ccdb..f80a6fb 100644 --- a/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp +++ b/services/cameraservice/sourceservice/src/distributedcamera/distributed_camera_source_service.cpp @@ -144,7 +144,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); } @@ -200,7 +200,7 @@ int32_t DistributedCameraSourceService::LoadDCameraHDF() int32_t ret = DCameraHdfOperate::GetInstance().LoadDcameraHDFImpl(); 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..24a33a9 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]++; @@ -200,8 +200,9 @@ int32_t DCameraSoftbusAdapter::OpenSoftbusSession(std::string mySessName, std::s int32_t sessionId = OpenSession(mySessName.c_str(), peerSessName.c_str(), peerDevId.c_str(), "0", &attr); 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..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 @@ -111,9 +111,10 @@ int32_t DecodeDataProcess::InitDecoder() ret = StartVideoDecoder(); 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..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 @@ -111,9 +111,10 @@ int32_t DecodeDataProcess::InitDecoder() ret = StartVideoDecoder(); 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..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 @@ -116,9 +116,10 @@ int32_t EncodeDataProcess::InitEncoder() ret = StartVideoEncoder(); 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..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 @@ -116,9 +116,10 @@ int32_t EncodeDataProcess::InitEncoder() ret = StartVideoEncoder(); 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; }