fix distributed camera bug

Signed-off-by: zhuxu <zhuxu29@huawei.com>

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<Camera::CameraMetadata> &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<int, std::vector<DCResolution>> GetDCameraSupportedFormats(const std::string &abilityInfo);
 

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);
 }

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",