Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2026-04-30 00:00:01 -04:00
Code Issues Projects Releases Wiki Activity

#280 Support for bitsPerSample == 6, 10, 12, 14 & 24

Browse Source
This commit is contained in:
Harald Kuhr
2016-11-16 18:52:39 +01:00
parent ab13084f44
commit e0b9bdef7e
10 changed files with 573 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/BitPaddingStream.java
+221
View File
@@ -0,0 +1,221 @@
/*
* Copyright (c) 2016, Harald Kuhr
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name "TwelveMonkeys" nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package com.twelvemonkeys.imageio.plugins.tiff;
import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import static com.twelvemonkeys.lang.Validate.notNull;
/**
* BitPaddingStream.
*
* @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
* @author last modified by $Author: harald.kuhr$
* @version $Id: Foo.java,v 1.0 15/11/2016 harald.kuhr Exp$
*/
final class BitPaddingStream extends FilterInputStream {
// Bit masks 0 - 32 bits
private static final int[] MASK = {
0x0,
0x1, 0x3, 0x7, 0xf,
0x1f, 0x3f, 0x7f, 0xff,
0x1ff, 0x3ff, 0x7ff, 0xfff,
0x1fff, 0x3fff, 0x7fff, 0xffff,
0x1ffff, 0x3ffff, 0x7ffff, 0xfffff,
0x1fffff, 0x3fffff, 0x7fffff, 0xffffff,
0x1ffffff, 0x3ffffff, 0x7ffffff, 0xfffffff,
0x1fffffff, 0x3fffffff, 0x7fffffff, 0xffffffff
};
private final int bitsPerSample;
private final byte[] inputBuffer;
private final ByteBuffer buffer;
private int componentSize;
BitPaddingStream(final InputStream stream, int samplesPerPixel, final int bitsPerSample, final int colsInTile, final ByteOrder byteOrder) {
super(notNull(stream, "stream"));
this.bitsPerSample = bitsPerSample;
notNull(byteOrder, "byteOrder");
switch (bitsPerSample) {
case 2:
case 4:
case 6:
// Byte
componentSize = 1;
break;
case 10:
case 12:
case 14:
// Short
componentSize = 2;
break;
case 18:
case 20:
case 22:
case 24:
case 26:
case 28:
case 30:
// Int
componentSize = 4;
break;
default:
throw new IllegalArgumentException("Unsupported BitsPerSample value: " + bitsPerSample);
}
int rowByteLength = (samplesPerPixel * bitsPerSample * colsInTile + 7) / 8;
inputBuffer = new byte[rowByteLength];
int rowLength = samplesPerPixel * colsInTile * componentSize;
buffer = ByteBuffer.allocate(rowLength);
buffer.order(byteOrder);
buffer.position(buffer.limit()); // Make sure we start by filling the buffer
}
@Override
public int read() throws IOException {
if (!buffer.hasRemaining()) {
if (!fillBuffer()) {
return -1;
}
}
return buffer.get() & 0xff;
}
private boolean readFully(final byte[] bytes) throws IOException {
int rest = bytes.length;
while (rest > 0) {
int read = in.read(bytes, bytes.length - rest, rest);
if (read == -1) {
// NOTE: If we did a partial read here, we are in trouble...
// Most likely an EOFException will happen up-stream
return false;
}
rest -= read;
}
return true;
}
@Override
public int read(final byte[] b, final int off, final int len) throws IOException {
if (!buffer.hasRemaining()) {
if (!fillBuffer()) {
return -1;
}
}
int length = Math.min(len, buffer.remaining());
buffer.get(b, off, length);
return length;
}
@Override
public long skip(final long n) throws IOException {
if (n <= 0) {
return 0;
}
if (!buffer.hasRemaining()) {
if (!fillBuffer()) {
return 0;
}
}
int length = (int) Math.min(n, buffer.remaining());
buffer.position(buffer.position() + length);
return length;
}
private boolean fillBuffer() throws IOException {
if (!readFully(inputBuffer)) {
return false;
}
buffer.clear();
padBits(buffer, componentSize, bitsPerSample, inputBuffer);
buffer.rewind();
return true;
}
private void padBits(final ByteBuffer buffer, final int componentSize, final int bitsPerSample, final byte[] samples) {
int offset = 0;
int remainingBits = 0;
int temp = 0;
while (true) {
int value = temp & MASK[remainingBits];
// Read smallest number of bytes > bits
while (remainingBits < bitsPerSample) {
if (offset >= samples.length) {
// End of data
return;
}
temp = samples[offset++] & 0xff;
value = value << 8 | temp;
remainingBits += 8;
}
remainingBits -= bitsPerSample;
value = (value >> remainingBits) & MASK[bitsPerSample];
switch (componentSize) {
case 1:
buffer.put((byte) value);
break;
case 2:
buffer.putShort((short) value);
break;
case 4:
buffer.putInt(value);
break;
default:
// Guarded in constructor
throw new AssertionError();
}
}
}
}
imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java
+23 -8
View File
@@ -45,7 +45,6 @@ import com.twelvemonkeys.imageio.metadata.psd.PSDReader;
import com.twelvemonkeys.imageio.metadata.xmp.XMPReader;
import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
import com.twelvemonkeys.imageio.stream.SubImageInputStream;
import com.twelvemonkeys.imageio.util.IIOUtil;
import com.twelvemonkeys.imageio.util.ImageTypeSpecifiers;
import com.twelvemonkeys.imageio.util.ProgressListenerBase;
import com.twelvemonkeys.io.FastByteArrayOutputStream;
@@ -62,7 +61,6 @@ import javax.imageio.metadata.IIOMetadataNode;
import javax.imageio.plugins.jpeg.JPEGImageReadParam;
import javax.imageio.spi.IIORegistry;
import javax.imageio.spi.ImageReaderSpi;
import javax.imageio.spi.ServiceRegistry;
import javax.imageio.stream.ImageInputStream;
import java.awt.*;
import java.awt.color.CMMException;
@@ -70,8 +68,6 @@ import java.awt.color.ColorSpace;
import java.awt.color.ICC_Profile;
import java.awt.image.*;
import java.io.*;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.charset.StandardCharsets;
@@ -378,6 +374,10 @@ public final class TIFFImageReader extends ImageReaderBase {
else if (bitsPerSample == 8 || bitsPerSample == 16 || bitsPerSample == 32) {
return ImageTypeSpecifiers.createInterleaved(cs, new int[] {0}, dataType, false, false);
}
else if (bitsPerSample % 2 == 0) {
ColorModel colorModel = new ComponentColorModel(cs, new int[] {bitsPerSample}, false, false, Transparency.OPAQUE, dataType);
return new ImageTypeSpecifier(colorModel, colorModel.createCompatibleSampleModel(1, 1));
}
throw new IIOException(String.format("Unsupported BitsPerSample for Bi-level/Gray TIFF (expected 1, 2, 4, 8, 16 or 32): %d", bitsPerSample));
@@ -442,6 +442,14 @@ public final class TIFFImageReader extends ImageReaderBase {
return ImageTypeSpecifiers.createBanded(cs, new int[] {0, 1, 2}, new int[] {0, 0, 0}, dataType, false, false);
}
}
else if (bitsPerSample > 8 && bitsPerSample % 2 == 0) {
// TODO: Support variable bits/sample?
ColorModel colorModel = new ComponentColorModel(cs, new int[] {bitsPerSample, bitsPerSample, bitsPerSample}, false, false, Transparency.OPAQUE, dataType);
SampleModel sampleModel = planarConfiguration == TIFFBaseline.PLANARCONFIG_CHUNKY
? colorModel.createCompatibleSampleModel(1, 1)
: new BandedSampleModel(dataType, 1, 1, 3, new int[]{0, 1, 2}, new int[]{0, 0, 0});
return new ImageTypeSpecifier(colorModel, sampleModel);
}
case 4:
if (bitsPerSample == 8 || bitsPerSample == 16 || bitsPerSample == 32) {
switch (planarConfiguration) {
@@ -892,6 +900,10 @@ public final class TIFFImageReader extends ImageReaderBase {
// General uncompressed/compressed reading
int bands = planarConfiguration == TIFFExtension.PLANARCONFIG_PLANAR ? rawType.getNumBands() : 1;
int bitsPerSample = getBitsPerSample();
boolean needsBitPadding = bitsPerSample > 16 && bitsPerSample % 16 != 0 || bitsPerSample > 8 && bitsPerSample % 8 != 0 || bitsPerSample == 6;
boolean needsAdapter = compression != TIFFBaseline.COMPRESSION_NONE
|| interpretation == TIFFExtension.PHOTOMETRIC_YCBCR || needsBitPadding;
for (int y = 0; y < tilesDown; y++) {
int col = 0;
@@ -906,7 +918,7 @@ public final class TIFFImageReader extends ImageReaderBase {
imageInput.seek(stripTileOffsets[i]);
DataInput input;
if (compression == TIFFBaseline.COMPRESSION_NONE && interpretation != TIFFExtension.PHOTOMETRIC_YCBCR) {
if (!needsAdapter) {
// No need for transformation, fast forward
input = imageInput;
}
@@ -916,7 +928,7 @@ public final class TIFFImageReader extends ImageReaderBase {
: createStreamAdapter(imageInput);
adapter = createDecompressorStream(compression, stripTileWidth, numBands, adapter);
adapter = createUnpredictorStream(predictor, stripTileWidth, numBands, getBitsPerSample(), adapter, imageInput.getByteOrder());
adapter = createUnpredictorStream(predictor, stripTileWidth, numBands, bitsPerSample, adapter, imageInput.getByteOrder());
if (interpretation == TIFFExtension.PHOTOMETRIC_YCBCR && rowRaster.getTransferType() == DataBuffer.TYPE_BYTE) {
adapter = new YCbCrUpsamplerStream(adapter, yCbCrSubsampling, yCbCrPos, colsInTile);
@@ -929,6 +941,11 @@ public final class TIFFImageReader extends ImageReaderBase {
throw new AssertionError();
}
if (needsBitPadding) {
// We'll pad "odd" bitsPerSample streams to the smallest data type (byte/short/int) larger than the input
adapter = new BitPaddingStream(adapter, numBands, bitsPerSample, colsInTile, imageInput.getByteOrder());
}
// According to the spec, short/long/etc should follow order of containing stream
input = imageInput.getByteOrder() == ByteOrder.BIG_ENDIAN
? new DataInputStream(adapter)
@@ -1300,8 +1317,6 @@ public final class TIFFImageReader extends ImageReaderBase {
break;
// Additionally, the specification defines these values as part of the TIFF extensions:
// Known, but unsupported compression types
case TIFFCustom.COMPRESSION_NEXT:
case TIFFCustom.COMPRESSION_CCITTRLEW: