webp win

gotson · Aug 21, 2024 · 3df898e · 3df898e
1 parent 1d1f378
commit 3df898e
Show file tree

Hide file tree

Showing 90 changed files with 23 additions and 14,137 deletions.
diff --git a/imageio-webp/src/main/java21/com/github/gotson/nightmonkeys/webp/WebP.java b/imageio-webp/src/main/java21/com/github/gotson/nightmonkeys/webp/WebP.java
@@ -3,15 +3,16 @@
 import com.github.gotson.nightmonkeys.webp.lib.enums.VP8StatusCode;
 import com.github.gotson.nightmonkeys.webp.lib.enums.WebPFeatureFlags;
 import com.github.gotson.nightmonkeys.webp.lib.enums.WebPFormatFeature;
-import com.github.gotson.nightmonkeys.webp.lib.panama.WebPAnimDecoderOptions;
-import com.github.gotson.nightmonkeys.webp.lib.panama.WebPAnimInfo;
-import com.github.gotson.nightmonkeys.webp.lib.panama.WebPChunkIterator;
-import com.github.gotson.nightmonkeys.webp.lib.panama.WebPData;
-import com.github.gotson.nightmonkeys.webp.lib.panama.WebPDecBuffer;
-import com.github.gotson.nightmonkeys.webp.lib.panama.WebPDecoderConfig;
-import com.github.gotson.nightmonkeys.webp.lib.panama.WebPDecoderOptions;
-import com.github.gotson.nightmonkeys.webp.lib.panama.WebPRGBABuffer;
-import com.github.gotson.nightmonkeys.webp.lib.panama.demux_h;
+import com.github.gotson.nightmonkeys.webp.lib.panama.webpdemux.WebPAnimDecoderOptions;
+import com.github.gotson.nightmonkeys.webp.lib.panama.webpdemux.WebPAnimInfo;
+import com.github.gotson.nightmonkeys.webp.lib.panama.webpdemux.WebPChunkIterator;
+import com.github.gotson.nightmonkeys.webp.lib.panama.webpdemux.WebPData;
+import com.github.gotson.nightmonkeys.webp.lib.panama.webpdemux.WebPDecBuffer;
+import com.github.gotson.nightmonkeys.webp.lib.panama.webp.WebPDecoderConfig;
+import com.github.gotson.nightmonkeys.webp.lib.panama.webp.WebPDecoderOptions;
+import com.github.gotson.nightmonkeys.webp.lib.panama.webp.WebPRGBABuffer;
+import com.github.gotson.nightmonkeys.webp.lib.panama.webpdemux.demux_h;
+import com.github.gotson.nightmonkeys.webp.lib.panama.webp.decode_h;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,8 +25,8 @@
 import java.lang.foreign.MemorySegment;
 
 import static com.github.gotson.nightmonkeys.common.imageio.IIOUtil.byteArrayFromStream;
-import static com.github.gotson.nightmonkeys.webp.lib.panama.demux_h.C_INT;
-import static com.github.gotson.nightmonkeys.webp.lib.panama.demux_h.C_POINTER;
+import static com.github.gotson.nightmonkeys.webp.lib.panama.webpdemux.demux_h.C_INT;
+import static com.github.gotson.nightmonkeys.webp.lib.panama.webpdemux.demux_h.C_POINTER;
 
 /**
  * Java bindings for libwebp via Foreign Linker API *
@@ -46,14 +47,14 @@ public static boolean canDecode(final ImageInputStream stream) throws WebpExcept
             var data = arena.allocate(webpData.length);
             data.copyFrom(MemorySegment.ofArray(webpData));
 
-            return demux_h.WebPGetInfo(data, webpData.length, MemorySegment.NULL, MemorySegment.NULL) > 0;
+            return decode_h.WebPGetInfo(data, webpData.length, MemorySegment.NULL, MemorySegment.NULL) > 0;
         } catch (IOException e) {
             throw new WebpException("Couldn't get stream content", e);
         }
     }
 
     public static String getDecoderVersion() {
-        return parseVersionInt(demux_h.WebPGetDecoderVersion());
+        return parseVersionInt(decode_h.WebPGetDecoderVersion());
     }
 
     public static String getDemuxVersion() {
@@ -130,7 +131,7 @@ public static void decode(final ImageInputStream stream, BasicInfo info, final W
     public static void decodeVP8(final ImageInputStream stream, BasicInfo info, final WritableRaster raster, ImageReadParam param) throws WebpException {
         try (var arena = Arena.ofConfined()) {
             var config = WebPDecoderConfig.allocate(arena);
-            if (demux_h.WebPInitDecoderConfigInternal(config, minDecoderAbi) == 0) {
+            if (decode_h.WebPInitDecoderConfigInternal(config, minDecoderAbi) == 0) {
                 throw new WebpException("Could not init decoder config");
             }
 
@@ -142,7 +143,7 @@ public static void decodeVP8(final ImageInputStream stream, BasicInfo info, fina
             data.copyFrom(MemorySegment.ofArray(webpData));
 
             var features = WebPDecoderConfig.input$slice(config);
-            var statusCode = VP8StatusCode.fromId(demux_h.WebPGetFeaturesInternal(data, webpData.length, features, minDecoderAbi));
+            var statusCode = VP8StatusCode.fromId(decode_h.WebPGetFeaturesInternal(data, webpData.length, features, minDecoderAbi));
             if (statusCode != VP8StatusCode.VP8_STATUS_OK) {
                 throw new WebpException("Couldn't get WebpFeatures: " + statusCode);
             }
@@ -164,15 +165,15 @@ public static void decodeVP8(final ImageInputStream stream, BasicInfo info, fina
             }
 
             var output = WebPDecoderConfig.output$slice(config);
-            WebPDecBuffer.colorspace$set(output, demux_h.MODE_ARGB());
+            WebPDecBuffer.colorspace$set(output, decode_h.MODE_ARGB());
             WebPDecBuffer.width$set(output, raster.getWidth());
             WebPDecBuffer.height$set(output, raster.getHeight());
 
             var rgba = WebPDecBuffer.u$slice(output);
             WebPRGBABuffer.stride$set(rgba, raster.getWidth() * 4);
             WebPRGBABuffer.size$set(rgba, (long) raster.getWidth() * raster.getHeight() * 4);
 
-            statusCode = VP8StatusCode.fromId(demux_h.WebPDecode(data, webpData.length, config));
+            statusCode = VP8StatusCode.fromId(decode_h.WebPDecode(data, webpData.length, config));
             if (statusCode != VP8StatusCode.VP8_STATUS_OK) {
                 throw new WebpException("Couldn't decode: " + statusCode);
             }
@@ -182,7 +183,7 @@ public static void decodeVP8(final ImageInputStream stream, BasicInfo info, fina
 
             raster.setDataElements(0, 0, raster.getWidth(), raster.getHeight(), pixelsArray);
 
-            demux_h.WebPFreeDecBuffer(output);
+            decode_h.WebPFreeDecBuffer(output);
         } catch (IOException e) {
             throw new WebpException("Couldn't get stream content", e);
         }

diff --git a/...eio-webp/src/main/java21/com/github/gotson/nightmonkeys/webp/lib/enums/VP8StatusCode.java b/...eio-webp/src/main/java21/com/github/gotson/nightmonkeys/webp/lib/enums/VP8StatusCode.java
@@ -1,7 +1,7 @@
 package com.github.gotson.nightmonkeys.webp.lib.enums;
 
 
-import com.github.gotson.nightmonkeys.webp.lib.panama.demux_h;
+import com.github.gotson.nightmonkeys.webp.lib.panama.webpdemux.demux_h;
 
 public enum VP8StatusCode {
     VP8_STATUS_OK(demux_h.VP8_STATUS_OK()),

diff --git a/...io-webp/src/main/java21/com/github/gotson/nightmonkeys/webp/lib/enums/WebPDemuxState.java b/...io-webp/src/main/java21/com/github/gotson/nightmonkeys/webp/lib/enums/WebPDemuxState.java
@@ -1,7 +1,7 @@
 package com.github.gotson.nightmonkeys.webp.lib.enums;
 
 
-import com.github.gotson.nightmonkeys.webp.lib.panama.demux_h;
+import com.github.gotson.nightmonkeys.webp.lib.panama.webpdemux.demux_h;
 
 public enum WebPDemuxState {
     WEBP_DEMUX_PARSE_ERROR(demux_h.WEBP_DEMUX_PARSE_ERROR()),

diff --git a/...-webp/src/main/java21/com/github/gotson/nightmonkeys/webp/lib/enums/WebPFeatureFlags.java b/...-webp/src/main/java21/com/github/gotson/nightmonkeys/webp/lib/enums/WebPFeatureFlags.java
@@ -1,7 +1,7 @@
 package com.github.gotson.nightmonkeys.webp.lib.enums;
 
 
-import com.github.gotson.nightmonkeys.webp.lib.panama.demux_h;
+import com.github.gotson.nightmonkeys.webp.lib.panama.webpdemux.demux_h;
 
 import java.util.Arrays;
 import java.util.EnumSet;

diff --git a/...webp/src/main/java21/com/github/gotson/nightmonkeys/webp/lib/enums/WebPFormatFeature.java b/...webp/src/main/java21/com/github/gotson/nightmonkeys/webp/lib/enums/WebPFormatFeature.java
@@ -1,7 +1,7 @@
 package com.github.gotson.nightmonkeys.webp.lib.enums;
 
 
-import com.github.gotson.nightmonkeys.webp.lib.panama.demux_h;
+import com.github.gotson.nightmonkeys.webp.lib.panama.webpdemux.demux_h;
 
 public enum WebPFormatFeature {
     /**

diff --git a/...io-webp/src/main/java21/com/github/gotson/nightmonkeys/webp/lib/panama/RuntimeHelper.java b/...io-webp/src/main/java21/com/github/gotson/nightmonkeys/webp/lib/panama/RuntimeHelper.java