diff --git a/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h b/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h index 7bd9714a9c29abb097f3ab9ea6679d897cf417fd..56639aaab6b50615cfe257a954b02990ad486fee 100644 --- a/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h +++ b/camera_hdf/hdi_impl/include/dcamera_device/dmetadata_processor.h @@ -56,7 +56,7 @@ private: DCamRetCode UpdateAbilityEntry(uint32_t tag, const void *data, size_t size); void ConvertToCameraMetadata(common_metadata_header_t *&input, std::shared_ptr &output); - void ResizeMetadataHeader(common_metadata_header_t *header, uint32_t itemCapacity, uint32_t dataCapacity); + void ResizeMetadataHeader(common_metadata_header_t *&header, uint32_t itemCapacity, uint32_t dataCapacity); uint32_t GetDataSize(uint32_t type); std::map> GetDCameraSupportedFormats(const std::string &abilityInfo); diff --git a/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp b/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp index aaf8aa350288e5456462345df1c59d20528aa608..ce4b85d0d22e1d381ec4ffdf33c88899729e5b69 100644 --- a/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp +++ b/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp @@ -456,11 +456,11 @@ void DMetadataProcessor::ConvertToCameraMetadata(common_metadata_header_t *&inpu } } -void DMetadataProcessor::ResizeMetadataHeader(common_metadata_header_t *header, +void DMetadataProcessor::ResizeMetadataHeader(common_metadata_header_t *&header, uint32_t itemCapacity, uint32_t dataCapacity) { if (header) { - header = nullptr; + Camera::FreeCameraMetadataBuffer(header); } header = Camera::AllocateCameraMetadataBuffer(itemCapacity, dataCapacity); } 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 cf9e50bb42ca049cb60ed071d3bc0c97cc3f3de8..134dac4b6f9d3b45bd3a4481944b066f2f95d3a1 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 @@ -223,7 +223,7 @@ int32_t DCameraStreamDataProcessProducer::FeedStreamToDriver(const std::shared_p ret = DCAMERA_MEMORY_OPT_ERROR; break; } - int32_t ret = memcpy_s(sharedMemory->bufferHandle_->virAddr, sharedMemory->size_, buffer->Data(), + ret = memcpy_s(sharedMemory->bufferHandle_->virAddr, sharedMemory->size_, buffer->Data(), buffer->Size()); if (ret != EOK) { DHLOGE("memcpy_s devId: %s dhId: %s streamId: %d bufSize: %d, addressSize: %d",