Merge pull request #2 from umjammer/0.0.2

0.0.2
umjammer · Sep 10, 2022 · ea62f54 · ea62f54
2 parents 3ab79ba + 4c3080d
commit ea62f54
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>vavi</groupId>
   <artifactId>vavi-image-avif</artifactId>
-  <version>0.0.2-SNAPSHOT</version>
+  <version>0.0.2</version>
 
   <name>Java AVIF Decoder</name>
   <scm>

diff --git a/src/main/java/vavi/imageio/avif/AvifImageReader.java b/src/main/java/vavi/imageio/avif/AvifImageReader.java
@@ -7,6 +7,7 @@
 package vavi.imageio.avif;
 
 import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
@@ -77,14 +78,17 @@ public BufferedImage read(int imageIndex, ImageReadParam param)
         InputStream stream = new WrappedImageInputStream((ImageInputStream) input);
 
         try {
-            ByteBuffer bb = ByteBuffer.allocateDirect(Integer.MAX_VALUE);
-            int l = 0;
-            while (l < bb.capacity()) {
-                int r = Channels.newChannel(stream).read(bb);
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            byte[] b = new byte[8192];
+            while (true) {
+                int r = stream.read(b, 0, b.length);
                 if (r < 0) break;
-                l += r;
+                baos.write(b, 0, r);
             }
+            int l = baos.size();
 Debug.println(Level.FINE, "size: " + l);
+            ByteBuffer bb = ByteBuffer.allocateDirect(l);
+            bb.put(baos.toByteArray(), 0, l);
 
             Avif avif = Avif.getInstance();
 

diff --git a/src/main/java/vavi/imageio/avif/AvifImageReaderSpi.java b/src/main/java/vavi/imageio/avif/AvifImageReaderSpi.java
@@ -7,6 +7,7 @@
 package vavi.imageio.avif;
 
 import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
@@ -87,15 +88,19 @@ public boolean canDecodeInput(Object obj) throws IOException {
 Debug.println(Level.FINE, "input: " + obj);
         if (obj instanceof ImageInputStream) {
             InputStream stream = new BufferedInputStream(new WrappedImageInputStream((ImageInputStream) obj));
-            stream.mark(stream.available()); // TODO available is integer.max
-            // we currently accept heif only
-            ByteBuffer bb = ByteBuffer.allocateDirect(stream.available()); // TODO available is integer.max
-            int l = 0;
-            while (l < bb.capacity()) {
-                int r = Channels.newChannel(stream).read(bb);
+Debug.println(Level.FINE, "stream.available(): " + stream.available());
+            stream.mark(stream.available());
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            byte[] b = new byte[8192];
+            while (true) {
+                int r = stream.read(b, 0, b.length);
                 if (r < 0) break;
-                l += r;
+                baos.write(b, 0, r);
             }
+            int l = baos.size();
+Debug.println(Level.FINE, "size: " + l);
+            ByteBuffer bb = ByteBuffer.allocateDirect(l);
+            bb.put(baos.toByteArray(), 0, l);
             stream.reset();
             Avif avif = Avif.getInstance();
             return avif.isAvifImage(bb, l);