Add WEBP support, via cwebp/dwebp tools

Author: mikeprimm

DynmapCore/src/main/java/org/dynmap/DynmapCore.java

@@ -33,6 +33,7 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
+import org.dynmap.MapType.ImageEncoding;
 import org.dynmap.common.DynmapCommandSender;
 import org.dynmap.common.DynmapListenerManager;
 import org.dynmap.common.DynmapListenerManager.EventType;
@@ -138,6 +139,12 @@ public static abstract class EnableCoreCallbacks {
 
     private boolean loginRequired;
 
+    // WEBP support
+    private String cwebpPath;
+    private String dwebpPath;
+    private boolean did_cwebpPath_warn = false;
+    private boolean did_dwebpPath_warn = false;
+    
     /* Flag to let code know that we're doing reload - make sure we don't double-register event handlers */
     public boolean is_reload = false;
     public static boolean ignore_chunk_loads = false; /* Flag keep us from processing our own chunk loads */
@@ -200,7 +207,6 @@ public final File getExportFolder() {
     public void setMinecraftVersion(String mcver) {
         this.platformVersion = mcver;
     }
-    
     public void setServer(DynmapServerInterface srv) {
         server = srv;
     }
@@ -213,6 +219,21 @@ public final void setBiomeNames(String[] names) {
     public static final boolean migrateChunks() {
         return migrate_chunks;
     }
+    
+    public String getCWEBPPath() {
+    	if ((cwebpPath == null) && (!did_cwebpPath_warn)) {
+    		Log.severe("ERROR: trying to use WEBP without cwebp tool installed or cwebpPath set properly");
+    		did_cwebpPath_warn = true;    		
+    	}
+    	return cwebpPath;
+    }
+    public String getDWEBPPath() {
+    	if ((dwebpPath == null) && (!did_dwebpPath_warn)) {
+    		Log.severe("ERROR: trying to use WEBP without dwebp tool installed or dwebpPath set properly");
+    		did_dwebpPath_warn = true;    		
+    	}
+    	return dwebpPath;
+    }
 
     public final String getBiomeName(int biomeid) {
         String n = null;
@@ -416,6 +437,20 @@ else if (storetype.equals("postgres") || storetype.equals("postgresql")) {
         return true;
     }
 
+    private String findExecutableOnPath(String fname) {
+		for (String dirname : System.getenv("PATH").split(File.pathSeparator)) {
+			File file = new File(dirname, fname);
+			if (file.isFile() && file.canExecute()) {
+				return file.getAbsolutePath();
+			}
+			file = new File(dirname, fname + ".exe");
+			if (file.isFile() && file.canExecute()) {
+				return file.getAbsolutePath();
+			}
+		}
+		return null;
+    }
+    
     public boolean enableCore(EnableCoreCallbacks cb) {
         /* Update extracted files, if needed */
         updateExtractedFiles();
@@ -427,14 +462,47 @@ public boolean enableCore(EnableCoreCallbacks cb) {
 
         /* Load control for leaf transparency (spout lighting bug workaround) */
         transparentLeaves = configuration.getBoolean("transparent-leaves", true);
+        
+        // Inject core instance
+        ImageIOManager.core = this;
+        // Check for webp support
+    	cwebpPath = configuration.getString("cwebpPath", null);
+    	dwebpPath = configuration.getString("dwebpPath", null);
+    	if (cwebpPath == null) {
+    		cwebpPath = findExecutableOnPath("cwebp");
+    	}
+    	if (dwebpPath == null) {
+    		dwebpPath = findExecutableOnPath("dwebp");
+    	}
+    	if (cwebpPath != null) {
+        	File file = new File(cwebpPath);
+    		if (!file.isFile() || !file.canExecute()) {
+    			cwebpPath = null;
+    		}
+    	}
+    	if (dwebpPath != null) {
+        	File file = new File(dwebpPath);
+    		if (!file.isFile() || !file.canExecute()) {
+    			dwebpPath = null;
+    		}
+    	}
+        if ((cwebpPath != null) && (dwebpPath != null)) {
+        	Log.info("Found cwebp at " + cwebpPath + " and dwebp at " + dwebpPath + ": webp format enabled");
+        }
+        else {
+        	Log.warning("cwebp or dwebp not found, or cwebpPath or dwebpPath is invalid: webp format disabled");        	
+        	cwebpPath = dwebpPath = null;
+        }
         /* Get default image format */
         def_image_format = configuration.getString("image-format", "png");
         MapType.ImageFormat fmt = MapType.ImageFormat.fromID(def_image_format);
-        if(fmt == null) {
+        if ((fmt == null) || ((fmt.enc == ImageEncoding.WEBP) && (cwebpPath == null))) {
             Log.severe("Invalid image-format: " + def_image_format);
             def_image_format = "png";
+            fmt = MapType.ImageFormat.fromID(def_image_format);
         }
 
+        
         DynmapWorld.doInitialScan(configuration.getBoolean("initial-zoomout-validate", true));
 
         smoothlighting = configuration.getBoolean("smooth-lighting", false);

DynmapCore/src/main/java/org/dynmap/DynmapWorld.java

@@ -157,7 +157,7 @@ private void processZoomFile(MapTypeState mts, MapStorageTile tile, boolean firs
                 if (tr != null) {
                     BufferedImage im = null;
                     try {
-                        im = ImageIOManager.imageIODecode(tr.image);
+                        im = ImageIOManager.imageIODecode(tr);
                     } catch (IOException iox) {
                         // Broken file - zap it
                         tile1.delete();

DynmapCore/src/main/java/org/dynmap/MapType.java

@@ -30,13 +30,16 @@ public enum ImageVariant {
     }
 
     public enum ImageEncoding {
-        PNG("png"), JPG("jpg");
+        PNG("png", "image/png"), JPG("jpg", "image/jpeg"), WEBP("webp", "image/webp");
         public final String ext;
+        public final String mimetype;
 
-        ImageEncoding(String ext) {
+        ImageEncoding(String ext, String mime) {
             this.ext = ext;
+            this.mimetype = mime;
         }
         public String getFileExt() { return ext; }
+        public String getContentType() { return mimetype; }
 
         public static ImageEncoding fromOrd(int ix) {
             ImageEncoding[] v = values();
@@ -63,7 +66,14 @@ public enum ImageFormat {
         FORMAT_JPG("jpg", 0.85f, ImageEncoding.JPG),
         FORMAT_JPG90("jpg-q90", 0.90f, ImageEncoding.JPG),
         FORMAT_JPG95("jpg-q95", 0.95f, ImageEncoding.JPG),
-        FORMAT_JPG100("jpg-q100", 1.00f, ImageEncoding.JPG);
+        FORMAT_JPG100("jpg-q100", 1.00f, ImageEncoding.JPG),
+        FORMAT_WEBP75("webp-q75", 75, ImageEncoding.WEBP),
+        FORMAT_WEBP80("webp-q80", 80, ImageEncoding.WEBP),
+        FORMAT_WEBP85("webp-q85", 85, ImageEncoding.WEBP),
+        FORMAT_WEBP("webp", 85, ImageEncoding.WEBP),
+        FORMAT_WEBP90("webp-q90", 90, ImageEncoding.WEBP),
+        FORMAT_WEBP95("webp-q95", 95, ImageEncoding.WEBP),
+        FORMAT_WEBP100("webp-q100", 100, ImageEncoding.WEBP);
         String id;
         float qual;
         ImageEncoding enc;

DynmapCore/src/main/java/org/dynmap/servlet/MapStorageResourceHandler.java

@@ -120,12 +120,7 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
         // Got tile, package up for response
         response.setDateHeader("Last-Modified", tr.lastModified);
         response.setIntHeader("Content-Length", tr.image.length());
-        if (tr.format == ImageEncoding.PNG) {
-            response.setContentType("image/png");
-        }
-        else {
-            response.setContentType("image/jpeg");
-        }
+        response.setContentType(tr.format.getContentType());
         ServletOutputStream out = response.getOutputStream();
         out.write(tr.image.buffer(), 0, tr.image.length());
         out.flush();