DPX cont

Signed-off-by: Larry Gritz <[email protected]>

Author: lgritz

src/doc/builtinplugins.rst

@@ -322,6 +322,18 @@ control aspects of the writing itself:
      - ptr
      - Pointer to a ``Filesystem::IOProxy`` that will handle the I/O, for
        example by writing to memory rather than the file system.
+   * - ``dpx:ImageDescriptor``
+     - string
+     - Requests an encoding for the image data in the file.  Possible values of the ImageDescriptor are:
+	   ``"Red"``, ``"Green"``, ``"Blue"``, ``"Alpha"``, ``"Luma"``,
+	   ``"ColorDifference"``, ``"Depth"``, ``"CompositeVideo"``, ``"RGB"``,
+	   ``"RGBA"``, ``"ABGR"``, ``"CbYCrY"``, ``"CbYACrYA"``, ``"CbYCr"``,
+	   ``"CbYCrA"``. Note that OpenImageIO does not support automatic
+       conversion of regular RGB data to these exotic formats, therefore this
+       request will only be conveyed into the output file if the
+       ``oiio:RawColor`` configuration hint is also set to nonzero, indicating
+       that the caller has ensured that the data presented is already in the
+       correct representation.
 
 **Custom I/O Overrides**
 
@@ -383,7 +395,15 @@ the `set_ioproxy()` methods.
      - Colorimetric specification
    * - ``dpx:ImageDescriptor``
      - string
-     - ImageDescriptor
+     - Describes the encoding of the image data in the file.  Possible values of the ImageDescriptor are:
+	   ``"Red"``, ``"Green"``, ``"Blue"``, ``"Alpha"``, ``"Luma"``,
+	   ``"ColorDifference"``, ``"Depth"``, ``"CompositeVideo"``, ``"RGB"``,
+	   ``"RGBA"``, ``"ABGR"``, ``"CbYCrY"``, ``"CbYACrYA"``, ``"CbYCr"``,
+	   ``"CbYCrA"``, or custom descriptors. Only if the file was opened with
+       the configuration hint ``oiio:RawColor``, the values will be preserved
+       in this representation; otherwise, they will be converted to RGB color
+       space (in which case this attribute only describes the state of the
+       file, not the data in the buffer you read).
    * - ``dpx:Packing``
      - string
      - Image packing method

src/dpx.imageio/dpxoutput.cpp

@@ -431,6 +431,11 @@ DPXOutput::prep_subimage(int s, bool allocate)
 {
     ImageSpec& spec_s(m_subimage_specs[s]);  // reference the spec
 
+    // check if the client is giving us raw data to write
+    m_rawcolor = spec_s.get_int_attribute("dpx:RawColor")
+                 || spec_s.get_int_attribute("dpx:RawData")  // deprecated
+                 || spec_s.get_int_attribute("oiio:RawColor");
+
     // determine descriptor
     m_desc = get_image_descriptor();
 
@@ -517,13 +522,9 @@ DPXOutput::prep_subimage(int s, bool allocate)
         m_datasize = dpx::kWord;
     }
 
-    // check if the client is giving us raw data to write
-    m_rawcolor = spec_s.get_int_attribute("dpx:RawColor")
-                 || spec_s.get_int_attribute("dpx:RawData")  // deprecated
-                 || spec_s.get_int_attribute("oiio:RawColor");
-
     // see if we'll need to convert color space or not
-    if (m_desc == dpx::kRGB || m_desc == dpx::kRGBA || spec_s.nchannels == 1) {
+    if (spec_s.nchannels == 1 || m_desc == dpx::kRGB || m_desc == dpx::kRGBA
+        || m_desc == dpx::kABGR) {
         // shortcut for RGB/RGBA, and for 1-channel images that don't
         // need to decode color representations.
         m_bytes    = spec_s.scanline_bytes();
@@ -696,6 +697,7 @@ dpx::Descriptor
 DPXOutput::get_image_descriptor()
 {
     const ImageSpec& spec0(m_subimage_specs[0]);
+    string_view request = spec0.get_string_attribute("dpx:ImageDescriptor");
     switch (spec0.nchannels) {
     case 1: {
         std::string name = spec0.channelnames.size() ? spec0.channelnames[0]
@@ -713,8 +715,32 @@ DPXOutput::get_image_descriptor()
         else
             return dpx::kLuma;
     }
-    case 3: return dpx::kRGB;
-    case 4: return dpx::kRGBA;
+    case 3: {
+        if (m_rawcolor) {
+            // Only allow these if we're being given "raw color" data, assumed
+            // to already be in the requested representation. We don't support
+            // converting usual RGB/RGBA to these exotic dpx types.
+            if (request == "CbYCrY")
+                return dpx::kCbYCrY;
+            else if (request == "CbYCr")
+                return dpx::kCbYCr;
+        }
+        return dpx::kRGB;
+    }
+    case 4: {
+        if (m_rawcolor) {
+            // Only allow these if we're being given "raw color" data, assumed
+            // to already be in the requested representation. We don't support
+            // converting usual RGB/RGBA to these exotic dpx types.
+            if (request == "ABGR")
+                return dpx::kABGR;
+            else if (request == "CbYACrYA")
+                return dpx::kCbYACrYA;
+            else if (request == "CbYCrA")
+                return dpx::kCbYCrA;
+        }
+        return dpx::kRGBA;
+    }
     default:
         if (spec0.nchannels <= 8)
             return (dpx::Descriptor)((int)dpx::kUserDefined2Comp

testsuite/dpx/ref/out.txt

@@ -158,3 +158,41 @@ grey.dpx             :  512 x  512, 1 channel, uint10 dpx
     oiio:subimages: 1
 Comparing "grey.dpx" and "ref/grey.tif"
 PASS
+Reading gradient.dpx
+gradient.dpx         :   64 x   64, 4 channel, uint16 dpx
+    SHA-1: C379576BBA43B7937C6C9F6FBB3DA95206EA8AC1
+    channel list: R, G, B, A
+    Orientation: 1 (normal)
+    PixelAspectRatio: 1
+    dpx:Colorimetric: "User defined"
+    dpx:DittoKey: 1
+    dpx:EndOfImagePadding: 0
+    dpx:EndOfLinePadding: 0
+    dpx:ImageDescriptor: "RGBA"
+    dpx:Packing: "Filled, method A"
+    dpx:Signal: "Undefined"
+    dpx:Transfer: "Undefined"
+    dpx:Version: "V2.0"
+    oiio:BitsPerSample: 16
+    oiio:subimages: 1
+Comparing "gradient.dpx" and "src/gradient.tif"
+PASS
+Reading gradient-abgr.dpx
+gradient-abgr.dpx    :   64 x   64, 4 channel, uint16 dpx
+    SHA-1: C379576BBA43B7937C6C9F6FBB3DA95206EA8AC1
+    channel list: R, G, B, A
+    Orientation: 1 (normal)
+    PixelAspectRatio: 1
+    dpx:Colorimetric: "User defined"
+    dpx:DittoKey: 1
+    dpx:EndOfImagePadding: 0
+    dpx:EndOfLinePadding: 0
+    dpx:ImageDescriptor: "ABGR"
+    dpx:Packing: "Filled, method A"
+    dpx:Signal: "Undefined"
+    dpx:Transfer: "Undefined"
+    dpx:Version: "V2.0"
+    oiio:BitsPerSample: 16
+    oiio:subimages: 1
+Comparing "gradient-abgr.dpx" and "src/gradient.tif"
+PASS

testsuite/dpx/run.py

@@ -31,3 +31,13 @@
                     " -chsum:weight=0.333,0.333,0.333 -chnames Y -ch Y -o grey.dpx")
 command += info_command("grey.dpx", safematch=True)
 command += diff_command("grey.dpx", "ref/grey.tif")
+
+# Test some other combinations of encodings
+# Pre-made: oiiotool -d uint16 -pattern fill:topleft=1,0,0,1:topright=0,1,0,1:bottomleft=0,0,1,1:bottomright=1,1,1,1 64x64 4 -o src/gradient.tif
+command += oiiotool("src/gradient.tif -o gradient.dpx")
+command += info_command("gradient.dpx", safematch=True)
+command += diff_command("gradient.dpx", "src/gradient.tif")
+command += oiiotool("src/gradient.tif -ch A,B,G,R --chnames A,B,G,R -attrib oiio:RawColor 1 -attrib dpx:ImageDescriptor ABGR -o gradient-abgr.dpx")
+command += info_command("gradient-abgr.dpx", safematch=True)
+command += diff_command("gradient-abgr.dpx", "src/gradient.tif")
+