From ac44f73262e034fa90affbe787fcca92b632b448 Mon Sep 17 00:00:00 2001 From: chen0088 Date: Mon, 13 Jun 2022 12:46:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0hitrace=E6=89=93=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chen0088 --- common/src/utils/dcamera_hitrace_adapter.cpp | 2 -- .../dcameradata/dcamera_source_data_process.cpp | 9 +-------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/common/src/utils/dcamera_hitrace_adapter.cpp b/common/src/utils/dcamera_hitrace_adapter.cpp index 98f5833..3ba42a9 100644 --- a/common/src/utils/dcamera_hitrace_adapter.cpp +++ b/common/src/utils/dcamera_hitrace_adapter.cpp @@ -20,13 +20,11 @@ namespace OHOS { namespace DistributedHardware { void DcameraStartAsyncTrace(const std::string& str, int32_t taskId) { - DHLOGI("cmh++ DcameraStartAsyncTrace str: %s, taskId %d", str.c_str(), taskId); StartAsyncTrace(DCAMERA_HITRACE_LABEL, str, taskId, -1); } void DcameraFinishAsyncTrace(const std::string& str, int32_t taskId) { - DHLOGI("cmh++ DcameraFinishAsyncTrace str: %s, taskId %d", str.c_str(), taskId); FinishAsyncTrace(DCAMERA_HITRACE_LABEL, str, taskId); } } // namespace DistributedHardware diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_data_process.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_data_process.cpp index eb7f65e..6936e7d 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_data_process.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_data_process.cpp @@ -40,16 +40,11 @@ DCameraSourceDataProcess::~DCameraSourceDataProcess() int32_t DCameraSourceDataProcess::FeedStream(std::vector>& buffers) { - DHLOGI("cmh*** FeedStream isFirstContStream_: %d, streamType_ %d", isFirstContStream_, streamType_); if (isFirstContStream_ && streamType_ == CONTINUOUS_FRAME) { - DHLOGI("cmh***11 FeedStream isFirstContStream_: %d, streamType_ %d", isFirstContStream_, streamType_); - isFirstContStream_ = false; - DHLOGI("cmh***1122 FeedStream isFirstContStream_: %d, streamType_ %d", isFirstContStream_, streamType_); DcameraFinishAsyncTrace(DCAMERA_CONTINUE_FIRST_FRAME, DCAMERA_CONTINUE_FIRST_FRAME_TASKID); + isFirstContStream_ = false; } else if (streamType_ == SNAPSHOT_FRAME) { - DHLOGI("cmh***22 FeedStream isFirstContStream_: %d, streamType_ %d", isFirstContStream_, streamType_); DcameraFinishAsyncTrace(DCAMERA_SNAPSHOT_FIRST_FRAME, DCAMERA_SNAPSHOT_FIRST_FRAME_TASKID); - DHLOGI("cmh***2233 FeedStream isFirstContStream_: %d, streamType_ %d", isFirstContStream_, streamType_); } if (buffers.size() > DCAMERA_MAX_NUM) { DHLOGI("DCameraSourceDataProcess FeedStream devId %s dhId %s size: %d over flow", @@ -174,9 +169,7 @@ int32_t DCameraSourceDataProcess::StopCapture(std::vector& streamIds) (*iter)->StopCapture(streamIdSet); } int32_t temp = GetProducerSize(); - DHLOGI("cmh--- StopCapture GetProducerSize %d", temp); if (streamType_ == CONTINUOUS_FRAME && GetProducerSize() == 0) { - DHLOGI("cmh--- StopCapture streamType_ %d", streamType_); isFirstContStream_ = true; } return DCAMERA_OK;