Zstd compressor (#3)

.gitignore

@@ -57,3 +57,7 @@ docs/_test_images/
 
 # Ignore Bazel generated files
 bazel-* 
+
+cmake-build-debug/
+
+.idea/

src/bin/exrheader/main.cpp

@@ -65,6 +65,8 @@ printCompression (Compression c)
 
         case DWAB_COMPRESSION: cout << "dwa, medium scanline blocks"; break;
 
+        case ZSTD_COMPRESSION: cout << "zstd"; break;
+
         default: cout << int (c); break;
     }
 }

src/examples/deepExamples.cpp

@@ -47,10 +47,10 @@ readDeepScanlineFile (
     //    - allocate memory for the pixels
     //    - describe the layout of the A, and Z pixel buffers
     //    - read the sample counts from the file
-    //    - allocate the memory requred to store the samples
+    //    - allocate the memory required to store the samples
     //    - read the pixels from the file
     //
-    
+
     DeepScanLineInputFile file (filename);
 
     const Header& header = file.header ();
@@ -69,15 +69,17 @@ readDeepScanlineFile (
 
     frameBuffer.insertSampleCountSlice (Slice (
         UINT,
-        (char*) (&sampleCount[0][0] - dataWindow.min.x - dataWindow.min.y * width),
+        (char*) (&sampleCount[0][0] - dataWindow.min.x -
+                 dataWindow.min.y * width),
         sizeof (unsigned int) * 1,       // xStride
         sizeof (unsigned int) * width)); // yStride
 
     frameBuffer.insert (
         "dataZ",
         DeepSlice (
             FLOAT,
-            (char*) (&dataZ[0][0] - dataWindow.min.x - dataWindow.min.y * width),
+            (char*) (&dataZ[0][0] - dataWindow.min.x -
+                     dataWindow.min.y * width),
 
             sizeof (float*) * 1,     // xStride for pointer array
             sizeof (float*) * width, // yStride for pointer array
@@ -87,7 +89,8 @@ readDeepScanlineFile (
         "dataA",
         DeepSlice (
             HALF,
-            (char*) (&dataA[0][0] - dataWindow.min.x - dataWindow.min.y * width),
+            (char*) (&dataA[0][0] - dataWindow.min.x -
+                     dataWindow.min.y * width),
             sizeof (half*) * 1,     // xStride for pointer array
             sizeof (half*) * width, // yStride for pointer array
             sizeof (half) * 1));    // stride for O data sample
@@ -118,20 +121,18 @@ readDeepScanlineFile (
     }
 }
 
-unsigned int getPixelSampleCount (int i, int j)
+unsigned int
+getPixelSampleCount (int i, int j)
 {
     // Dummy code creating deep data from a flat image
     return 1;
 }
 
 Array2D<float> testDataZ;
-Array2D<half> testDataA;
+Array2D<half>  testDataA;
 
-void getPixelSampleData(
-    int i,
-    int j,
-    Array2D<float*>& dataZ,
-    Array2D<half*>& dataA)
+void
+getPixelSampleData (int i, int j, Array2D<float*>& dataZ, Array2D<half*>& dataA)
 {
     // Dummy code creating deep data from a flat image
     dataZ[i][j][0] = testDataZ[i][j];
@@ -147,7 +148,8 @@ writeDeepScanlineFile (
 
     Array2D<half*>& dataA,
 
-    Array2D<unsigned int>& sampleCount)
+    Array2D<unsigned int>& sampleCount,
+    Compression            compression = Compression::ZIPS_COMPRESSION)
 
 {
     //
@@ -160,7 +162,7 @@ writeDeepScanlineFile (
     //    - describe the memory layout of the A and Z pixels
     //    - store the pixels in the file
     //
-    
+
     int height = dataWindow.max.y - dataWindow.min.y + 1;
     int width  = dataWindow.max.x - dataWindow.min.x + 1;
 
@@ -169,15 +171,16 @@ writeDeepScanlineFile (
     header.channels ().insert ("Z", Channel (FLOAT));
     header.channels ().insert ("A", Channel (HALF));
     header.setType (DEEPSCANLINE);
-    header.compression () = ZIPS_COMPRESSION;
+    header.compression () = compression;
 
     DeepScanLineOutputFile file (filename, header);
 
     DeepFrameBuffer frameBuffer;
 
     frameBuffer.insertSampleCountSlice (Slice (
         UINT,
-        (char*) (&sampleCount[0][0] - dataWindow.min.x - dataWindow.min.y * width),
+        (char*) (&sampleCount[0][0] - dataWindow.min.x -
+                 dataWindow.min.y * width),
         sizeof (unsigned int) * 1, // xS
 
         sizeof (unsigned int) * width)); // yStride
@@ -186,7 +189,8 @@ writeDeepScanlineFile (
         "Z",
         DeepSlice (
             FLOAT,
-            (char*) (&dataZ[0][0] - dataWindow.min.x - dataWindow.min.y * width),
+            (char*) (&dataZ[0][0] - dataWindow.min.x -
+                     dataWindow.min.y * width),
             sizeof (float*) * 1, // xStride for pointer
 
             sizeof (float*) * width, // yStride for pointer array
@@ -196,7 +200,8 @@ writeDeepScanlineFile (
         "A",
         DeepSlice (
             HALF,
-            (char*) (&dataA[0][0] - dataWindow.min.x - dataWindow.min.y * width),
+            (char*) (&dataA[0][0] - dataWindow.min.x -
+                     dataWindow.min.y * width),
             sizeof (half*) * 1,     // xStride for pointer array
             sizeof (half*) * width, // yStride for pointer array
             sizeof (half) * 1));    // stride for A data sample
@@ -211,7 +216,7 @@ writeDeepScanlineFile (
             dataZ[i][j]       = new float[sampleCount[i][j]];
             dataA[i][j]       = new half[sampleCount[i][j]];
             // Generate data for dataZ and dataA.
-            getPixelSampleData(i, j, dataZ, dataA);
+            getPixelSampleData (i, j, dataZ, dataA);
         }
 
         file.writePixels (1);
@@ -227,30 +232,56 @@ writeDeepScanlineFile (
     }
 }
 
-
-void deepExamples()
+void
+deepExamples ()
 {
     int w = 800;
     int h = 600;
-    
+
     Box2i window;
-    window.min.setValue(0, 0);
-    window.max.setValue(w - 1, h - 1);
-    
-    Array2D<float *> dataZ;
-    dataZ.resizeErase(h, w);
-    
-    Array2D<half *> dataA;
-    dataA.resizeErase(h, w);
-    
+    window.min.setValue (0, 0);
+    window.max.setValue (w - 1, h - 1);
+
+    Array2D<float*> dataZ;
+    dataZ.resizeErase (h, w);
+
+    Array2D<half*> dataA;
+    dataA.resizeErase (h, w);
+
     Array2D<unsigned int> sampleCount;
-    sampleCount.resizeErase(h, w);
-    
+    sampleCount.resizeErase (h, w);
+
     // Create an image to be used as a source for deep data
-    testDataA.resizeErase(h, w);
-    testDataZ.resizeErase(h, w);
-    drawImage2(testDataA, testDataZ, w, h);
-
-    writeDeepScanlineFile("test.deep.exr", window, window, dataZ, dataA, sampleCount);
-    readDeepScanlineFile ("test.deep.exr", window, window, dataZ, dataA, sampleCount);
+    testDataA.resizeErase (h, w);
+    testDataZ.resizeErase (h, w);
+    drawImage2 (testDataA, testDataZ, w, h);
+
+    {
+        writeDeepScanlineFile (
+            "test.deep.exr",
+            window,
+            window,
+            dataZ,
+            dataA,
+            sampleCount,
+            Compression::ZSTD_COMPRESSION);
+    }
+    {
+        writeDeepScanlineFile (
+            "test.zips.exr",
+            window,
+            window,
+            dataZ,
+            dataA,
+            sampleCount,
+            Compression::ZIPS_COMPRESSION);
+    }
+    {
+        readDeepScanlineFile (
+            "test.deep.exr", window, window, dataZ, dataA, sampleCount);
+    }
+    {
+        readDeepScanlineFile (
+            "test.zips.exr", window, window, dataZ, dataA, sampleCount);
+    }
 }