diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.cpp index 0e13b19dd3d033287c0b944f004b762572dd7796..163be8df2b58869bde90da1d15b831130777c000 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_stream_data_process_producer.cpp @@ -225,7 +225,6 @@ int32_t DCameraStreamDataProcessProducer::FeedStreamToDriver(const DHBase& dhBas DCameraMemoryMap(sharedMemory.bufferHandle_->GetBufferHandle()); if (sharedMemory.bufferHandle_->GetBufferHandle()->virAddr == nullptr) { DHLOGE("mmap failed devId: %s dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); - ret = DCAMERA_MEMORY_OPT_ERROR; break; } ret = memcpy_s(sharedMemory.bufferHandle_->GetBufferHandle()->virAddr, sharedMemory.size_, buffer->Data(), @@ -234,7 +233,6 @@ int32_t DCameraStreamDataProcessProducer::FeedStreamToDriver(const DHBase& dhBas DHLOGE("memcpy_s devId: %s dhId: %s streamId: %d bufSize: %d, addressSize: %d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), streamId_, buffer->Size(), sharedMemory.size_); - ret = DCAMERA_MEMORY_OPT_ERROR; break; } sharedMemory.size_ = buffer->Size(); diff --git a/services/data_process/include/pipeline_node/fpscontroller/fps_controller_process.h b/services/data_process/include/pipeline_node/fpscontroller/fps_controller_process.h index f56a90a23bc99d975f33682517f4d419ccfe024a..44e939a5be980bbde58712943d7c9faec7d657ff 100644 --- a/services/data_process/include/pipeline_node/fpscontroller/fps_controller_process.h +++ b/services/data_process/include/pipeline_node/fpscontroller/fps_controller_process.h @@ -73,7 +73,7 @@ private: float frameRateCorrectionFactor_ = 0.0; /* modify the frame rate controller argument */ int32_t frameRateOvershootMdf_ = 0; - int64_t incomingFrameTimesMs_[INCOME_FRAME_TIME_HISTORY_WINDOWS_SIZE]; + int64_t incomingFrameTimesMs_[INCOME_FRAME_TIME_HISTORY_WINDOWS_SIZE] = { 0 }; }; } // namespace DistributedHardware } // namespace OHOS