X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2Fmetadata%2FfileTypes%2FPicture.java;h=9604211781e43e96558a800bb70e1a0e6a3ce389;hb=55413b4e5a1c3fb76d77e20ea67fd29853083c7e;hp=9af52dfaead39c7c11d6cc6560d94b57128080cd;hpb=99bc9002a93c8ab224934032a1a5fe0c00d5de96;p=meviz.git diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/Picture.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/Picture.java index 9af52df..9604211 100755 --- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/Picture.java +++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/Picture.java @@ -1,182 +1,260 @@ /* * Meviz - Various tools collection to work with multimedia. - * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu + * Copyright (C) 2012 -- 2019, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu * * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public License - * as published by the Free Software Foundation. + * modify it under the terms of version 3 of the GNU Lesser General Public License + * or later as published by the Free Software Foundation. */ package eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes; -import java.awt.Graphics2D; -import java.awt.Image; -import java.awt.Toolkit; +import eu.svjatoslav.commons.file.FilePathParser; +import eu.svjatoslav.commons.file.IOHelper; +import eu.svjatoslav.meviz.htmlindexer.Constants; +import eu.svjatoslav.meviz.htmlindexer.GifSequenceWriter; +import eu.svjatoslav.meviz.htmlindexer.ImageFormatError; +import eu.svjatoslav.meviz.htmlindexer.Utils; +import eu.svjatoslav.meviz.htmlindexer.metadata.Dimension; + +import javax.imageio.*; +import javax.imageio.stream.FileImageOutputStream; +import javax.imageio.stream.ImageInputStream; +import javax.imageio.stream.ImageOutputStream; +import javax.swing.*; +import java.awt.*; import java.awt.image.BufferedImage; import java.awt.image.FilteredImageSource; import java.awt.image.ImageFilter; import java.awt.image.ImageProducer; import java.io.File; -import java.io.FileOutputStream; -import java.io.OutputStream; +import java.io.IOException; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; -import javax.imageio.ImageIO; -import javax.swing.ImageIcon; - -import eu.svjatoslav.commons.file.FilePathParser; -import eu.svjatoslav.meviz.htmlindexer.Constants; -import eu.svjatoslav.meviz.htmlindexer.Utils; -import eu.svjatoslav.meviz.htmlindexer.metadata.Dimension; +import static eu.svjatoslav.meviz.htmlindexer.Utils.getBufferedImage; +import static java.awt.image.BufferedImage.TYPE_INT_RGB; public class Picture extends AbstractFile { - /** - * Actual returned target thumbnail size will be adjusted from desired one - * by attempting to generate as large as possible thumbnail, while not - * exceeding provided thumbnail width and height, and preserving aspect - * ratio of original image. - */ - public static java.awt.Dimension getTargetThumbnailDimension( - final java.awt.Dimension originalImageDimension, - final java.awt.Dimension desiredTargetDimension) { + private static final long serialVersionUID = -4156533490858298387L; + /** + * Picture dimensions. + */ + private Dimension dimensions; + + public Picture(final File parentDirectory, final String fileName) + throws Exception { + super(parentDirectory, fileName); + } + + private static void ensureNonzeroImageArea(final java.awt.Dimension result) { + if (result.width < 1) + result.width = 1; + if (result.height < 1) + result.height = 1; + } + + /** + * Actual returned target thumbnail size will be adjusted from desired one + * by attempting to generate as large as possible thumbnail, while not + * exceeding provided thumbnail width and height, and preserving aspect + * ratio of original image. + */ + private static java.awt.Dimension getTargetThumbnailDimension( + final java.awt.Dimension originalImageDimension, + final java.awt.Dimension desiredTargetDimension) { + + final double thumbWidthToHeightRatio = (double) desiredTargetDimension.width + / (double) desiredTargetDimension.height; + final double inputImageWidthToHeightRatio = (double) originalImageDimension.width + / (double) originalImageDimension.height; + + if (thumbWidthToHeightRatio < inputImageWidthToHeightRatio) { + + final java.awt.Dimension result = new java.awt.Dimension( + desiredTargetDimension.width, + (int) (desiredTargetDimension.width / inputImageWidthToHeightRatio)); + + ensureNonzeroImageArea(result); + + return result; + } else { + + final java.awt.Dimension result = new java.awt.Dimension( + (int) (desiredTargetDimension.height * inputImageWidthToHeightRatio), + desiredTargetDimension.height); + + ensureNonzeroImageArea(result); + + return result; + } + } + + /** + * Propose list of thumbnail dimensions. + */ + public static List getThumbnailDimensions(Dimension current) { + final ArrayList result = new ArrayList<>(); + result.add(current); + + while (current.getArea() > 1000000) { + current = current.getScaled(0.5d); + result.add(current); + } + + return result; + + } + + public static void makeThumbnail(final File inputFile, + final File outputFile, + final java.awt.Dimension preferredTargetDimensions) { + + String fileExtension = FilePathParser.getFileExtension(inputFile.getName()); + + try { + if ("gif".equalsIgnoreCase(fileExtension)) + makeGifThumbnail(inputFile, outputFile, preferredTargetDimensions); + else + makeJpegThumbnail(inputFile, outputFile, preferredTargetDimensions); + } catch (final Exception exception) { + System.out.println(exception.toString()); + exception.printStackTrace(); + } + } - final double thumbWidthToHeightRatio = (double) desiredTargetDimension.width - / (double) desiredTargetDimension.height; - final double inputImageWidthToHeightRatio = (double) originalImageDimension.width - / (double) originalImageDimension.height; + private static void makeJpegThumbnail(File inputFile, File outputFile, java.awt.Dimension preferredTargetDimensions) + throws IOException, ImageFormatError { - if (thumbWidthToHeightRatio < inputImageWidthToHeightRatio) { + final BufferedImage inputImage = getBufferedImage(inputFile); - final java.awt.Dimension result = new java.awt.Dimension( - desiredTargetDimension.width, - (int) (desiredTargetDimension.width / inputImageWidthToHeightRatio)); + final java.awt.Dimension sourceImageDimension = new java.awt.Dimension( + inputImage.getWidth(), inputImage.getHeight()); - return result; - } else { + final java.awt.Dimension targetDimensions = getTargetThumbnailDimension( + sourceImageDimension, preferredTargetDimensions); - final java.awt.Dimension result = new java.awt.Dimension( - (int) (desiredTargetDimension.height * inputImageWidthToHeightRatio), - desiredTargetDimension.height); - return result; - } - } + final Image scaledImage = scaleImage(inputImage, + targetDimensions.width, targetDimensions.height); - /** - * Propose list of thumbnail dimensions. - */ - public static List getThumbnailDimensions(Dimension current) { - final ArrayList result = new ArrayList(); - result.add(current); + final BufferedImage bufferedImage = new BufferedImage( + scaledImage.getWidth(null), scaledImage.getHeight(null), + TYPE_INT_RGB); - while (current.getArea() > 1000000) { - current = current.getScaled(0.5d); - result.add(current); - } + final Graphics2D g = bufferedImage.createGraphics(); + g.drawImage(scaledImage, 0, 0, null); + g.dispose(); - return result; - } - public static void makeThumbnail(final File inputFile, - final File outputFile, - final java.awt.Dimension preferredTargetDimensions) { + ImageOutputStream ios = ImageIO.createImageOutputStream(outputFile); + Iterator iter = ImageIO.getImageWritersByFormatName("webp"); + ImageWriter writer = iter.next(); + ImageWriteParam iwp = writer.getDefaultWriteParam(); + iwp.setCompressionMode(ImageWriteParam.MODE_EXPLICIT); + iwp.setCompressionType("Lossy"); + iwp.setCompressionQuality(0.8f); - try { + writer.setOutput(ios); + writer.write(null, new IIOImage(bufferedImage,null,null),iwp); + writer.dispose(); + } - final BufferedImage inputImage = Utils.getBufferedImage(inputFile); + private static void makeGifThumbnail( + File inputFile, File outputFile, java.awt.Dimension preferredTargetDimensions) throws IOException { + ImageIcon imageIcon = new ImageIcon(IOHelper.getFileContents(inputFile)); - final java.awt.Dimension sourceImageDimension = new java.awt.Dimension( - inputImage.getWidth(), inputImage.getHeight()); + final java.awt.Dimension sourceImageDimension = new java.awt.Dimension( + imageIcon.getIconWidth(), imageIcon.getIconHeight()); - final java.awt.Dimension targetDimensions = getTargetThumbnailDimension( - sourceImageDimension, preferredTargetDimensions); + System.out.println("Source image dimensions:" + sourceImageDimension); - final OutputStream out = new FileOutputStream(outputFile); + final java.awt.Dimension targetDimensions = getTargetThumbnailDimension( + sourceImageDimension, preferredTargetDimensions); - final Image scaledImage = scaleImage(inputImage, - targetDimensions.width, targetDimensions.height); + System.out.println("Desired target image dimensions:" + targetDimensions); - final BufferedImage bufferedImage = new BufferedImage( - scaledImage.getWidth(null), scaledImage.getHeight(null), - BufferedImage.TYPE_INT_RGB); + ImageReader reader = ImageIO.getImageReadersByFormatName("gif").next(); + ImageInputStream stream = ImageIO.createImageInputStream(inputFile); + reader.setInput(stream); - final Graphics2D g = bufferedImage.createGraphics(); - g.drawImage(scaledImage, 0, 0, null); - g.dispose(); + Utils.ImageFrame[] frames = Utils.readGIF(reader); + for (Utils.ImageFrame frame : frames) { + Image scaleImage = scaleImage(frame.image, targetDimensions.width, targetDimensions.height); + BufferedImage bImage = new BufferedImage( + targetDimensions.width, targetDimensions.height, BufferedImage.TYPE_INT_ARGB); + Graphics2D bGr = bImage.createGraphics(); + bGr.drawImage(scaleImage, 0, 0, null); + bGr.dispose(); + frame.image = bImage; + } - ImageIO.write(bufferedImage, "jpg", out); - out.close(); + ImageOutputStream output = new FileImageOutputStream(outputFile); - } catch (final Exception exception) { - System.out.println(exception.toString()); - exception.printStackTrace(); - } - } + GifSequenceWriter writer = + new GifSequenceWriter(output, frames[0].image.getType(), frames[0].getDelay(), true); - /** - * @return new image scaled to desired dimensions - */ - public static Image scaleImage(final Image srcImage, final int width, - final int height) { + writer.writeToSequence(frames[0].image); + for (int i = 1; i < frames.length; i++) { + BufferedImage nextImage = frames[i].image; + writer.writeToSequence(nextImage); + } - ImageFilter filter; - filter = new java.awt.image.AreaAveragingScaleFilter(width, height); + writer.close(); + output.close(); + } - final ImageProducer prod = new FilteredImageSource( - srcImage.getSource(), filter); + /** + * @return new image scaled to desired dimensions + */ + private static Image scaleImage(final Image srcImage, final int width, + final int height) { - final Image newImage = Toolkit.getDefaultToolkit().createImage(prod); + final ImageFilter filter = new java.awt.image.AreaAveragingScaleFilter( + width, height); - final ImageIcon imageIcon = new ImageIcon(newImage); - return imageIcon.getImage(); - } - - private static final long serialVersionUID = -4156533490858298387L;; + final ImageProducer prod = new FilteredImageSource( + srcImage.getSource(), filter); - /** - * Picture dimensions. - */ - private Dimension dimensions; + final Image newImage = Toolkit.getDefaultToolkit().createImage(prod); - public Picture(final File parentDirectory, final String fileName) - throws Exception { - super(parentDirectory, fileName); - } + return new ImageIcon(newImage).getImage(); + } - private String computeThumbnailHash(final Dimension targetDimension) { + private String computeThumbnailHash(final Dimension targetDimension) { - // compute new thumbnails hash number - final String forMagicHash = fileName + " " - + String.valueOf(targetDimension.width) + " " - + String.valueOf(targetDimension.height) + " " - + String.valueOf(getFileLength()) + " " - + Constants.THUMBNAIL_VERSION; + // compute new thumbnails hash number + final String forMagicHash = fileName + " " + + targetDimension.width + " " + + targetDimension.height + " " + + getFileLength() + " " + + Constants.THUMBNAIL_VERSION; - // System.out.println("Computing hash from: " + forMagicHash); - return Utils.getStringCrcAsHex(forMagicHash); - } + return Utils.getStringCrcAsHex(forMagicHash); + } - public Dimension getDimensions() { - return dimensions; - } + public Dimension getDimensions() { + return dimensions; + } - /** - * Get thumbnail file name for this image and desired thumbnail dimensions - * relative to designated thumbnails directory within parent directory. - */ - public String getRelativeThumbnailFileName(final Dimension targetDimension) { - return FilePathParser.getFileNameWithoutExtension(fileName) + " (" - + computeThumbnailHash(targetDimension) + ").jpeg"; - } + /** + * Get thumbnail file name for this image and desired thumbnail dimensions + * relative to designated thumbnails directory within parent directory. + */ + public String getRelativeThumbnailFileName(final Dimension targetDimension) { + String thumbnailExtension = "gif".equalsIgnoreCase(getFileExtension()) ? "gif" : "webp"; - @Override - public void updateFileMetainfo(final File parentDirectory) throws Exception { - final BufferedImage image = Utils - .getBufferedImage(getFile(parentDirectory)); - dimensions = new Dimension(image.getWidth(), image.getHeight()); - } + return FilePathParser.getFileNameWithoutExtension(fileName) + " (" + + computeThumbnailHash(targetDimension) + ")." + thumbnailExtension; + } + + @Override + public void updateFileMetadata(final File parentDirectory) throws Exception { + final BufferedImage image = getBufferedImage(getFile(parentDirectory)); + dimensions = new Dimension(image.getWidth(), image.getHeight()); + } }