Improved memory management

- Early deallocation for Frame members
- Early reset of shared pointers
- Impact visible with heaptrack

Author: Louis Fréneau

src/app/uvgVPCCencAppExample.cpp

@@ -362,7 +362,7 @@ int main(const int argc, const char* const argv[]) {
     uvgvpcc_enc::Logger::log(uvgvpcc_enc::LogLevel::INFO, "APPLICATION", "Encoded " + std::to_string(frameRead) + " frames.\n");
 
     inputTh.join();
-    uvgvpcc_enc::API::stopEncoder();
+    // uvgvpcc_enc::API::stopEncoder(); // lf: not usefull (call two times ThreadQueue::stop()) because of custom destructor for ThreadQueue
 
     if (uvgvpcc_enc::p_->timerLog) {
         encodingTimerTotal = uvgvpcc_enc::global_timer.elapsed() - encodingTimerTotal;

src/lib/bitstreamGeneration/atlas_context.cpp

@@ -40,6 +40,7 @@
 #include <cstdint>
 #include <iostream>
 #include <memory>
+#include <vector>
 
 #include "atlas_frame.hpp"
 #include "bitstream_common.hpp"
@@ -152,6 +153,10 @@ atlas_tile_data_unit atlas_context::create_atlas_tile_data_unit(const uvgvpcc_en
         }
         atdu.patch_information_data_.push_back(pid);
     }
+
+
+    std::vector<uvgvpcc_enc::Patch>().swap(frameUVG->patchList); // Release memory 
+
     // Last patch is I_END patch
     patch_information_data end_patch;
     end_patch.patchMode = ATDU_PATCH_MODE_I_TILE::I_END;

src/lib/bitstreamGeneration/bitstreamGeneration.cpp

@@ -68,6 +68,11 @@ void BitstreamGeneration::createV3CGOFBitstream(const std::shared_ptr<uvgvpcc_en
     auto atlas = std::make_unique<atlas_context>();
     atlas->initialize_atlas_context(gofUVG, paramUVG);
 
+    
+    for(auto& frame : gofUVG->frames) {
+        frame.reset(); // Release memory
+    }
+
     // --------------- Fetch video sub-bitstream data ---------------------------------------------
     // Occupancy map
     auto bitstream_ovd = std::make_unique<std::vector<uint8_t>>();
@@ -77,6 +82,7 @@ void BitstreamGeneration::createV3CGOFBitstream(const std::shared_ptr<uvgvpcc_en
     // }
     *bitstream_ovd.get() = gofUVG->bitstreamOccupancy;
     byteStreamToSampleStream(*bitstream_ovd.get(), 4, ovd_nals, false);
+    std::vector<uint8_t>().swap(gofUVG->bitstreamOccupancy); // Release memory
 
     // Geometry map
     auto bitstream_gvd = std::make_unique<std::vector<uint8_t>>();
@@ -86,6 +92,7 @@ void BitstreamGeneration::createV3CGOFBitstream(const std::shared_ptr<uvgvpcc_en
     // }
     *bitstream_gvd.get() = gofUVG->bitstreamGeometry;
     byteStreamToSampleStream(*bitstream_gvd.get(), 4, gvd_nals, false);
+    std::vector<uint8_t>().swap(gofUVG->bitstreamGeometry); // Release memory
 
     // Attribute map
     auto bitstream_avd = std::make_unique<std::vector<uint8_t>>();
@@ -95,6 +102,7 @@ void BitstreamGeneration::createV3CGOFBitstream(const std::shared_ptr<uvgvpcc_en
     // }
     *bitstream_avd.get() = gofUVG->bitstreamAttribute;
     byteStreamToSampleStream(*bitstream_avd.get(), 4, avd_nals, false);
+    std::vector<uint8_t>().swap(gofUVG->bitstreamAttribute); // Release memory
 
     // --------------- Calculate V3C unit size precision -------------------------------------------
     size_t v3c_max_size = v3c_parameter_set.get()->get_vps_byte_len();
@@ -132,5 +140,6 @@ void BitstreamGeneration::createV3CGOFBitstream(const std::shared_ptr<uvgvpcc_en
     } else {
         gof.write_v3c_chunk(output);
     }
+
     output->available_chunks.release();
 }

src/lib/mapGeneration/mapGeneration.cpp

@@ -556,9 +556,8 @@ void MapGenerationBaseLine::generateFrameMaps(const std::shared_ptr<uvgvpcc_enc:
 
     // Geometry and attribute map generation //
     writePatches(frame, frame->mapHeight);
-
-
-
+    std::vector<Vector3<uint8_t>>().swap(frame->pointsAttribute); // Release memory
+    
     // Background filling //
     fillBackgroundImages(frame, frame->mapHeight);
 

src/lib/patchGeneration/patchGeneration.cpp

@@ -115,7 +115,7 @@ void PatchGeneration::generateFramePatches(std::shared_ptr<uvgvpcc_enc::Frame> f
     PPISegmenter ppiSegmenter(voxelizedPointsGeometry, pointsNormal);
     ppiSegmenter.initialSegmentation(voxelsPPIs, frame->frameId);
     ppiSegmenter.refineSegmentation(voxelsPPIs, frame->frameId);
-
+    
     // "De-voxelization"
     std::vector<size_t> pointsPPIsBuffer;
     const std::vector<size_t>& pointsPPIs = useVoxelization ? pointsPPIsBuffer : voxelsPPIs;
@@ -134,4 +134,8 @@ void PatchGeneration::generateFramePatches(std::shared_ptr<uvgvpcc_enc::Frame> f
     std::sort(frame->patchList.begin(), frame->patchList.end(), [](const uvgvpcc_enc::Patch& patchA, const uvgvpcc_enc::Patch& patchB) {
         return std::max(patchA.widthInPixel_, patchA.heightInPixel_) > std::max(patchB.widthInPixel_, patchB.heightInPixel_);
     });
+
+
+    std::vector<Vector3<typeGeometryInput>>().swap(frame->pointsGeometry); // Release memory
+
 }

src/lib/patchGeneration/patchSegmentation.cpp

@@ -713,6 +713,9 @@ void PatchSegmentation::patchSegmentation(const std::shared_ptr<uvgvpcc_enc::Fra
         refillRawPoints(resamplePointSet, rawPoints, frame->pointsGeometry, pointCount, flags, nnPropagationMapFlagTrue);
     }
 
+    std::vector<size_t>().swap(frame->patchPartition); // Release memory 
+
+
     if (p_->exportIntermediatePointClouds) {
         const std::string plyFilePath =
             p_->intermediateFilesDir + "/patchSegmentation/PATCH-SEGMENTATION_f-" + uvgvpcc_enc::zeroPad(frame->frameId, 3) + ".ply";