ExportImages support different storage data types for exr

Author: Fabien Servant

meshroom/aliceVision/ExportImages.py

@@ -1,7 +1,7 @@
 __version__ = "1.1"
 
 from meshroom.core import desc
-from meshroom.core.utils import VERBOSE_LEVEL
+from meshroom.core.utils import COLORSPACES, EXR_STORAGE_DATA_TYPE, VERBOSE_LEVEL
 
 
 class ExportImages(desc.AVCommandLineNode):
@@ -29,6 +29,17 @@ class ExportImages(desc.AVCommandLineNode):
             description="This SfMData file contains the required intrinsics for the output images.",
             value="",
         ),
+        desc.ListAttribute(
+            elementDesc=desc.File(
+                name="masksFolder",
+                label="Masks Folder",
+                description="",
+                value="",
+            ),
+            name="masksFolders",
+            label="Masks Folders",
+            description="Use masks from specific folder(s). Filename should be the same or the image UID.",
+        ),
         desc.ChoiceParam(
             name="outputFileType",
             label="Output File Type",
@@ -61,24 +72,25 @@ class ExportImages(desc.AVCommandLineNode):
             value="viewid",
             values=["viewid", "frameid", "keep"],
         ),
-        desc.ListAttribute(
-            elementDesc=desc.File(
-                name="masksFolder",
-                label="Masks Folder",
-                description="",
-                value="",
-            ),
-            name="masksFolders",
-            label="Masks Folders",
-            description="Use masks from specific folder(s). Filename should be the same or the image UID.",
-        ),
         desc.ChoiceParam(
             name="maskExtension",
             label="Mask Extension",
             description="File extension for the masks to use.",
             value="png",
             values=["exr", "jpg", "png"],
         ),
+        desc.ChoiceParam(
+            name="storageDataType",
+            label="Storage Data Type",
+            description="Storage image data type:\n"
+                        " - float: Use full floating point (32 bits per channel).\n"
+                        " - half: Use half float (16 bits per channel).\n"
+                        " - halfFinite: Use half float, but clamp values to avoid non-finite values.\n"
+                        " - auto: Use half float if all values can fit, else use full float.",
+            values=EXR_STORAGE_DATA_TYPE,
+            value="halfFinite",
+            enabled=lambda node: node.outputFileType.value == "exr"
+        ),
         desc.ChoiceParam(
             name="verboseLevel",
             label="Verbose Level",

src/software/utils/main_exportImages.cpp

@@ -202,6 +202,7 @@ void ImageRemoveDistortion(const image::Image<T>& imageIn,
  * @param medianCameraExposure median camera exposure for the sfmData
  * @param masksFolders the mask folders list
  * @param maskExtension the mask extension
+ * @param storageDatatype output image storage data type
  * @return false on error
 */
 bool processImage(const std::string& dstFileName,
@@ -214,7 +215,8 @@ bool processImage(const std::string& dstFileName,
              double cameraExposure,
              double medianCameraExposure,
              const std::vector<std::string> & masksFolders,
-             const std::string & maskExtension)
+             const std::string & maskExtension,
+             const image::EStorageDataType & storageDataType)
 {
     image::Image<image::RGBAfColor> image;
     image::Image<image::RGBAfColor> image_ud;
@@ -304,7 +306,9 @@ bool processImage(const std::string& dstFileName,
     //Write the result
     try
     {
-        writeImage(dstFileName, image_ud, image::ImageWriteOptions(), metadata, roi);
+        image::ImageWriteOptions writeOptions;
+        writeOptions.storageDataType(storageDataType);
+        writeImage(dstFileName, image_ud, writeOptions, metadata, roi);
     }
     catch (...)
     {
@@ -324,6 +328,7 @@ bool processImage(const std::string& dstFileName,
  * @param exportFullRod do we export the full rod or not
  * @param masksFolders the mask folders list
  * @param maskExtension the mask extension
+ * @param storageDatatype output image storage data type
  * @param rangeStart the initial view index to process (range selection)
  * @param rangeEnd the last view index to process (range selection)
 */
@@ -334,6 +339,7 @@ bool process(const sfmData::SfMData & input,
              bool exportFullRod,
              const std::vector<std::string> & masksFolders,
              const std::string & maskExtension,
+             const image::EStorageDataType & storageDataType,
              size_t rangeStart,
              size_t rangeEnd)
 {
@@ -391,7 +397,8 @@ bool process(const sfmData::SfMData & input,
                     view.getImage().getCameraExposureSetting().getExposure(),
                     medianCameraExposure,
                     masksFolders,
-                    maskExtension);
+                    maskExtension,
+                    storageDataType);
     }
 
     return true;
@@ -413,6 +420,7 @@ int aliceVision_main(int argc, char* argv[])
     int rangeSize = 1;
     bool evCorrection = false;
     bool exportFullROD = false;
+    image::EStorageDataType storageDataType = image::EStorageDataType::HalfFinite;
 
     // clang-format off
     po::options_description requiredParams("Required parameters");
@@ -443,7 +451,9 @@ int aliceVision_main(int argc, char* argv[])
          "Use masks from specific folder(s).\n"
          "Filename should be the same or the image UID.")
         ("maskExtension", po::value<std::string>(&maskExtension)->default_value(maskExtension),
-         "File extension of the masks to use.");
+         "File extension of the masks to use.")
+        ("storageDataType", po::value<image::EStorageDataType>(&storageDataType)->default_value(storageDataType),
+         ("Storage data type: " + image::EStorageDataType_informations()).c_str());
     // clang-format on
 
     CmdLine cmdline("AliceVision prepareDenseScene");
@@ -561,6 +571,7 @@ int aliceVision_main(int argc, char* argv[])
                 exportFullROD,
                 masksFolders, 
                 maskExtension,
+                storageDataType,
                 rangeStart, 
                 rangeEnd))
     {