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;