LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-16 08:01:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

No frame caching during export => memory saving (like Issue #583)

Browse Source
This commit is contained in:
Jindra Petřík
2014-06-02 22:04:25 +02:00
parent 60a49f4e1a
commit 369a722f74
3 changed files with 50 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/com/jpexs/decompiler/flash/SWF.java
View File

@@ -175,6 +175,7 @@ import java.util.Arrays;
import java.util.EmptyStackException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -1314,15 +1315,16 @@ public final class SWF implements TreeItem, Timelined {
fos.write(chunkBytes);
}
private static void makeAVI(List<BufferedImage> images, int frameRate, File file) throws IOException {
if (images.isEmpty()) {
private static void makeAVI(Iterator<BufferedImage> images, int frameRate, File file) throws IOException {
if (!images.hasNext()) {
return;
}
AVIWriter out = new AVIWriter(file);
out.addVideoTrack(VideoFormatKeys.ENCODING_AVI_PNG, 1, frameRate, images.get(0).getWidth(), images.get(0).getHeight(), 0, 0);
BufferedImage img0 = images.next();
out.addVideoTrack(VideoFormatKeys.ENCODING_AVI_PNG, 1, frameRate, img0.getWidth(), img0.getHeight(), 0, 0);
try {
for (BufferedImage img : images) {
out.write(0, img, 1);
while (images.hasNext()) {
out.write(0, images.next(), 1);
}
} finally {
out.close();
@@ -1330,15 +1332,17 @@ public final class SWF implements TreeItem, Timelined {
}
private static void makeGIF(List<BufferedImage> images, int frameRate, File file) throws IOException {
if (images.isEmpty()) {
private static void makeGIF(Iterator<BufferedImage> images, int frameRate, File file) throws IOException {
if (!images.hasNext()) {
return;
}
try (ImageOutputStream output = new FileImageOutputStream(file)) {
GifSequenceWriter writer = new GifSequenceWriter(output, images.get(0).getType(), 1000 / frameRate, true);
for (BufferedImage img : images) {
writer.writeToSequence(img);
BufferedImage img0=images.next();
GifSequenceWriter writer = new GifSequenceWriter(output, img0.getType(), 1000 / frameRate, true);
writer.writeToSequence(img0);
while (images.hasNext()) {
writer.writeToSequence(images.next());
}
writer.close();
@@ -1573,11 +1577,27 @@ public final class SWF implements TreeItem, Timelined {
return ret;
}
final Timeline ftim=tim;
final Color fbackgroundColor=backgroundColor;
final Iterator<BufferedImage> frameImages = new Iterator<BufferedImage>() {
private int pos=0;
@Override
public boolean hasNext() {
return fframes.size()>pos;
}
@Override
public BufferedImage next() {
if(!hasNext()){
return null;
}
return frameToImageGet(ftim, fframes.get(pos), 0, null, 0, ftim.displayRect, new Matrix(), new ColorTransform(), fbackgroundColor,false).getBufferedImage();
}
};
final List<BufferedImage> frameImages = new ArrayList<>();
for (int frame : frames) {
frameImages.add(frameToImageGet(tim, frame, 0, null, 0, tim.displayRect, new Matrix(), new ColorTransform(), backgroundColor).getBufferedImage());
}
switch (settings.mode) {
case GIF:
new RetryTask(new RunnableIOEx() {
@@ -1590,13 +1610,13 @@ public final class SWF implements TreeItem, Timelined {
}, handler).run();
break;
case PNG:
for (int i = 0; i < frameImages.size(); i++) {
for (int i = 0; frameImages.hasNext(); i++) {
final int fi = i;
new RetryTask(new RunnableIOEx() {
@Override
public void run() throws IOException {
File f = new File(foutdir + File.separator + fframes.get(fi) + ".png");
ImageIO.write(frameImages.get(fi), "PNG", f);
ImageIO.write(frameImages.next(), "PNG", f);
ret.add(f);
}
}, handler).run();
@@ -1611,12 +1631,12 @@ public final class SWF implements TreeItem, Timelined {
PageFormat pf = new PageFormat();
pf.setOrientation(PageFormat.PORTRAIT);
Paper p = new Paper();
p.setSize(frameImages.get(0).getWidth() + 10, frameImages.get(0).getHeight() + 10);
BufferedImage img0 = frameImages.next();
p.setSize(img0.getWidth() + 10, img0.getHeight() + 10);
pf.setPaper(p);
for (int i = 0; i < frameImages.size(); i++) {
BufferedImage img = frameImages.get(i);
for (int i = 0; frameImages.hasNext(); i++) {
BufferedImage img = frameImages.next();
Graphics g = job.getGraphics(pf);
g.drawImage(img, 5, 5, img.getWidth(), img.getHeight(), null);
g.dispose();
@@ -2552,11 +2572,14 @@ public final class SWF implements TreeItem, Timelined {
return exporter.getUniqueId("tag");
}
public static SerializableImage frameToImageGet(Timeline timeline, int frame, int time, DepthState stateUnderCursor, int mouseButton, RECT displayRect, Matrix transformation, ColorTransform colorTransform, Color backGroundColor) {
public static SerializableImage frameToImageGet(Timeline timeline, int frame, int time, DepthState stateUnderCursor, int mouseButton, RECT displayRect, Matrix transformation, ColorTransform colorTransform, Color backGroundColor, boolean useCache) {
String key = "frame_" + frame + "_" + timeline.id + "_" + timeline.swf.hashCode();
SerializableImage image = getFromCache(key);
if (image != null) {
return image;
SerializableImage image;
if(useCache){
image = getFromCache(key);
if (image != null) {
return image;
}
}
if (timeline.frames.isEmpty()) {

2
src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
View File

@@ -1206,7 +1206,7 @@ public class CommandLineArgumentParser {
displayRect.Ymax *= zoom;
Matrix m = new Matrix();
m.scale(zoom);
BufferedImage img = SWF.frameToImageGet(ds.getTimeline(), 0, 0, null, 0, displayRect, m, new ColorTransform(), Color.white).getBufferedImage();
BufferedImage img = SWF.frameToImageGet(ds.getTimeline(), 0, 0, null, 0, displayRect, m, new ColorTransform(), Color.white, false).getBufferedImage();
PageFormat pf = new PageFormat();
pf.setOrientation(PageFormat.PORTRAIT);
Paper p = new Paper();

2
src/com/jpexs/decompiler/flash/gui/PreviewImage.java
View File

@@ -176,7 +176,7 @@ public class PreviewImage extends JPanel {
if (treeItem instanceof FrameNodeItem) {
FrameNodeItem fn = (FrameNodeItem) treeItem;
RECT rect = swf.displayRect;
imgSrc = SWF.frameToImageGet(swf.getTimeline(), fn.getFrame() - 1, 0, null, 0, rect, new Matrix(), new ColorTransform(), null);
imgSrc = SWF.frameToImageGet(swf.getTimeline(), fn.getFrame() - 1, 0, null, 0, rect, new Matrix(), new ColorTransform(), null, true);
width = (imgSrc.getWidth());
height = (imgSrc.getHeight());
} else if (treeItem instanceof ImageTag) {