Prepare Voxel decompression in memory.

src/main/java/azgracompress/compression/VQImageDecompressor.java

@@ -11,12 +11,12 @@ import azgracompress.quantization.vector.CodebookEntry;
 import azgracompress.quantization.vector.VQCodebook;
 import azgracompress.utilities.Stopwatch;
 import azgracompress.utilities.TypeConverter;
-import org.jetbrains.annotations.NotNull;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+@SuppressWarnings("DuplicatedCode")
 public class VQImageDecompressor extends CompressorDecompressorBase implements IImageDecompressor {
     public VQImageDecompressor(CompressionOptions options) {
         super(options);
@@ -171,6 +171,80 @@ public class VQImageDecompressor extends CompressorDecompressorBase implements I
         }
     }
 
+    @Override
+    public void decompressToBuffer(DataInputStream compressedStream,
+                                   short[][] buffer,
+                                   QCMPFileHeader header) throws ImageDecompressionException {
+        if (header.getQuantizationType() == QuantizationType.Vector3D) {
+            decompressVoxelsToBuffer(compressedStream, buffer, header);
+            return;
+        }
+        // NOTE(Moravec): Think how to remove the duplicate code.
+        final int codebookSize = (int) Math.pow(2, header.getBitsPerCodebookIndex());
+        assert (header.getVectorSizeZ() == 1);
+        final int vectorSize = header.getVectorSizeX() * header.getVectorSizeY() * header.getVectorSizeZ();
+        final int planeCountForDecompression = header.getImageSizeZ();
+        final long planeVectorCount = calculatePlaneVectorCount(header);
+        final V2i qVector = new V2i(header.getVectorSizeX(), header.getVectorSizeY());
+        final int[] huffmanSymbols = createHuffmanSymbols(codebookSize);
+
+
+        VQCodebook codebook = null;
+        Huffman huffman = null;
+        if (!header.isCodebookPerPlane()) {
+            // There is only one codebook.
+            codebook = readCodebook(compressedStream, codebookSize, vectorSize);
+            huffman = createHuffmanCoder(huffmanSymbols, codebook.getVectorFrequencies());
+        }
+
+        for (int planeIndex = 0; planeIndex < planeCountForDecompression; planeIndex++) {
+            if (header.isCodebookPerPlane()) {
+                codebook = readCodebook(compressedStream, codebookSize, vectorSize);
+                huffman = createHuffmanCoder(huffmanSymbols, codebook.getVectorFrequencies());
+            }
+            assert (codebook != null && huffman != null);
+
+
+            final int planeDataSize = (int) header.getPlaneDataSizes()[planeIndex];
+            try (InBitStream inBitStream = new InBitStream(compressedStream,
+                    header.getBitsPerCodebookIndex(),
+                    planeDataSize)) {
+                inBitStream.readToBuffer();
+                inBitStream.setAllowReadFromUnderlyingStream(false);
+
+                int[][] decompressedVectors = new int[(int) planeVectorCount][vectorSize];
+                for (int vecIndex = 0; vecIndex < planeVectorCount; vecIndex++) {
+                    HuffmanNode currentHuffmanNode = huffman.getRoot();
+                    boolean bit;
+                    while (!currentHuffmanNode.isLeaf()) {
+                        bit = inBitStream.readBit();
+                        currentHuffmanNode = currentHuffmanNode.traverse(bit);
+                    }
+                    System.arraycopy(codebook.getVectors()[currentHuffmanNode.getSymbol()].getVector(),
+                            0, decompressedVectors[vecIndex], 0, vectorSize);
+                }
+
+
+                final ImageU16 decompressedPlane = reconstructImageFromQuantizedVectors(decompressedVectors,
+                        qVector,
+                        header.getImageDims());
+
+                buffer[planeIndex] = TypeConverter.intArrayToShortArray(decompressedPlane.getData());
+            } catch (Exception ex) {
+                throw new ImageDecompressionException("VQImageDecompressor::decompressToBuffer() - Unable to read indices from InBitStream.", ex);
+            }
+            reportProgressToListeners(planeIndex, planeCountForDecompression,
+                    "Decompressed plane %d.", planeIndex);
+        }
+    }
+
+    private void decompressVoxelsToBuffer(DataInputStream compressedStream,
+                                          short[][] buffer,
+                                          QCMPFileHeader header) throws ImageDecompressionException {
+
+        throw new ImageDecompressionException("Implement this!!!");
+    }
+
     private void decompressVoxels(DataInputStream compressedStream,
                                   DataOutputStream decompressStream,
                                   QCMPFileHeader header) throws ImageDecompressionException {
@@ -240,70 +314,4 @@ public class VQImageDecompressor extends CompressorDecompressorBase implements I
         }
         return currentHuffmanNode.getSymbol();
     }
-
-    @Override
-    public void decompressToBuffer(DataInputStream compressedStream,
-                                   short[][] buffer,
-                                   QCMPFileHeader header) throws ImageDecompressionException {
-        // TODO: Think how to remove the duplicate code.
-        final int codebookSize = (int) Math.pow(2, header.getBitsPerCodebookIndex());
-        assert (header.getVectorSizeZ() == 1);
-        final int vectorSize = header.getVectorSizeX() * header.getVectorSizeY() * header.getVectorSizeZ();
-        final int planeCountForDecompression = header.getImageSizeZ();
-        final long planeVectorCount = calculatePlaneVectorCount(header);
-        final V2i qVector = new V2i(header.getVectorSizeX(), header.getVectorSizeY());
-        final int[] huffmanSymbols = createHuffmanSymbols(codebookSize);
-
-
-        VQCodebook codebook = null;
-        Huffman huffman = null;
-        if (!header.isCodebookPerPlane()) {
-            // There is only one codebook.
-            codebook = readCodebook(compressedStream, codebookSize, vectorSize);
-            huffman = createHuffmanCoder(huffmanSymbols, codebook.getVectorFrequencies());
-        }
-
-        for (int planeIndex = 0; planeIndex < planeCountForDecompression; planeIndex++) {
-            if (header.isCodebookPerPlane()) {
-                codebook = readCodebook(compressedStream, codebookSize, vectorSize);
-                huffman = createHuffmanCoder(huffmanSymbols, codebook.getVectorFrequencies());
-            }
-            assert (codebook != null && huffman != null);
-
-
-            final int planeDataSize = (int) header.getPlaneDataSizes()[planeIndex];
-            try (InBitStream inBitStream = new InBitStream(compressedStream,
-                                                           header.getBitsPerCodebookIndex(),
-                                                           planeDataSize)) {
-                inBitStream.readToBuffer();
-                inBitStream.setAllowReadFromUnderlyingStream(false);
-
-                int[][] decompressedVectors = new int[(int) planeVectorCount][vectorSize];
-                for (int vecIndex = 0; vecIndex < planeVectorCount; vecIndex++) {
-                    HuffmanNode currentHuffmanNode = huffman.getRoot();
-                    boolean bit;
-                    while (!currentHuffmanNode.isLeaf()) {
-                        bit = inBitStream.readBit();
-                        currentHuffmanNode = currentHuffmanNode.traverse(bit);
-                    }
-                    System.arraycopy(codebook.getVectors()[currentHuffmanNode.getSymbol()].getVector(),
-                                     0,
-                                     decompressedVectors[vecIndex],
-                                     0,
-                                     vectorSize);
-                }
-
-
-                final ImageU16 decompressedPlane = reconstructImageFromQuantizedVectors(decompressedVectors,
-                                                                                        qVector,
-                                                                                        header.getImageDims());
-
-                buffer[planeIndex] = TypeConverter.intArrayToShortArray(decompressedPlane.getData());
-            } catch (Exception ex) {
-                throw new ImageDecompressionException("VQImageDecompressor::decompressToBuffer() - Unable to read indices from InBitStream.", ex);
-            }
-            reportProgressToListeners(planeIndex, planeCountForDecompression,
-                                      "Decompressed plane %d.", planeIndex);
-        }
-    }
 }