Merge branch 'main' into AlexeySmolenchuk-patch-1

Author: AlexeySmolenchuk

TODO

@@ -1,8 +1,9 @@
 Color Correction
-    [ ] auto find range
+    [x] auto find range
 
 [ ] Inspect Values from Texture Data
-
+    [x] From cache
+    [ ] Schedule image stats upfront asynchronously
 OCIO
     [ ] OCIO config selector
     [ ] OCIO transform selector
@@ -12,7 +13,6 @@ OCIO
 [ ] Selective Float/Half/int16/int8 precision
 [ ] Alpha checking
 
-[ ] Display info about storage and compression
 [ ] Display metadata
 
 [ ] Add Help
@@ -21,13 +21,16 @@ OCIO
 
 
     List of shortcuts:
+    F1        Help
     ` 1 2 3 4 (top row) RGB/R/G/B/A
     0 - =     (top row) Exposure Reset/EV-/EV+
+    R         Adjust Gain and Offset to fit Range
     [         Next AOV
     ]         Previous AOV
     PgUp PgDn Next/Previous MIP
     F         Fit/100%
     I         Inspect Tool
+    F5        Reload image
     F11       Fullscreen
     H         Hide UI
     + -       (numpad) ZoomIn/ZoomOut

src/imagePlane.cpp

@@ -1,13 +1,21 @@
 
 #include "imagePlane.h"
+#include <OpenImageIO/imagebuf.h>
+#include <OpenImageIO/imagebufalgo.h>
+#include <float.h>
 
 void ImagePlaneData::load()
 {
-	using namespace OIIO;
+	if (ready != ISSUED)
+		return;
 
-	// std::cout << name << groupName << channels << std::endl;
 	ready = LOADING_STARTED;
-	
+
+	using namespace OIIO;
+
+	float missing[4] = { 0.0, 0.0, 0.0, 0.0 };
+	OIIO::attribute ("missingcolor", TypeDesc("float[4]"), &missing);
+
 	auto inp = ImageInput::open (imageFileName);
 	if (! inp)
 	{
@@ -20,30 +28,93 @@ void ImagePlaneData::load()
 							* imageHeight
 							* len];
 
-	if (! inp->read_image( subimage,
-							mip,
-							begin,
-							begin + len,
-							TypeDesc::PRECISION,
-							&pixels[0]))
+	buffer = ImageBuf(imageFileName, subimage, mip, cache);
+
+	// Preload first imagePlane
+	if (begin==0)
 	{
-		std::cerr << "Could not read pixels from " << imageFileName
-				<< ", error = " << inp->geterror() << "\n";
-		return;
+		bool ok = buffer.read(subimage, mip, begin, begin + len, true, TypeDesc::PRECISION);
+		if (!ok)
+			std::cout << buffer.geterror() << std::endl;
+	}
+
+
+	ROI roi = buffer.spec().roi();
+	roi.chbegin = begin;
+	roi.chend = begin + len;
+
+	bool ok = buffer.get_pixels(roi, TypeDesc::PRECISION, &pixels[0]);
+	if (!ok)
+		std::cout << buffer.geterror() << std::endl;
+
+	// cache->get_pixels(ustring(imageFileName), subimage, mip, 0, imageWidth, 0, imageHeight, 0, 1, begin, begin + len, TypeDesc::PRECISION, &pixels[0]);
+
+	// if (! inp->read_image( subimage,
+	// 						mip,
+	// 						begin,
+	// 						begin + len,
+	// 						TypeDesc::PRECISION,
+	// 						&pixels[0]))
+	// {
+	// 	std::cerr << "Could not read pixels from " << imageFileName
+	// 			<< ", error = " << inp->geterror() << "\n";
+	// 	return;
+	// }
+	// if (! inp->close ())
+	// {
+	// 	std::cerr << "Error closing " << imageFileName
+	// 			<< ", error = " << inp->geterror() << "\n";
+	// 	return;
+	// }
+
+	ready = LOADED;
+}
+
+
+template<typename BUFT>
+static void getRange_impl(ImagePlaneData *plane, float *minimum, float *maximum)
+{
+	for (OIIO::ImageBuf::ConstIterator<BUFT> it(plane->buffer); !it.done(); ++it)
+	{
+		int i = 0;
+		for (int c = plane->begin; c < plane->begin+plane->len;  ++c)
+		{
+			minimum[i] = std::min(minimum[i], float(it[c]));
+			maximum[i] = std::max(maximum[i], float(it[c]));
+			i++;
+		}
 	}
-	if (! inp->close ())
+}
+
+
+void ImagePlaneData::getRange(float *minimum, float *maximum)
+{
+	for (int i = 0; i < len; i++)
 	{
-		std::cerr << "Error closing " << imageFileName
-				<< ", error = " << inp->geterror() << "\n";
-		return;
+		minimum[i] = FLT_MAX;
+		maximum[i] = FLT_MIN;
 	}
 
-	ready = LOADED;
+	float missing[4] = { 0.0, 0.0, 0.0, 0.0 };
+	OIIO::attribute ("missingcolor", OIIO::TypeDesc("float[4]"), &missing);
+
+    if (buffer.spec().format == OIIO::TypeDesc::FLOAT)
+        getRange_impl<float> (this, minimum, maximum);
+    else if (buffer.spec().format == OIIO::TypeDesc::HALF)
+        getRange_impl<half> (this, minimum, maximum);
+    else if (buffer.spec().format == OIIO::TypeDesc::UINT8)
+        getRange_impl<unsigned char> (this, minimum, maximum);
+    else if (buffer.spec().format == OIIO::TypeDesc::UINT16)
+        getRange_impl<unsigned short> (this, minimum, maximum);
+
 }
 
 
 void ImagePlaneData::generateGlTexture()
 {
+	if (ready != LOADED)
+		return;
+
 	glPixelStorei(GL_PACK_ALIGNMENT, 2);
 	glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
 
@@ -67,5 +138,7 @@ void ImagePlaneData::generateGlTexture()
 					&pixels[0]);
 
 	// std::cout << glGetError() << std::endl;
-
+	delete[] pixels;
+	
+	ready = TEXTURE_GENERATED;
 }

src/imagePlane.h

@@ -3,6 +3,8 @@
 #include <vector>
 #include <GL/glew.h>
 #include <OpenImageIO/imageio.h>
+#include <OpenImageIO/imagebuf.h>
+#include <OpenImageIO/imagecache.h>
 
 // #define PRECISION_FLOAT
 
@@ -19,65 +21,76 @@
 	static int internalFormats[] = {0, GL_R16F, GL_RG16F, GL_RGB16F, GL_RGBA16F};
 #endif
 
+
+// Represent image data and properties of certain level of MIP
 struct ImagePlaneData
 {
-    void load();
-    void generateGlTexture();
-
-    std::string imageFileName;
-    unsigned int subimage;	// index for async loading
-    unsigned int mip;		// index for async loading
-
-    std::string name;		// name of sub-image from metadata
-    std::string groupName;	// group name if exists
-    std::string channels;	// channels names after dot concatenated for corresponding group
-    std::string format;		// string representation of data type
-
-    // Data Window
-    unsigned int imageWidth;
-    unsigned int imageHeight;
-    int imageOffsetX;
-    int imageOffsetY;
-
-    // Display Window
-    unsigned int windowWidth;
-    unsigned int windowHeight;
-    int windowOffsetX;
-    int windowOffsetY;
-
-    bool windowMatchData; // is Data Window match Display Window
-    float pixelAspect;
-
-    int begin; // index in oiio spec
-    int len;
-    precision *pixels;	// fill deferred
-    GLuint glTexture;	// fill deferred
-
-    enum state
-    {
-        NOT_ISSUED,
-        ISSUED,
-        LOADING_STARTED,
-        LOADED,
-        TEXTURE_GENERATED,
-    };
-
-    state ready = NOT_ISSUED;
-
-    ~ImagePlaneData() { delete[] pixels;}
+	void load();
+	void generateGlTexture();
+	void getRange(float*, float*);
+
+	std::string imageFileName;
+	unsigned int subimage;	// index for async loading
+	unsigned int mip;		// index for async loading
+
+	std::string name;		// name of sub-image from metadata
+	std::string groupName;	// group name if exists
+	std::string channels;	// channels names after dot concatenated for corresponding group
+	std::string format;		// string representation of data type
+
+	std::string compression;
+	int quality;
+	int tile_width;
+	int tile_height;
+
+	// Data Window
+	unsigned int imageWidth;
+	unsigned int imageHeight;
+	int imageOffsetX;
+	int imageOffsetY;
+
+	// Display Window
+	unsigned int windowWidth;
+	unsigned int windowHeight;
+	int windowOffsetX;
+	int windowOffsetY;
+
+	bool windowMatchData; // is Data Window match Display Window
+	float pixelAspect;
+
+	int begin; // index in oiio spec
+	int len;
+	precision *pixels;	// fill deferred
+	GLuint glTexture;	// fill deferred
+
+	enum state
+	{
+		NOT_ISSUED,
+		ISSUED,
+		LOADING_STARTED,
+		LOADED,
+		TEXTURE_GENERATED,
+	};
+
+	state ready = NOT_ISSUED;
+
+	OIIO::ImageBuf buffer;
+	std::shared_ptr<OIIO::ImageCache> cache;
 };
 
+
+// Represent individual channel 'group' within multichannel or multipart image 
 struct ImagePlane
 {
-    std::string name;		// name of sub-image from metadata
-    std::string groupName;	// group name if exists
-    std::string channels;	// channels names after dot concatenated for corresponding group
-    int nMIPs;
+	std::string name;		// name of sub-image from metadata
+	std::string groupName;	// group name if exists
+	std::string channels;	// channels names after dot concatenated for corresponding group
+	int nMIPs;
 
-    float gainValues = 1.0;
-    float offsetValues = 0.0;
-    bool doOCIO = false;    // guess from data type and channel naming
-    bool checkNaN = true;
+	float gainValues = 1.0;
+	float offsetValues = 0.0;
+	bool doOCIO = false;    // guess from data type and channel naming
+	bool checkNaN = true;
 
-    std::vector<ImagePlaneData> MIPs;
+	std::vector<ImagePlaneData> MIPs; // Only one entry for non mip-mapped images
 };