From e1b6c7dcc65c81cd8d6c4f530b3b771f9b845541 Mon Sep 17 00:00:00 2001 From: chen0088 Date: Sun, 23 Apr 2023 14:34:36 +0800 Subject: [PATCH] fix:ut Signed-off-by: chen0088 --- .../scale_conversion/scale_convert_process.cpp | 6 ++++-- .../scale_conversion/scale_convert_process_common.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process.cpp b/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process.cpp index 00a12dfa..1a512ee0 100644 --- a/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process.cpp +++ b/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process.cpp @@ -75,7 +75,7 @@ void ScaleConvertProcess::ReleaseProcessNode() int ScaleConvertProcess::ProcessData(std::vector>& inputBuffers) { - inputBuffers[0]->frameInfo_.timePonit.startScale = GetNowTimeStampUs(); + int64_t startScaleTime = GetNowTimeStampUs(); DHLOGD("Process data in ScaleConvertProcess."); if (!isScaleConvert_.load()) { DHLOGE("Scale Convert node occurred error or start release."); @@ -86,6 +86,7 @@ int ScaleConvertProcess::ProcessData(std::vector>& i DHLOGE("The input data buffers is empty."); return DCAMERA_BAD_VALUE; } + inputBuffers[0]->frameInfo_.timePonit.startScale = startScaleTime; if (!IsConvertible(sourceConfig_, processedConfig_)) { DHLOGD("The target resolution: %dx%d format: %d is the same as the source resolution: %dx%d format: %d", @@ -374,12 +375,13 @@ int32_t ScaleConvertProcess::ConvertFormatToRGBA(ImageUnitInfo& srcImgInfo, Imag int32_t ScaleConvertProcess::ConvertDone(std::vector>& outputBuffers) { - outputBuffers[0]->frameInfo_.timePonit.finishScale = GetNowTimeStampUs(); + int64_t startConvertDone = GetNowTimeStampUs(); DHLOGD("ScaleConvertProcess : Convert Done."); if (outputBuffers.empty()) { DHLOGE("The received data buffer is empty."); return DCAMERA_BAD_VALUE; } + outputBuffers[0]->frameInfo_.timePonit.finishScale = startConvertDone; if (nextDataProcess_ != nullptr) { DHLOGD("Send to the next node of the scale convert for processing."); diff --git a/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process_common.cpp b/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process_common.cpp index 41821946..23adc3c9 100644 --- a/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process_common.cpp +++ b/services/data_process/src/pipeline_node/scale_conversion/scale_convert_process_common.cpp @@ -106,7 +106,7 @@ void ScaleConvertProcess::ReleaseProcessNode() int ScaleConvertProcess::ProcessData(std::vector>& inputBuffers) { - inputBuffers[0]->frameInfo_.timePonit.startScale = GetNowTimeStampUs(); + int64_t startScaleTime = GetNowTimeStampUs(); DHLOGD("Process data in ScaleConvertProcess."); if (!isScaleConvert_.load()) { DHLOGE("Scale Convert node occurred error or start release."); @@ -117,6 +117,7 @@ int ScaleConvertProcess::ProcessData(std::vector>& i DHLOGE("The input data buffers is empty."); return DCAMERA_BAD_VALUE; } + inputBuffers[0]->frameInfo_.timePonit.startScale = startScaleTime; if (!IsConvertible(sourceConfig_, processedConfig_)) { DHLOGD("The target resolution: %dx%d format: %d is the same as the source resolution: %dx%d format: %d", @@ -362,12 +363,13 @@ int32_t ScaleConvertProcess::CopyNV21SrcData(const ImageUnitInfo& srcImgInfo) int32_t ScaleConvertProcess::ConvertDone(std::vector>& outputBuffers) { - outputBuffers[0]->frameInfo_.timePonit.finishScale = GetNowTimeStampUs(); + int64_t startConvertDone = GetNowTimeStampUs(); DHLOGD("ScaleConvertProcess : Convert Done."); if (outputBuffers.empty()) { DHLOGE("The received data buffer is empty."); return DCAMERA_BAD_VALUE; } + outputBuffers[0]->frameInfo_.timePonit.finishScale = startConvertDone; if (nextDataProcess_ != nullptr) { DHLOGD("Send to the next node of the scale convert for processing."); -- Gitee