openharmony/distributed_camera
1
0
Fork 0
mirror of https://github.com/openharmony/distributed_camera.git synced 2026-07-01 22:14:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

modify hisysevent

Browse Source 
Signed-off-by: chen0088 <chenmenghuan3@huawei.com>
This commit is contained in:
chen0088
2022-06-14 16:21:50 +08:00
parent f95074853e
commit bd2ffc3957
7 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/include/utils/dcamera_hisysevent_adapter.h
+1 -1
View File
@@ -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,
interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp
+2
View File
@@ -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<DCameraSinkLoadCallback> loadCallback = new DCameraSinkLoadCallback(params);
int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID, loadCallback);
interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_load_callback.cpp
-2
View File
@@ -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,
interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp
+2
View File
@@ -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<DCameraSourceLoadCallback> loadCallback = new DCameraSourceLoadCallback(params);
int32_t ret = sm->LoadSystemAbility(DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID, loadCallback);
interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_load_callback.cpp
-2
View File
@@ -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,
services/channel/src/dcamera_softbus_adapter.cpp
+2
View File
@@ -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,
services/data_process/src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp
+3 -3
View File
@@ -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<int32_t>(sourceConfig_.GetVideoformat())].c_str()));
CreateMsg("start video decoder failed, width %d, height %d, format %s", sourceConfig_.GetWidth(),
sourceConfig_.GetHeight(),
ENUM_VIDEOFORMAT_STRINGS[static_cast<int32_t>(sourceConfig_.GetVideoformat())].c_str()));
if (ret != DCAMERA_OK) {
DHLOGE("Start Video decoder failed.");
ReportDcamerOptFail(DCAMERA_OPT_FAIL, DCAMERA_DECODE_ERROR,