Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[imageIO] ask "Linear" colorspace for RAW images #645

Merged
merged 1 commit into from
Jun 18, 2019
Merged

[imageIO] ask "Linear" colorspace for RAW images #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 39 additions & 10 deletions src/aliceVision/image/io.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <iostream>
#include <cmath>


namespace fs = boost::filesystem;

namespace aliceVision {
Expand Down Expand Up @@ -164,17 +165,40 @@ void readImage(const std::string& path,
// libRAW configuration
configSpec.attribute("raw:auto_bright", 0); // don't want exposure correction
configSpec.attribute("raw:use_camera_wb", 1); // want white balance correction
configSpec.attribute("raw:ColorSpace", "sRGB"); // want colorspace sRGB
configSpec.attribute("raw:use_camera_matrix", 3); // want to use embeded color profile
#if OIIO_VERSION <= (10000 * 2 + 100 * 0 + 8) // OIIO_VERSION <= 2.0.8
// In these previous versions of oiio, there was no Linear option
configSpec.attribute("raw:ColorSpace", "sRGB"); // want colorspace sRGB
#else
configSpec.attribute("raw:ColorSpace", "Linear"); // want linear colorspace with sRGB primaries
#endif

oiio::ImageBuf inBuf(path, 0, 0, NULL, &configSpec);

inBuf.read(0, 0, true, oiio::TypeDesc::FLOAT); // force image convertion to float (for grayscale and color space convertion)

if(!inBuf.initialized())
throw std::runtime_error("Can't find/open image file '" + path + "'.");

throw std::runtime_error("Cannot find/open image file '" + path + "'.");

#if OIIO_VERSION <= (10000 * 2 + 100 * 0 + 8) // OIIO_VERSION <= 2.0.8
// Workaround for bug in RAW colorspace management in previous versions of OIIO:
// When asking sRGB we got sRGB primaries with linear gamma,
// but oiio::ColorSpace was wrongly set to sRGB.
oiio::ImageSpec inSpec = inBuf.spec();
if(inSpec.get_string_attribute("oiio:ColorSpace", "") == "sRGB")
{
const auto in = oiio::ImageInput::open(path, nullptr);
const std::string formatStr = in->format_name();
if(formatStr == "raw")
{
// For the RAW plugin: override colorspace as linear (as the content is linear with sRGB primaries but declared as sRGB)
inSpec.attribute("oiio:ColorSpace", "Linear");
ALICEVISION_LOG_TRACE("OIIO workaround: RAW input image " << path << " is in Linear.");
}
}
#else
const oiio::ImageSpec& inSpec = inBuf.spec();
#endif

// check picture channels number
if(inSpec.nchannels != 1 && inSpec.nchannels < 3)
Expand All @@ -184,20 +208,25 @@ void readImage(const std::string& path,
if(imageColorSpace == EImageColorSpace::AUTO)
throw std::runtime_error("You must specify a requested color space for image file '" + path + "'.");

const std::string& colorSpace = inSpec.get_string_attribute("oiio:ColorSpace", "sRGB"); // default image color space is sRGB
ALICEVISION_LOG_TRACE("Read image " << path << " (encoded in " << colorSpace << " colorspace).");

if(imageColorSpace == EImageColorSpace::SRGB) // color conversion to sRGB
{
const std::string& colorSpace = inSpec.get_string_attribute("oiio:ColorSpace", "sRGB"); // default image color space is sRGB
if(colorSpace != "sRGB")
ALICEVISION_LOG_INFO("Convert image " << path << " from " << colorSpace << " to sRGB colorspace");
if (colorSpace != "sRGB")
{
oiio::ImageBufAlgo::colorconvert(inBuf, inBuf, colorSpace, "sRGB");
ALICEVISION_LOG_INFO("Convert image " << path << " to sRGB colorspace");
oiio::ImageBufAlgo::colorconvert(inBuf, inBuf, colorSpace, "sRGB");
ALICEVISION_LOG_INFO("Convert image " << path << " from " << colorSpace << " to sRGB colorspace");
}
}
else if(imageColorSpace == EImageColorSpace::LINEAR) // color conversion to linear
{
const std::string& colorSpace = inSpec.get_string_attribute("oiio:ColorSpace", "sRGB");
if(colorSpace != "Linear")
oiio::ImageBufAlgo::colorconvert(inBuf, inBuf, colorSpace, "Linear");
if (colorSpace != "Linear")
{
oiio::ImageBufAlgo::colorconvert(inBuf, inBuf, colorSpace, "Linear");
ALICEVISION_LOG_INFO("Convert image " << path << " from " << colorSpace << " to Linear colorspace");
}
}

// convert to grayscale if needed
Expand Down
50 changes: 41 additions & 9 deletions src/aliceVision/imageIO/image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <stdexcept>
#include <memory>


namespace fs = boost::filesystem;

namespace aliceVision {
Expand Down Expand Up @@ -127,35 +128,66 @@ void readImage(const std::string& path,
configSpec.attribute("raw:auto_bright", 0); // don't want exposure correction
configSpec.attribute("raw:use_camera_wb", 1); // want white balance correction
configSpec.attribute("raw:use_camera_matrix", 3); // want to use embeded color profile
#if OIIO_VERSION <= (10000 * 2 + 100 * 0 + 8) // OIIO_VERSION <= 2.0.8
// In these previous versions of oiio, there was no Linear option
configSpec.attribute("raw:ColorSpace", "sRGB"); // want colorspace sRGB
#else
configSpec.attribute("raw:ColorSpace", "Linear"); // want linear colorspace with sRGB primaries
#endif

oiio::ImageBuf inBuf(path, 0, 0, NULL, &configSpec);

inBuf.read(0, 0, true, oiio::TypeDesc::FLOAT); // force image convertion to float (for grayscale and color space convertion)

if(!inBuf.initialized())
throw std::runtime_error("Can't find/open image file '" + path + "'.");

throw std::runtime_error("Cannot find/open image file '" + path + "'.");

#if OIIO_VERSION <= (10000 * 2 + 100 * 0 + 8) // OIIO_VERSION <= 2.0.8
// Workaround for bug in RAW colorspace management in previous versions of OIIO:
// When asking sRGB we got sRGB primaries with linear gamma,
// but oiio::ColorSpace was wrongly set to sRGB.
oiio::ImageSpec inSpec = inBuf.spec();
if(inSpec.get_string_attribute("oiio:ColorSpace", "") == "sRGB")
{
const auto in = oiio::ImageInput::open(path, nullptr);
const std::string formatStr = in->format_name();
if(formatStr == "raw")
{
// For the RAW plugin: override colorspace as linear (as the content is linear with sRGB primaries but declared as sRGB)
inSpec.attribute("oiio:ColorSpace", "Linear");
ALICEVISION_LOG_TRACE("OIIO workaround: RAW input image " << path << " is in Linear.");
}
}
#else
const oiio::ImageSpec& inSpec = inBuf.spec();
#endif

// check picture channels number
if(inSpec.nchannels != 1 && inSpec.nchannels < 3)
throw std::runtime_error("Can't load channels of image file '" + path + "'.");

// color conversion
if(imageColorSpace == EImageColorSpace::AUTO)
throw std::runtime_error("You must specify a requested color space for image file '" + path + "'.");
throw std::runtime_error("You must specify a requested color space for image file '" + path + "'.");

const std::string& colorSpace = inSpec.get_string_attribute("oiio:ColorSpace", "sRGB"); // default image color space is sRGB
ALICEVISION_LOG_TRACE("Read image " << path << " (encoded in " << colorSpace << " colorspace).");

if(imageColorSpace == EImageColorSpace::SRGB) // color conversion to sRGB
{
const std::string& colorSpace = inSpec.get_string_attribute("oiio:ColorSpace", "sRGB"); // default image color space is sRGB
if(colorSpace != "sRGB")
oiio::ImageBufAlgo::colorconvert(inBuf, inBuf, colorSpace, "sRGB");
if(colorSpace != "sRGB")
{
oiio::ImageBufAlgo::colorconvert(inBuf, inBuf, colorSpace, "sRGB");
ALICEVISION_LOG_INFO("Convert image " << path << " from " << colorSpace << " to sRGB colorspace");
}
}
else if(imageColorSpace == EImageColorSpace::LINEAR) // color conversion to linear
{
const std::string& colorSpace = inSpec.get_string_attribute("oiio:ColorSpace", "sRGB");
if(colorSpace != "Linear")
oiio::ImageBufAlgo::colorconvert(inBuf, inBuf, colorSpace, "Linear");
if(colorSpace != "Linear")
{
oiio::ImageBufAlgo::colorconvert(inBuf, inBuf, colorSpace, "Linear");
ALICEVISION_LOG_INFO("Convert image " << path << " from " << colorSpace << " to Linear colorspace");
}
}

// convert to grayscale if needed
Expand Down