From b53a621f212b3711571e9e14c9a7dd93b32767a3 Mon Sep 17 00:00:00 2001 From: chen0088 Date: Mon, 18 Jul 2022 09:14:33 +0800 Subject: [PATCH] fix:eventbus modify Signed-off-by: chen0088 --- .../src/distributedcameramgr/dcamera_sink_controller.cpp | 2 +- .../src/distributedcameramgr/dcamera_sink_data_process.cpp | 2 +- .../distributedcameramgr/dcamera_sink_data_process_common.cpp | 2 +- .../src/distributedcameramgr/dcamera_source_dev.cpp | 2 +- services/data_process/src/pipeline/dcamera_pipeline_source.cpp | 2 +- .../multimedia_codec/decoder/decode_data_process.cpp | 2 +- .../multimedia_codec/decoder/decode_data_process_common.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp index 414f8f60..bcbd27c3 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp @@ -248,7 +248,7 @@ int32_t DCameraSinkController::Init(std::vector& indexs) } channel_ = std::make_shared(); - eventBus_ = std::make_shared(); + eventBus_ = std::make_shared("SinkCtlHandler"); DCameraFrameTriggerEvent triggerEvent(*this); DCameraPostAuthorizationEvent authEvent(*this); eventBus_->AddHandler(triggerEvent.GetType(), *this); 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 d870b710..a4959e77 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_data_process.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_data_process.cpp @@ -29,7 +29,7 @@ DCameraSinkDataProcess::DCameraSinkDataProcess(const std::string& dhId, std::sha : dhId_(dhId), channel_(channel) { DHLOGI("DCameraSinkDataProcess Constructor dhId: %s", GetAnonyString(dhId_).c_str()); - eventBus_ = std::make_shared(); + eventBus_ = std::make_shared("SinkDPHandler"); DCameraPhotoOutputEvent photoEvent(*this); DCameraVideoOutputEvent videoEvent(*this); eventBus_->AddHandler(photoEvent.GetType(), *this); diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_data_process_common.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_data_process_common.cpp index c44c6929..addaca00 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_data_process_common.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_data_process_common.cpp @@ -29,7 +29,7 @@ DCameraSinkDataProcess::DCameraSinkDataProcess(const std::string& dhId, std::sha : dhId_(dhId), channel_(channel) { DHLOGI("DCameraSinkDataProcess Constructor dhId: %s", GetAnonyString(dhId_).c_str()); - eventBus_ = std::make_shared(); + eventBus_ = std::make_shared("SinkDPHandler"); DCameraPhotoOutputEvent photoEvent(*this); DCameraVideoOutputEvent videoEvent(*this); eventBus_->AddHandler(photoEvent.GetType(), *this); diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp index 821f5fad..403f09b7 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp @@ -76,7 +76,7 @@ int32_t DCameraSourceDev::InitDCameraSourceDev() { DHLOGI("DCameraSourceDev InitDCameraSourceDev devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); - eventBus_ = std::make_shared(); + eventBus_ = std::make_shared("SrcDevHandler"); DCameraSourceEvent event(*this); eventBus_->AddHandler(event.GetType(), *this); auto cameraSourceDev = std::shared_ptr(shared_from_this()); diff --git a/services/data_process/src/pipeline/dcamera_pipeline_source.cpp b/services/data_process/src/pipeline/dcamera_pipeline_source.cpp index 11abb907..fa5e3a38 100644 --- a/services/data_process/src/pipeline/dcamera_pipeline_source.cpp +++ b/services/data_process/src/pipeline/dcamera_pipeline_source.cpp @@ -83,7 +83,7 @@ bool DCameraPipelineSource::IsInRange(const VideoConfigParams& curConfig) void DCameraPipelineSource::InitDCameraPipEvent() { DHLOGD("Init source DCamera pipeline event to asynchronously process data."); - eventBusSource_ = std::make_shared(); + eventBusSource_ = std::make_shared("PipelineSrcHandler"); DCameraPipelineEvent pipelineEvent(*this, std::make_shared()); eventBusSource_->AddHandler(pipelineEvent.GetType(), *this); } 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 f7daa46d..d5f6a9c3 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 @@ -91,7 +91,7 @@ bool DecodeDataProcess::IsConvertible(const VideoConfigParams& sourceConfig, con void DecodeDataProcess::InitCodecEvent() { DHLOGD("Init DecodeNode eventBus, and add handler for it."); - eventBusDecode_ = std::make_shared(); + eventBusDecode_ = std::make_shared("DeDtProcHandler"); DCameraCodecEvent codecEvent(*this, std::make_shared()); eventBusRegHandleDecode_ = eventBusDecode_->AddHandler(codecEvent.GetType(), *this); 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 b00dfa52..26166903 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 @@ -91,7 +91,7 @@ bool DecodeDataProcess::IsConvertible(const VideoConfigParams& sourceConfig, con void DecodeDataProcess::InitCodecEvent() { DHLOGD("Common Init DecodeNode eventBus, and add handler for it."); - eventBusDecode_ = std::make_shared(); + eventBusDecode_ = std::make_shared("DeDtProcHandler"); DCameraCodecEvent codecEvent(*this, std::make_shared()); eventBusRegHandleDecode_ = eventBusDecode_->AddHandler(codecEvent.GetType(), *this); -- Gitee