[Apps] handle very high intensities

alicevision · Sep 11, 2020 · 91c1016 · 91c1016
1 parent fb1e41d
commit 91c1016
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 3 deletions.
diff --git a/src/aliceVision/image/io.cpp b/src/aliceVision/image/io.cpp
@@ -368,8 +368,12 @@ void writeImage(const std::string& path,
   oiio::ImageBuf formatBuf;  // buffer for image format modification
   if(isEXR)
   {
-    formatBuf.copy(*outBuf, oiio::TypeDesc::HALF); // override format, use half instead of float
-    outBuf = &formatBuf;
+    int useFullFloat = imageSpec.get_int_attribute("AliceVision:useFullFloat", 0);
+
+    if (!useFullFloat) {
+      formatBuf.copy(*outBuf, oiio::TypeDesc::HALF); // override format, use half instead of float
+      outBuf = &formatBuf;
+    }
   }
 
   // write image

diff --git a/src/software/pipeline/main_LdrToHdrMerge.cpp b/src/software/pipeline/main_LdrToHdrMerge.cpp
@@ -44,6 +44,11 @@ std::string getHdrImagePath(const std::string& outputPath, std::size_t g)
     return hdrImagePath;
 }
 
+bool isOverflow(const image::Image<image::RGBfColor> & input) {
+    const float maxHalfFloat = 65504.0f;
+    return (input.maxCoeff() > maxHalfFloat);
+}
+
 int aliceVision_main(int argc, char** argv)
 {
     std::string verboseLevel = system::EVerboseLevel_enumToString(system::Logger::getDefaultVerboseLevel());
@@ -287,6 +292,12 @@ int aliceVision_main(int argc, char** argv)
 
         // Write an image with parameters from the target view
         oiio::ParamValueList targetMetadata = image::readImageMetadata(targetView->getImagePath());
+
+        if (isOverflow(HDRimage)) 
+        {
+            targetMetadata.push_back(oiio::ParamValue("AliceVision:useFullFloat", int(1)));
+        }
+
         image::writeImage(hdrImagePath, HDRimage, image::EImageColorSpace::AUTO, targetMetadata);
     }
 

diff --git a/src/software/pipeline/main_panoramaCompositing.cpp b/src/software/pipeline/main_panoramaCompositing.cpp
@@ -49,6 +49,11 @@ typedef struct {
   std::string weights_path;
 } ConfigView;
 
+bool isOverflow(const image::Image<image::RGBAfColor> & input) {
+    const float maxHalfFloat = 65504.0f;
+    return (input.maxCoeff() > maxHalfFloat);
+}
+
 /**
  * @brief Maxflow computation based on a standard Adjacency List graph reprensentation.
  *
@@ -1842,6 +1847,10 @@ class GraphcutSeams {
             if (((mask(i, j) & 1) && (mask(i + 1, j) & 2)) || ((mask(i, j) & 2) && (mask(i + 1, j) & 1))) {
               float d1 = (color_label(i, j) - color_other(i, j)).norm();
               float d2 = (color_label(i + 1, j) - color_other(i + 1, j)).norm();
+
+              d1 = std::min(2.0f, d1);
+              d2 = std::min(2.0f, d2);
+
               w = (d1 + d2) * 100.0 + 1.0;
             }
 
@@ -2480,6 +2489,13 @@ int aliceVision_main(int argc, char **argv)
   // Store output
   ALICEVISION_LOG_INFO("Write output panorama to file " << outputPanorama);
   const aliceVision::image::Image<image::RGBAfColor> & panorama = compositer->getPanorama();
+
+  oiio::ParamValueList view_metadata = outputMetadata;
+  if (isOverflow(panorama)) 
+  {
+    outputMetadata.push_back(oiio::ParamValue("AliceVision:useFullFloat", int(1)));
+  }
+
   image::writeImage(outputPanorama, panorama, image::EImageColorSpace::AUTO, outputMetadata);
 
   return EXIT_SUCCESS;

diff --git a/src/software/pipeline/main_panoramaWarping.cpp b/src/software/pipeline/main_panoramaWarping.cpp
@@ -38,6 +38,11 @@ namespace po = boost::program_options;
 namespace bpt = boost::property_tree;
 namespace fs = boost::filesystem;
 
+bool isOverflow(const image::Image<image::RGBfColor> & input) {
+    const float maxHalfFloat = 65504.0f;
+    return (input.maxCoeff() > maxHalfFloat);
+}
+
 namespace SphericalMapping
 {
   /**
@@ -1197,9 +1202,15 @@ int aliceVision_main(int argc, char **argv)
         {
             const aliceVision::image::Image<image::RGBfColor> & cam = warper.getColor();
 
+            oiio::ParamValueList view_metadata = metadata;
+            if (isOverflow(cam)) 
+            {
+                view_metadata.push_back(oiio::ParamValue("AliceVision:useFullFloat", int(1)));
+            }
+
             const std::string viewFilepath = (fs::path(outputDirectory) / (viewIdStr + ".exr")).string();
             ALICEVISION_LOG_INFO("Store view " << i << " with path " << viewFilepath);
-            image::writeImage(viewFilepath, cam, image::EImageColorSpace::AUTO, metadata);
+            image::writeImage(viewFilepath, cam, image::EImageColorSpace::AUTO, view_metadata);
         }
         {
             const aliceVision::image::Image<unsigned char> & mask = warper.getMask();