Rename texture providers to bitmap providers

Author: ustc-zzzz

src/main/java/org/teacon/slides/renderer/TextureSequence.java

@@ -9,7 +9,7 @@
 import org.teacon.slides.SlideShow;
 import org.teacon.slides.block.ProjectorBlockEntity;
 import org.teacon.slides.calc.Concrete;
-import org.teacon.slides.texture.TextureProvider;
+import org.teacon.slides.renderer.bitmap.BitmapProvider;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -75,7 +75,7 @@ public void addLoadingIcon() {
         this.elements.add(IconCentered.DEFAULT_EMPTY);
     }
 
-    public void addTexture(TextureProvider provider, Concrete.Size size) {
+    public void addTexture(BitmapProvider provider, Concrete.Size size) {
         this.recommends.add(provider.getRecommendedName());
         var textureSize = Util.make(new Vector2i(), provider::getSize);
         var concrete = Concrete.from(size, this.sizeMicros, textureSize);
@@ -135,7 +135,7 @@ void render(MultiBufferSource src, PoseStack.Pose pose,
                     int light, int overlay, long tick, float partialTick);
     }
 
-    private record Texture(TextureProvider provider, Concrete concrete, int x, int y, int w, int h) implements Elem {
+    private record Texture(BitmapProvider provider, Concrete concrete, int x, int y, int w, int h) implements Elem {
         @Override
         public void render(MultiBufferSource src, PoseStack.Pose pose,
                            Vector2i viewportMicros, Vector2i scaleHint,

src/main/java/org/teacon/slides/renderer/TextureState.java

@@ -34,7 +34,11 @@
 import org.teacon.slides.cache.ImageCache;
 import org.teacon.slides.item.SlideItem;
 import org.teacon.slides.network.SlideURLRequestPacket;
-import org.teacon.slides.texture.*;
+import org.teacon.slides.renderer.bitmap.BitmapProvider;
+import org.teacon.slides.renderer.bitmap.GIFBitmapProvider;
+import org.teacon.slides.renderer.bitmap.StaticBitmapProvider;
+import org.teacon.slides.renderer.bitmap.WebPBitmapProvider;
+import org.teacon.slides.renderer.decoder.GIFDecoder;
 import org.teacon.slides.url.ProjectorURL;
 
 import javax.annotation.Nullable;
@@ -233,7 +237,7 @@ public static void appendTextureSequence(SlideItem.Entry entry, TextureSequence
     private int mRecycleCounter;
     private int mRequestCounter;
     private boolean mTimeoutCheckAtUpdate;
-    private @Nullable TextureProvider mProvider;
+    private @Nullable BitmapProvider mProvider;
 
     private TextureState(ProjectorURL location) {
         mState = State.INITIAL;
@@ -246,7 +250,7 @@ private TextureState(ProjectorURL location) {
     private void refresh(ProjectorURL location) {
         var requestCounter = mRequestCounter;
         ImageCache.getInstance().getResource(location.toUrl(), true).thenCompose(entry -> {
-            var future = new CompletableFuture<TextureProvider>();
+            var future = new CompletableFuture<BitmapProvider>();
             var providerFactory = dispatchProviderFactory(entry);
             RenderSystem.recordRenderCall(() -> {
                 try {
@@ -270,7 +274,7 @@ private void refresh(ProjectorURL location) {
             }
         }));
         ImageCache.getInstance().getResource(location.toUrl(), false).thenCompose(entry -> {
-            var future = new CompletableFuture<TextureProvider>();
+            var future = new CompletableFuture<BitmapProvider>();
             var providerFactory = dispatchProviderFactory(entry);
             RenderSystem.recordRenderCall(() -> {
                 try {
@@ -290,7 +294,7 @@ private void refresh(ProjectorURL location) {
         }));
     }
 
-    private void transferState(State state, @Nullable TextureProvider provider) {
+    private void transferState(State state, @Nullable BitmapProvider provider) {
         var old = mProvider;
         mProvider = provider;
         if (old != null && old != provider) {
@@ -328,7 +332,7 @@ public String toString() {
                 "counter=" + mRecycleCounter + ", requests=" + mRequestCounter + "}";
     }
 
-    private static Callable<TextureProvider> throwIOE(String message) {
+    private static Callable<BitmapProvider> throwIOE(String message) {
         return () -> {
             throw new IOException(message);
         };
@@ -340,17 +344,17 @@ private static Callable<TextureProvider> throwIOE(String message) {
      * @param nameDataEntry image file name & compressed image data
      * @return texture
      */
-    private static Callable<TextureProvider> dispatchProviderFactory(Map.Entry<String, byte[]> nameDataEntry) {
+    private static Callable<BitmapProvider> dispatchProviderFactory(Map.Entry<String, byte[]> nameDataEntry) {
         var name = nameDataEntry.getKey();
         var data = nameDataEntry.getValue();
         // gif
         var isGif = name.endsWith(".gif") || GIFDecoder.checkMagic(data);
         if (isGif) {
             // TODO: decode GIFs asynchronously
-            return () -> new GIFTextureProvider(name, data);
+            return () -> new GIFBitmapProvider(name, data);
         }
         // webp detector
-        var featureWebP = name.endsWith(".webp") || WebPDecoder.checkMagic(data) ? new WebPBitstreamFeatures() : null;
+        var featureWebP = name.endsWith(".webp") || WebPBitmapProvider.checkMagic(data) ? new WebPBitstreamFeatures() : null;
         if (featureWebP != null) {
             var success = VP8StatusCode.getStatusCode(NativeWebP.getFeatures(data, data.length, featureWebP));
             if (success != VP8StatusCode.VP8_STATUS_OK) {
@@ -365,7 +369,7 @@ private static Callable<TextureProvider> dispatchProviderFactory(Map.Entry<Strin
                 return throwIOE("Failed to decode animated webp image.");
             }
             if (webPData.getFrameCount() > 1) {
-                return () -> new WebPTextureProvider(name, data.length, webPData, featureWebP.isHasAlpha());
+                return () -> new WebPBitmapProvider(name, data.length, webPData, featureWebP.isHasAlpha());
             }
         }
         var img = new NativeImage[1];
@@ -404,7 +408,7 @@ private static Callable<TextureProvider> dispatchProviderFactory(Map.Entry<Strin
             }
         }
         // construct static provider
-        return () -> new StaticTextureProvider(name, Objects.requireNonNull(img[0]));
+        return () -> new StaticBitmapProvider(name, Objects.requireNonNull(img[0]));
     }
 
     public enum State {

…acon/slides/texture/TextureProvider.java …ides/renderer/bitmap/BitmapProvider.javasrc/main/java/org/teacon/slides/texture/TextureProvider.java renamed to src/main/java/org/teacon/slides/renderer/bitmap/BitmapProvider.java src/main/java/org/teacon/slides/texture/TextureProvider.java renamed to src/main/java/org/teacon/slides/renderer/bitmap/BitmapProvider.java

@@ -1,4 +1,4 @@
-package org.teacon.slides.texture;
+package org.teacon.slides.renderer.bitmap;
 
 import net.minecraft.FieldsAreNonnullByDefault;
 import net.minecraft.MethodsReturnNonnullByDefault;
@@ -10,7 +10,7 @@
 @FieldsAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 @ParametersAreNonnullByDefault
-public interface TextureProvider extends AutoCloseable {
+public interface BitmapProvider extends AutoCloseable {
     int MAX_TEXTURE_SIZE = 4096;
 
     SlideRenderType updateAndGet(long tick, float partialTick);

…n/slides/texture/GIFTextureProvider.java …s/renderer/bitmap/GIFBitmapProvider.javasrc/main/java/org/teacon/slides/texture/GIFTextureProvider.java renamed to src/main/java/org/teacon/slides/renderer/bitmap/GIFBitmapProvider.java src/main/java/org/teacon/slides/texture/GIFTextureProvider.java renamed to src/main/java/org/teacon/slides/renderer/bitmap/GIFBitmapProvider.java

@@ -1,11 +1,13 @@
-package org.teacon.slides.texture;
+package org.teacon.slides.renderer.bitmap;
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import net.minecraft.FieldsAreNonnullByDefault;
 import net.minecraft.MethodsReturnNonnullByDefault;
 import org.joml.Vector2i;
 import org.lwjgl.system.MemoryUtil;
 import org.teacon.slides.renderer.SlideRenderType;
+import org.teacon.slides.renderer.decoder.GIFDecoder;
+import org.teacon.slides.renderer.decoder.LZWDecoder;
 
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
@@ -18,7 +20,7 @@
 @FieldsAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 @ParametersAreNonnullByDefault
-public final class GIFTextureProvider implements TextureProvider {
+public final class GIFBitmapProvider implements BitmapProvider {
 
     private static final LZWDecoder gRenderThreadDecoder = new LZWDecoder();
 
@@ -36,7 +38,7 @@ public final class GIFTextureProvider implements TextureProvider {
 
     private final int mCPUMemorySize;
 
-    public GIFTextureProvider(String name, byte[] data) throws IOException {
+    public GIFBitmapProvider(String name, byte[] data) throws IOException {
         try {
             mDecoder = new GIFDecoder(ByteBuffer.wrap(data), gRenderThreadDecoder);
             final int width = mDecoder.getScreenWidth();

…lides/texture/StaticTextureProvider.java …enderer/bitmap/StaticBitmapProvider.javasrc/main/java/org/teacon/slides/texture/StaticTextureProvider.java renamed to src/main/java/org/teacon/slides/renderer/bitmap/StaticBitmapProvider.java src/main/java/org/teacon/slides/texture/StaticTextureProvider.java renamed to src/main/java/org/teacon/slides/renderer/bitmap/StaticBitmapProvider.java

@@ -1,4 +1,4 @@
-package org.teacon.slides.texture;
+package org.teacon.slides.renderer.bitmap;
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.platform.NativeImage;
@@ -19,14 +19,14 @@
 @FieldsAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 @ParametersAreNonnullByDefault
-public final class StaticTextureProvider implements TextureProvider {
+public final class StaticBitmapProvider implements BitmapProvider {
 
     private int mTexture;
     private final SlideRenderType mRenderType;
     private final String mRecommendedName;
     private final int mWidth, mHeight;
 
-    public StaticTextureProvider(String name, NativeImage image) throws IOException {
+    public StaticBitmapProvider(String name, NativeImage image) throws IOException {
         try {
             mWidth = image.getWidth();
             mHeight = image.getHeight();

…/slides/texture/WebPTextureProvider.java …/renderer/bitmap/WebPBitmapProvider.javasrc/main/java/org/teacon/slides/texture/WebPTextureProvider.java renamed to src/main/java/org/teacon/slides/renderer/bitmap/WebPBitmapProvider.java src/main/java/org/teacon/slides/texture/WebPTextureProvider.java renamed to src/main/java/org/teacon/slides/renderer/bitmap/WebPBitmapProvider.java

@@ -1,10 +1,11 @@
-package org.teacon.slides.texture;
+package org.teacon.slides.renderer.bitmap;
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import dev.matrixlab.webp4j.model.AnimatedWebPData;
 import net.minecraft.FieldsAreNonnullByDefault;
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.util.Mth;
+import org.apache.commons.lang3.ArrayUtils;
 import org.joml.Vector2i;
 import org.lwjgl.system.MemoryUtil;
 import org.teacon.slides.renderer.SlideRenderType;
@@ -13,6 +14,7 @@
 import javax.annotation.ParametersAreNonnullByDefault;
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.util.Arrays;
 import java.util.Objects;
 
@@ -22,7 +24,19 @@
 @FieldsAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 @ParametersAreNonnullByDefault
-public final class WebPTextureProvider implements TextureProvider {
+public final class WebPBitmapProvider implements BitmapProvider {
+    public static boolean checkMagic(byte[] buf) {
+        if (buf.length >= 12) {
+            var wr = ByteBuffer.wrap(buf).order(ByteOrder.LITTLE_ENDIAN);
+            var riff = wr.getInt() == 0x46464952; // RIFF in LITTLE ENDIAN
+            var size = wr.getInt() == buf.length - 8; // SIZE - 8 of image
+            var webp = wr.getInt() == 0x50424557; // WEBP in LITTLE ENDIAN
+            var vp8_ = ArrayUtils.contains(new int[]{0x58385056, 0x4C385056, 0x20385056}, wr.getInt()); // VP8[XL\x20] in LITTLE ENDIAN;
+            return riff && size && webp && vp8_;
+        }
+        return false;
+    }
+
     private int mTexture;
     private final SlideRenderType mRenderType;
 
@@ -42,7 +56,7 @@ public final class WebPTextureProvider implements TextureProvider {
 
     private final int mCPUMemorySize;
 
-    public WebPTextureProvider(String name, int byteCount, AnimatedWebPData data, boolean hasAlpha) throws IOException {
+    public WebPBitmapProvider(String name, int byteCount, AnimatedWebPData data, boolean hasAlpha) throws IOException {
         try {
             // check canvas size
             var width = data.getCanvasWidth();

…rg/teacon/slides/texture/GIFDecoder.java …/slides/renderer/decoder/GIFDecoder.javasrc/main/java/org/teacon/slides/texture/GIFDecoder.java renamed to src/main/java/org/teacon/slides/renderer/decoder/GIFDecoder.java src/main/java/org/teacon/slides/texture/GIFDecoder.java renamed to src/main/java/org/teacon/slides/renderer/decoder/GIFDecoder.java

@@ -16,7 +16,7 @@
  * License along with Modern UI. If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.teacon.slides.texture;
+package org.teacon.slides.renderer.decoder;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

…rg/teacon/slides/texture/LZWDecoder.java …/slides/renderer/decoder/LZWDecoder.javasrc/main/java/org/teacon/slides/texture/LZWDecoder.java renamed to src/main/java/org/teacon/slides/renderer/decoder/LZWDecoder.java src/main/java/org/teacon/slides/texture/LZWDecoder.java renamed to src/main/java/org/teacon/slides/renderer/decoder/LZWDecoder.java

@@ -16,7 +16,7 @@
  * License along with Modern UI. If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.teacon.slides.texture;
+package org.teacon.slides.renderer.decoder;
 
 import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;