[IOs] Update readImage to support reading images containing raw data …

…in a non raw image format.
alicevision · Mar 6, 2023 · 4d681eb · 4d681eb
1 parent e2b9e01
commit 4d681eb
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 5 deletions.
diff --git a/src/aliceVision/image/io.cpp b/src/aliceVision/image/io.cpp
@@ -15,6 +15,7 @@
 #include <OpenImageIO/color.h>
 
 #include <aliceVision/half.hpp>
+#include <aliceVision/stl/mapUtils.hpp>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
@@ -606,12 +607,48 @@ void readImage(const std::string& path,
         ALICEVISION_THROW_ERROR("You must specify a requested color space for image file '" + path + "'.");
 
     // Get color space name. Default image color space is sRGB
-    const std::string fromColorSpaceName = (isRawImage && imageReadOptions.rawColorInterpretation == ERawColorInterpretation::DcpLinearProcessing) ? "aces2065-1" :
-                                            (isRawImage ? "linear" :
-                                             inBuf.spec().get_string_attribute("aliceVision:ColorSpace", inBuf.spec().get_string_attribute("oiio:ColorSpace", "sRGB")));
+    std::string fromColorSpaceName = (isRawImage && imageReadOptions.rawColorInterpretation == ERawColorInterpretation::DcpLinearProcessing) ? "aces2065-1" :
+                                       (isRawImage ? "linear" :
+                                        inBuf.spec().get_string_attribute("aliceVision:ColorSpace", inBuf.spec().get_string_attribute("oiio:ColorSpace", "sRGB")));
 
     ALICEVISION_LOG_TRACE("Read image " << path << " (encoded in " << fromColorSpaceName << " colorspace).");
-
+
+    DCPProfile dcpProf;
+    if ((fromColorSpaceName == "no_conversion") && (imageReadOptions.workingColorSpace != EImageColorSpace::NO_CONVERSION))
+    {
+        ALICEVISION_LOG_INFO("Source image is in a raw color space and must be converted into " << imageReadOptions.workingColorSpace << ".");
+        ALICEVISION_LOG_INFO("Check if a DCP profile is available in the metadata to be applied.");
+        if (inBuf.spec().nchannels < 3)
+        {
+            ALICEVISION_THROW_ERROR("A DCP profile cannot be applied on an image containing less than 3 channels.");
+        }
+
+        int width, height;
+        std::map<std::string, std::string> imageMetadata = getMapFromMetadata(readImageMetadata(path, width, height));
+
+        // load DCP metadata from metadata. An error will be thrown if all required metadata are not there.
+        dcpProf.Load(imageMetadata);
+
+        std::string cam_mul = map_has_non_empty_value(imageMetadata, "raw:cam_mul") ? imageMetadata.at("raw:cam_mul") : imageMetadata.at("AliceVision:raw:cam_mul");
+        std::vector<float> v_mult;
+        size_t last = 0;
+        size_t next = 1;
+        while ((next = cam_mul.find(",", last)) != std::string::npos)
+        {
+            v_mult.push_back(std::stof(cam_mul.substr(last, next - last)));
+            last = next + 1;
+        }
+        v_mult.push_back(std::stof(cam_mul.substr(last, cam_mul.find("}", last) - last)));
+
+        for (int i = 0; i < 3; i++)
+        {
+            neutral[i] = v_mult[i] / v_mult[1];
+        }
+
+        dcpProf.applyLinear(inBuf, neutral, imageReadOptions.doWBAfterDemosaicing, imageReadOptions.useDCPColorMatrixOnly);
+        fromColorSpaceName = "aces2065-1";
+    }
+
     if ((imageReadOptions.workingColorSpace == EImageColorSpace::NO_CONVERSION) ||
         (imageReadOptions.workingColorSpace == EImageColorSpace_stringToEnum(fromColorSpaceName)))
     {

diff --git a/src/software/pipeline/main_LdrToHdrMerge.cpp b/src/software/pipeline/main_LdrToHdrMerge.cpp
@@ -339,7 +339,14 @@ int aliceVision_main(int argc, char** argv)
         oiio::ParamValueList targetMetadata;
         for (const auto& meta : viewMetadata)
         {
-            targetMetadata.add_or_replace(oiio::ParamValue(meta.first, meta.second));
+            if (meta.first.compare(0, 3, "raw") == 0)
+            {
+                targetMetadata.add_or_replace(oiio::ParamValue("AliceVision:" + meta.first, meta.second));
+            }
+            else
+            {
+                targetMetadata.add_or_replace(oiio::ParamValue(meta.first, meta.second));
+            }
         }
         targetMetadata.add_or_replace(oiio::ParamValue("AliceVision:ColorSpace", image::EImageColorSpace_enumToString(workingColorSpace)));