From 949652a2afb4bfae7f8cc495caf3c9782585f775 Mon Sep 17 00:00:00 2001
From: Vojtech Moravec <vojtech.moravec.st@vsb.cz>
Date: Tue, 4 Aug 2020 12:51:31 +0200
Subject: [PATCH] Modify loadConfiguredPlanesData to handle voxel loading.
Modify loadConfiguredPlanesData to handle voxel loading.
Add @Override parameter to compress() methods in compressors.
---
.../compression/SQImageCompressor.java | 1 +
.../compression/VQImageCompressor.java | 88 +++++++++++--------
.../fileformat/QuantizationType.java | 9 ++
3 files changed, 62 insertions(+), 36 deletions(-)
diff --git a/src/main/java/azgracompress/compression/SQImageCompressor.java b/src/main/java/azgracompress/compression/SQImageCompressor.java
index 9de5d29..ee07010 100644
--- a/src/main/java/azgracompress/compression/SQImageCompressor.java
+++ b/src/main/java/azgracompress/compression/SQImageCompressor.java
@@ -90,6 +90,7 @@ public class SQImageCompressor extends CompressorDecompressorBase implements IIm
* @param compressStream Stream to which compressed data will be written.
* @throws ImageCompressionException When compress process fails.
*/
+ @Override
public long[] compress(DataOutputStream compressStream) throws ImageCompressionException {
final InputData inputDataInfo = options.getInputDataInfo();
Stopwatch stopwatch = new Stopwatch();
diff --git a/src/main/java/azgracompress/compression/VQImageCompressor.java b/src/main/java/azgracompress/compression/VQImageCompressor.java
index dd29cb1..2678ab2 100644
--- a/src/main/java/azgracompress/compression/VQImageCompressor.java
+++ b/src/main/java/azgracompress/compression/VQImageCompressor.java
@@ -98,6 +98,7 @@ public class VQImageCompressor extends CompressorDecompressorBase implements IIm
* @param compressStream Stream to which compressed data will be written.
* @throws ImageCompressionException When compress process fails.
*/
+ @Override
public long[] compress(DataOutputStream compressStream) throws ImageCompressionException {
if (options.getQuantizationType() == QuantizationType.Vector3D) {
return compressVoxels(compressStream);
@@ -196,52 +197,66 @@ public class VQImageCompressor extends CompressorDecompressorBase implements IIm
}
private int[][] loadConfiguredPlanesData() throws ImageCompressionException {
- final int vectorSize = options.getQuantizationVector().getX() * options.getQuantizationVector().getY();
- final InputData inputDataInfo = options.getInputDataInfo();
+
final IPlaneLoader planeLoader;
try {
- planeLoader = PlaneLoaderFactory.getPlaneLoaderForInputFile(inputDataInfo);
+ planeLoader = PlaneLoaderFactory.getPlaneLoaderForInputFile(options.getInputDataInfo());
} catch (Exception e) {
- throw new ImageCompressionException("Unable to create SCIFIO reader. " + e.getMessage());
+ throw new ImageCompressionException("Unable to create reader. " + e.getMessage());
}
- int[][] trainData;
- Stopwatch s = new Stopwatch();
- s.start();
- if (inputDataInfo.isPlaneIndexSet()) {
- reportStatusToListeners("VQ: Loading single plane data.");
- try {
- trainData = loadPlaneQuantizationVectors(planeLoader, inputDataInfo.getPlaneIndex());
- } catch (IOException e) {
- throw new ImageCompressionException("Failed to load plane data.", e);
- }
- } else {
- reportStatusToListeners(inputDataInfo.isPlaneRangeSet() ? "VQ: Loading plane range data." : "VQ: Loading all planes data.");
- final int[] planeIndices = getPlaneIndicesForCompression();
-
- final int chunkCountPerPlane = Chunk2D.calculateRequiredChunkCount(inputDataInfo.getDimensions().toV2i(),
- options.getQuantizationVector().toV2i());
- final int totalChunkCount = chunkCountPerPlane * planeIndices.length;
-
- trainData = new int[totalChunkCount][vectorSize];
-
- int[][] planeVectors;
- int planeCounter = 0;
- for (final int planeIndex : planeIndices) {
+ if (options.getQuantizationType().isOneOf(QuantizationType.Vector1D, QuantizationType.Vector2D)) {
+ // TODO: Chunk2D operations should eventually be moved to loaders.
+ // Same as voxel loading, so that we wouldn't have to copy data twice.
+ final int vectorSize = options.getQuantizationVector().toV2i().multiplyTogether();
+
+ int[][] trainData;
+ Stopwatch s = Stopwatch.startNew();
+ if (options.getInputDataInfo().isPlaneIndexSet()) {
+ reportStatusToListeners("VQ: Loading single plane data.");
try {
- planeVectors = loadPlaneQuantizationVectors(planeLoader, planeIndex);
- assert (planeVectors.length == chunkCountPerPlane) : "Wrong chunk count per plane";
+ trainData = loadPlaneQuantizationVectors(planeLoader, options.getInputDataInfo().getPlaneIndex());
} catch (IOException e) {
- throw new ImageCompressionException(String.format("Failed to load plane %d image data.",
- planeIndex), e);
+ throw new ImageCompressionException("Failed to load plane data.", e);
+ }
+ } else {
+ reportStatusToListeners(options.getInputDataInfo().isPlaneRangeSet() ?
+ "VQ: Loading plane range data." : "VQ: Loading all planes data.");
+
+ final int[] planeIndices = getPlaneIndicesForCompression();
+ final int chunkCountPerPlane = Chunk2D.calculateRequiredChunkCount(options.getInputDataInfo().getDimensions().toV2i(),
+ options.getQuantizationVector().toV2i());
+ final int totalChunkCount = chunkCountPerPlane * planeIndices.length;
+ trainData = new int[totalChunkCount][vectorSize];
+
+ int[][] planeVectors;
+ int planeCounter = 0;
+ for (final int planeIndex : planeIndices) {
+ try {
+ planeVectors = loadPlaneQuantizationVectors(planeLoader, planeIndex);
+ assert (planeVectors.length == chunkCountPerPlane) : "Wrong chunk count per plane";
+ } catch (IOException e) {
+ throw new ImageCompressionException(String.format("Failed to load plane %d image data.", planeIndex), e);
+ }
+
+ System.arraycopy(planeVectors, 0, trainData, (planeCounter * chunkCountPerPlane), chunkCountPerPlane);
+ ++planeCounter;
}
+ }
+ s.stop();
+ reportStatusToListeners("Quantization vector load took: " + s.getElapsedTimeString());
+ return trainData;
+ } else {
+ if (options.getQuantizationType() != QuantizationType.Vector3D) {
+ throw new ImageCompressionException("Invalid QuantizationType, expected: `QuantizationType.Vector3D`, but got: " +
+ options.getQuantizationType().toString());
+ }
- System.arraycopy(planeVectors, 0, trainData, (planeCounter * chunkCountPerPlane), chunkCountPerPlane);
- ++planeCounter;
+ try {
+ return planeLoader.loadVoxels(options.getQuantizationVector());
+ } catch (IOException e) {
+ throw new ImageCompressionException("Unable to load voxels.", e);
}
}
- s.stop();
- reportStatusToListeners("Quantization vector load took: " + s.getElapsedTimeString());
- return trainData;
}
@Override
@@ -252,6 +267,7 @@ public class VQImageCompressor extends CompressorDecompressorBase implements IIm
getCodebookSize(),
options.getWorkerCount(),
options.getQuantizationVector());
+
reportStatusToListeners("Starting LBG optimization.");
vqInitializer.setStatusListener(this::reportStatusToListeners);
LBGResult lbgResult = vqInitializer.findOptimalCodebook();
diff --git a/src/main/java/azgracompress/fileformat/QuantizationType.java b/src/main/java/azgracompress/fileformat/QuantizationType.java
index ad0f071..649b926 100644
--- a/src/main/java/azgracompress/fileformat/QuantizationType.java
+++ b/src/main/java/azgracompress/fileformat/QuantizationType.java
@@ -29,4 +29,13 @@ public enum QuantizationType {
else
return Invalid;
}
+
+ public boolean isOneOf(final QuantizationType... types) {
+ for (final QuantizationType type : types) {
+ if (type == this) {
+ return true;
+ }
+ }
+ return false;
+ }
}
--
GitLab