diff --git a/CHANGELOG.md b/CHANGELOG.md index f8fbf98f5..19e958ede 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file. - AS3 - "internal" keyword support - ProductInfo tag information display - DebugId tag proper display and editation +- [#1893] Experimental playback of DefineVideoStream tags with VLC player ### Fixed - [#1897] Close menu button without selecting specific item @@ -2704,6 +2705,7 @@ All notable changes to this project will be documented in this file. [#1511]: https://www.free-decompiler.com/flash/issues/1511 [#1765]: https://www.free-decompiler.com/flash/issues/1765 [#1884]: https://www.free-decompiler.com/flash/issues/1884 +[#1893]: https://www.free-decompiler.com/flash/issues/1893 [#1897]: https://www.free-decompiler.com/flash/issues/1897 [#1006]: https://www.free-decompiler.com/flash/issues/1006 [#1888]: https://www.free-decompiler.com/flash/issues/1888 diff --git a/lib/jna-3.5.1.jar b/_del/jna-3.5.1.jar similarity index 100% rename from lib/jna-3.5.1.jar rename to _del/jna-3.5.1.jar diff --git a/build.xml b/build.xml index 764dc288f..843697ea7 100644 --- a/build.xml +++ b/build.xml @@ -655,7 +655,7 @@ - + diff --git a/lib/jna-5.11.0.jar b/lib/jna-5.11.0.jar new file mode 100644 index 000000000..34968cf0d Binary files /dev/null and b/lib/jna-5.11.0.jar differ diff --git a/lib/jna-platform-5.11.0.jar b/lib/jna-platform-5.11.0.jar new file mode 100644 index 000000000..ac4531b2e Binary files /dev/null and b/lib/jna-platform-5.11.0.jar differ diff --git a/lib/vlcj-4.7.3.jar b/lib/vlcj-4.7.3.jar new file mode 100644 index 000000000..2575f7af8 Binary files /dev/null and b/lib/vlcj-4.7.3.jar differ diff --git a/lib/vlcj-natives-4.7.0.jar b/lib/vlcj-natives-4.7.0.jar new file mode 100644 index 000000000..a9601948e Binary files /dev/null and b/lib/vlcj-natives-4.7.0.jar differ diff --git a/libsrc/ffdec_lib/nbproject/project.xml b/libsrc/ffdec_lib/nbproject/project.xml index 1df5c15d5..379c1c0b9 100644 --- a/libsrc/ffdec_lib/nbproject/project.xml +++ b/libsrc/ffdec_lib/nbproject/project.xml @@ -239,7 +239,7 @@ auxiliary.show.customizer.message= src - ../../lib/LZMA.jar;../../lib/avi.jar;../../lib/gif.jar;../../lib/gnujpdf.jar;../../lib/jl1.0.1.jar;../../lib/jpacker.jar;../../lib/nellymoser.jar;../../lib/sfntly.jar;../../lib/ttf.jar;../../lib/cmykjpeg.jar;../../src;../../lib/flashdebugger.jar;../../lib/graphs.jar;../../lib/ddsreader.jar + ../../lib/LZMA.jar;../../lib/avi.jar;../../lib/gif.jar;../../lib/gnujpdf.jar;../../lib/jl1.0.1.jar;../../lib/jpacker.jar;../../lib/nellymoser.jar;../../lib/sfntly.jar;../../lib/ttf.jar;../../lib/cmykjpeg.jar;../../src;../../lib/flashdebugger.jar;../../lib/graphs.jar;../../lib/ddsreader.jar;../../lib/vlcj-4.7.3.jar;../../lib/jna-5.11.0.jar;../../lib/jna-platform-5.11.0.jar build reports dist diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java index 85caf26b5..326ed0569 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java @@ -2187,7 +2187,7 @@ public final class SWF implements SWFContainerItem, Timelined, Openable { } } - public static void populateVideoFrames(int streamId, Iterable tags, HashMap output) { + public static void populateVideoFrames(int streamId, Iterable tags, Map output) { for (Tag t : tags) { if (t instanceof VideoFrameTag) { VideoFrameTag videoFrameTag = (VideoFrameTag) t; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java index a375353dd..65e0f6d80 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java @@ -818,6 +818,11 @@ public final class Configuration { @ConfigurationName("gui.scale") public static ConfigurationItem uiScale = null; + @ConfigurationDefaultString("") + @ConfigurationCategory("paths") + @ConfigurationDirectory + public static ConfigurationItem vlcPlayerLocation = null; + private enum OSId { WINDOWS, OSX, UNIX } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/MovieExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/MovieExporter.java index df26608b8..4be4b36f0 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/MovieExporter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/MovieExporter.java @@ -43,6 +43,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @@ -102,8 +103,12 @@ public class MovieExporter { } public byte[] exportMovie(DefineVideoStreamTag videoStream, MovieExportMode mode) throws IOException { + return exportMovie(videoStream, mode, false); + } + + public byte[] exportMovie(DefineVideoStreamTag videoStream, MovieExportMode mode, boolean ffdecInternal) throws IOException { SWF swf = videoStream.getSwf(); - HashMap frames = new HashMap<>(); + Map frames = new HashMap<>(); SWF.populateVideoFrames(videoStream.characterID, swf.getTags(), frames); if (frames.isEmpty()) { return SWFInputStream.BYTE_ARRAY_EMPTY; @@ -120,10 +125,14 @@ public class MovieExporter { int verticalAdjustment = 0; int[] frameNumArray = Helper.toIntArray(frames.keySet()); Arrays.sort(frameNumArray); + FLVTAG lastTag = null; + int frameNum = 0; for (int i = 0; i < frameNumArray.length; i++) { VideoFrameTag tag = frames.get(frameNumArray[i]); ByteArrayOutputStream baos = new ByteArrayOutputStream(); + frameNum = frameNumArray[i]; + int frameType = 1; if ((videoStream.codecID == DefineVideoStreamTag.CODEC_VP6) @@ -190,7 +199,11 @@ public class MovieExporter { } baos.write(tag.videoData.getRangeData()); - flv.writeTag(new FLVTAG((int) Math.floor(i * 1000.0 / swf.frameRate), new VIDEODATA(frameType, videoStream.codecID, baos.toByteArray()))); + flv.writeTag(lastTag = new FLVTAG((long)Math.floor(ffdecInternal ? frameNum * 5000.0 : (frameNum * 1000.0 / swf.frameRate)), new VIDEODATA(frameType, videoStream.codecID, baos.toByteArray()))); + } + if (ffdecInternal && lastTag != null) { + lastTag.timeStamp = frameNum * 5000 + 5000; + flv.writeTag(lastTag); } return fos.toByteArray(); } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineVideoStreamTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineVideoStreamTag.java index 9bf8323ce..779680cce 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineVideoStreamTag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/DefineVideoStreamTag.java @@ -16,26 +16,63 @@ */ package com.jpexs.decompiler.flash.tags; +import com.jpexs.decompiler.flash.ReadOnlyTagList; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; +import com.jpexs.decompiler.flash.configuration.Configuration; +import com.jpexs.decompiler.flash.exporters.MovieExporter; +import com.jpexs.decompiler.flash.exporters.commonshape.ExportRectangle; +import com.jpexs.decompiler.flash.exporters.commonshape.Matrix; +import com.jpexs.decompiler.flash.exporters.commonshape.SVGExporter; +import com.jpexs.decompiler.flash.exporters.modes.MovieExportMode; import com.jpexs.decompiler.flash.tags.base.BoundedTag; -import com.jpexs.decompiler.flash.tags.base.CharacterTag; +import com.jpexs.decompiler.flash.tags.base.ButtonTag; +import com.jpexs.decompiler.flash.tags.base.DrawableTag; +import com.jpexs.decompiler.flash.tags.base.RenderContext; +import com.jpexs.decompiler.flash.timeline.Timeline; +import com.jpexs.decompiler.flash.timeline.Timelined; import com.jpexs.decompiler.flash.types.BasicType; +import com.jpexs.decompiler.flash.types.ColorTransform; +import com.jpexs.decompiler.flash.types.MATRIX; import com.jpexs.decompiler.flash.types.RECT; +import com.jpexs.decompiler.flash.types.SOUNDINFO; +import com.jpexs.decompiler.flash.types.annotations.Internal; import com.jpexs.decompiler.flash.types.annotations.Reserved; import com.jpexs.decompiler.flash.types.annotations.SWFType; import com.jpexs.decompiler.flash.types.annotations.SWFVersion; +import com.jpexs.decompiler.flash.types.filters.BlendComposite; import com.jpexs.helpers.ByteArrayRange; +import com.jpexs.helpers.Helper; +import com.jpexs.helpers.SerializableImage; +import com.jpexs.video.FrameListener; +import com.jpexs.video.SimpleMediaPlayer; +import java.awt.AlphaComposite; +import java.awt.BasicStroke; +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.Rectangle; +import java.awt.Shape; +import java.awt.geom.AffineTransform; +import java.awt.geom.Rectangle2D; +import java.awt.image.BufferedImage; +import java.io.File; import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Set; +import java.util.TreeSet; +import java.util.logging.Level; +import java.util.logging.Logger; /** * * @author JPEXS */ @SWFVersion(from = 6) -public class DefineVideoStreamTag extends CharacterTag implements BoundedTag { +public class DefineVideoStreamTag extends DrawableTag implements BoundedTag, Timelined { public static final int ID = 60; @@ -65,6 +102,22 @@ public class DefineVideoStreamTag extends CharacterTag implements BoundedTag { @SWFType(BasicType.UI8) public int codecID; + @Internal + private SimpleMediaPlayer mediaPlayer; + @Internal + private final Object getFrameLock = new Object(); + + @Internal + private BufferedImage activeFrame = null; + + @Internal + private ReadOnlyTagList tags; + + @Internal + private int lastRatio = -1; + + private Timeline timeline; + public static final int CODEC_SORENSON_H263 = 2; public static final int CODEC_SCREEN_VIDEO = 3; @@ -149,4 +202,219 @@ public class DefineVideoStreamTag extends CharacterTag implements BoundedTag { public RECT getRectWithStrokes() { return getRect(); } + + private void initPlayer() { + if (mediaPlayer != null) { // && !mediaPlayer.isFinished()) { + return; + } + mediaPlayer = new SimpleMediaPlayer(); + mediaPlayer.addFrameListener(new FrameListener() { + @Override + public void newFrameRecieved(BufferedImage image) { + synchronized (getFrameLock) { + activeFrame = image; + //System.out.println("received frame"); + getFrameLock.notifyAll(); + /*if (mediaPlayer.isFinished()) { + mediaPlayer.rewind(); + }*/ + } + } + }); + MovieExporter exp = new MovieExporter(); + try { + byte[] data = exp.exportMovie(this, MovieExportMode.FLV, true); + File tempFile = File.createTempFile("ffdec_video", ".flv"); + tempFile.deleteOnExit(); + Helper.writeFile(tempFile.getAbsolutePath(), data); + mediaPlayer.play(tempFile.getAbsolutePath()); + //mediaPlayer.pause(); + + } catch (IOException ex) { + Logger.getLogger(DefineVideoStreamTag.class.getName()).log(Level.SEVERE, null, ex); + } + } + + @Override + public int getUsedParameters() { + return PARAMETER_RATIO; + } + + @Override + public Shape getOutline(int frame, int time, int ratio, RenderContext renderContext, Matrix transformation, boolean stroked) { + return transformation.toTransform().createTransformedShape(new Rectangle2D.Double(0, 0, width * SWF.unitDivisor, height * SWF.unitDivisor)); + } + + @Override + public synchronized void toImage(int frame, int time, int ratio, RenderContext renderContext, SerializableImage image, SerializableImage fullImage, boolean isClip, Matrix transformation, Matrix prevTransformation, Matrix absoluteTransformation, Matrix fullTransformation, ColorTransform colorTransform, double unzoom, boolean sameImage, ExportRectangle viewRect, boolean scaleStrokes, int drawMode, int blendMode) { + + if (!Configuration.vlcPlayerLocation.hasValue() || !new File(Configuration.vlcPlayerLocation.get()).exists()) { + Graphics2D g = (Graphics2D) image.getBufferedImage().getGraphics(); + Matrix mat = transformation; + AffineTransform trans = mat.preConcatenate(Matrix.getScaleInstance(1 / SWF.unitDivisor)).toTransform(); + g.setTransform(trans); + BoundedTag b = (BoundedTag) this; + g.setPaint(new Color(255, 255, 255, 128)); + g.setComposite(BlendComposite.Invert); + g.setStroke(new BasicStroke((int) SWF.unitDivisor)); + RECT r = b.getRect(); + g.setFont(g.getFont().deriveFont((float) (12 * SWF.unitDivisor))); + g.drawString(toString(), r.Xmin + (int) (3 * SWF.unitDivisor), r.Ymin + (int) (15 * SWF.unitDivisor)); + g.draw(new Rectangle(r.Xmin, r.Ymin, r.getWidth(), r.getHeight())); + g.drawLine(r.Xmin, r.Ymin, r.Xmax, r.Ymax); + g.drawLine(r.Xmax, r.Ymin, r.Xmin, r.Ymax); + g.setComposite(AlphaComposite.Dst); + return; + } + synchronized (DefineVideoStreamTag.class) { + + if (!(activeFrame != null && lastRatio == ratio)) { + synchronized (getFrameLock) { + activeFrame = null; + getFrameLock.notifyAll(); + } + initPlayer(); + if (ratio == -1) { + ratio = 0; + } + //float oneFr = 1f / getNumFrames(); + ratio--; + + if (mediaPlayer.isFinished()) { + return; + } + mediaPlayer.setPosition((float) ratio / getNumFrames()); + try { + synchronized (getFrameLock) { + if (activeFrame == null) { + //System.out.println("waiting..."); + getFrameLock.wait(); + //System.out.println("awakened"); + } + } + } catch (InterruptedException ex) { + //Logger.getLogger(DefineVideoStreamTag.class.getName()).log(Level.SEVERE, null, ex); + } + } + synchronized (getFrameLock) { + if (activeFrame != null) { + //System.out.println("drawed"); + Graphics2D graphics = (Graphics2D) image.getBufferedImage().getGraphics(); + AffineTransform at = transformation.toTransform(); + at.preConcatenate(AffineTransform.getScaleInstance(1 / SWF.unitDivisor, 1 / SWF.unitDivisor)); + graphics.setTransform(at); + //Point p = transformation.inverse().transform(0, 0); + graphics.drawImage(activeFrame, 0, 0, + (int) Math.round(width * SWF.unitDivisor), + (int) Math.round(height * SWF.unitDivisor), + 0, 0, width, height, + null); + } + } + } + //System.out.println("toImage return"); + } + + @Override + public void toSVG(SVGExporter exporter, int ratio, ColorTransform colorTransform, int level) throws IOException { + } + + @Override + public void toHtmlCanvas(StringBuilder result, double unitDivisor) { + } + + @Override + public int getNumFrames() { + return numFrames; + } + + @Override + public boolean isSingleFrame() { + return getNumFrames() == 1; + } + + @Override + public Timeline getTimeline() { + initTimeline(); + return timeline; + } + + private void initTimeline() { + if (timeline != null) { + return; + } + Map frames = new HashMap<>(); + SWF.populateVideoFrames(characterID, swf.getTags(), frames); + Set frameNums = new TreeSet<>(frames.keySet()); + int maxFr = 0; + for (int f : frameNums) { + maxFr = f; + } + List tags = new ArrayList<>(); + for (int f = 0; f < maxFr; f++) { + if (frames.containsKey(f)) { + tags.add(frames.get(f)); + } + tags.add(new PlaceObject2Tag(swf, false, 1, characterID, new MATRIX(), null, f, null, -1, null)); + tags.add(new ShowFrameTag(swf)); + } + this.tags = new ReadOnlyTagList(tags); + + timeline = new Timeline(swf, this, characterID, getRect()) { + @Override + public void getSounds(int frame, int time, ButtonTag mouseOverButton, int mouseButton, List sounds, List soundClasses, List soundInfos) { + } + }; + } + + @Override + public void resetTimeline() { + timeline = null; + } + + @Override + public ReadOnlyTagList getTags() { + initTimeline(); + return tags; + } + + @Override + public void removeTag(int index) { + + } + + @Override + public void removeTag(Tag tag) { + + } + + @Override + public void addTag(Tag tag) { + } + + @Override + public void addTag(int index, Tag tag) { + } + + @Override + public void replaceTag(int index, Tag newTag) { + } + + @Override + public void replaceTag(Tag oldTag, Tag newTag) { + } + + @Override + public int indexOfTag(Tag tag) { + return tags.indexOf(tag); + } + + @Override + public void setFrameCount(int frameCount) { + } + + @Override + public int getFrameCount() { + return numFrames; + } } diff --git a/libsrc/ffdec_lib/src/com/jpexs/video/FrameListener.java b/libsrc/ffdec_lib/src/com/jpexs/video/FrameListener.java new file mode 100644 index 000000000..ab8bc8e9b --- /dev/null +++ b/libsrc/ffdec_lib/src/com/jpexs/video/FrameListener.java @@ -0,0 +1,7 @@ +package com.jpexs.video; + +import java.awt.image.BufferedImage; + +public interface FrameListener { + public void newFrameRecieved(BufferedImage image); +} diff --git a/libsrc/ffdec_lib/src/com/jpexs/video/SimpleMediaPlayer.java b/libsrc/ffdec_lib/src/com/jpexs/video/SimpleMediaPlayer.java new file mode 100644 index 000000000..57b0ea374 --- /dev/null +++ b/libsrc/ffdec_lib/src/com/jpexs/video/SimpleMediaPlayer.java @@ -0,0 +1,334 @@ +package com.jpexs.video; + +import com.jpexs.decompiler.flash.configuration.Configuration; +import java.awt.image.BufferedImage; +import java.lang.annotation.Native; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.List; +import com.sun.jna.NativeLibrary; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PrintStream; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.swing.SwingUtilities; +import uk.co.caprica.vlcj.factory.MediaPlayerFactory; +import uk.co.caprica.vlcj.factory.discovery.NativeDiscovery; +import uk.co.caprica.vlcj.factory.discovery.provider.DirectoryProviderDiscoveryStrategy; +import uk.co.caprica.vlcj.factory.discovery.strategy.NativeDiscoveryStrategy; +import uk.co.caprica.vlcj.media.MediaRef; +import uk.co.caprica.vlcj.medialist.MediaList; +import uk.co.caprica.vlcj.medialist.MediaListRef; +import uk.co.caprica.vlcj.player.base.MediaPlayer; +import uk.co.caprica.vlcj.player.base.MediaPlayerEventAdapter; +import uk.co.caprica.vlcj.player.embedded.EmbeddedMediaPlayer; +import uk.co.caprica.vlcj.player.embedded.videosurface.CallbackVideoSurface; +import uk.co.caprica.vlcj.player.embedded.videosurface.VideoSurfaceAdapters; +import uk.co.caprica.vlcj.player.embedded.videosurface.callback.BufferFormat; +import uk.co.caprica.vlcj.player.embedded.videosurface.callback.BufferFormatCallback; +import uk.co.caprica.vlcj.player.embedded.videosurface.callback.RenderCallback; +import uk.co.caprica.vlcj.player.embedded.videosurface.callback.format.RV32BufferFormat; +import uk.co.caprica.vlcj.player.list.MediaListPlayer; +import uk.co.caprica.vlcj.player.list.MediaListPlayerEventAdapter; +import uk.co.caprica.vlcj.player.list.PlaybackMode; + +public class SimpleMediaPlayer { + + private List listeners = new ArrayList<>(); + private final EmbeddedMediaPlayer embeddedMediaPlayer; + private final MediaListPlayer mediaListPlayer; + private final MediaPlayerFactory mediaPlayerFactory; + private boolean paused = true; + + private long time = 0L; + + private float position = 0f; + + private long length = 0L; + + private boolean positionSet = false; + + private boolean loaded = false; + + private boolean finished = false; + + private boolean singleFrame = false; + + private final Object displayLock = new Object(); + + private String file; + + private MyRenderCallback callback; + + public long getLength() { + return length; + } + + public void addFrameListener(FrameListener listener) { + listeners.add(listener); + } + + public void removeFrameListener(FrameListener listener) { + listeners.remove(listener); + } + + public void play(String file) { + loaded = false; + this.file = file; + //embeddedMediaPlayer.media().play(file); //.play(file); + + MediaList mediaList = mediaPlayerFactory.media().newMediaList(); + mediaList.media().add(file); + + MediaListRef mediaListRef = mediaList.newMediaListRef(); + try { + mediaListPlayer.list().setMediaList(mediaListRef); + } finally { + mediaListRef.release(); + } + mediaListPlayer.controls().play(); + } + + public void stop() { + embeddedMediaPlayer.controls().stop(); + } + + public void pause() { + if (paused) { + paused = false; + if (length != 0) { + embeddedMediaPlayer.controls().setPosition(((float) time) / length); + } + embeddedMediaPlayer.controls().play(); + return; + } + embeddedMediaPlayer.controls().pause(); + paused = true; + } + + public void setTime(long time) { + synchronized (displayLock) { + this.time = time; + positionSet = false; + if (paused) { + singleFrame = true; + } + embeddedMediaPlayer.controls().setTime(time); + embeddedMediaPlayer.controls().play(); + + if (paused) { + try { + displayLock.wait(); + } catch (InterruptedException ex) { + Logger.getLogger(SimpleMediaPlayer.class.getName()).log(Level.SEVERE, null, ex); + } + } + } + //embeddedMediaPlayer.controls().play(); + } + + public void setPosition(float position) { + synchronized (displayLock) { + this.position = position; + positionSet = true; + singleFrame = true; + } + //System.out.println("setting position: "+ position); + embeddedMediaPlayer.controls().pause(); + embeddedMediaPlayer.controls().setPosition(position); + embeddedMediaPlayer.controls().play(); + /*if (paused) { + try { + displayLock.wait(); + } catch (InterruptedException ex) { + Logger.getLogger(SimpleMediaPlayer.class.getName()).log(Level.SEVERE, null, ex); + } + }*/ + + + //embeddedMediaPlayer.controls().play(); + } + + public boolean isPaused() { + return paused; + } + + /*public void rewind() { + System.out.println("rewinding"); + //embeddedMediaPlayer.controls().stop(); + //embeddedMediaPlayer.controls().start(); + position = 0f; + loaded = false; + embeddedMediaPlayer.media().play(file); + //embeddedMediaPlayer.controls().setPosition(0f); + //embeddedMediaPlayer.controls().play(); + System.out.println("rewound"); + }*/ + + public SimpleMediaPlayer() { + + BufferFormatCallback bufferFormatCallback = new BufferFormatCallback() { + + @Override + public BufferFormat getBufferFormat(int sourceWidth, int sourceHeight) { + return new RV32BufferFormat(sourceWidth, sourceHeight); + } + + @Override + public void allocatedBuffers(ByteBuffer[] buffers) { + } + }; + + callback = new MyRenderCallback(listeners); + CallbackVideoSurface callbackVideoSurface = new CallbackVideoSurface(bufferFormatCallback, callback, + false, VideoSurfaceAdapters.getVideoSurfaceAdapter()); + + NativeLibrary.addSearchPath("libvlc", Configuration.vlcPlayerLocation.get()); + mediaPlayerFactory = new MediaPlayerFactory(); + + embeddedMediaPlayer = mediaPlayerFactory.mediaPlayers().newEmbeddedMediaPlayer(); + callbackVideoSurface.attach(embeddedMediaPlayer); + embeddedMediaPlayer.videoSurface().set(callbackVideoSurface); + embeddedMediaPlayer.videoSurface().attachVideoSurface(); + + embeddedMediaPlayer.events().addMediaPlayerEventListener(new MediaPlayerEventAdapter() { + @Override + public void lengthChanged(uk.co.caprica.vlcj.player.base.MediaPlayer mediaPlayer, long newLength) { + length = newLength; + } + + @Override + public void timeChanged(uk.co.caprica.vlcj.player.base.MediaPlayer mediaPlayer, long newTime) { + SimpleMediaPlayer.this.time = newTime; + } + + @Override + public void positionChanged(uk.co.caprica.vlcj.player.base.MediaPlayer mediaPlayer, float newPosition) { + SimpleMediaPlayer.this.position = newPosition; + //System.out.println("position changed to "+newPosition); + } + + @Override + public void finished(MediaPlayer mediaPlayer) { + /*System.out.println("finished"); + finished = true; + callback.sendImage(); + new Thread() { + @Override + public void run() { + System.out.println("finished settime 0"); + mediaPlayer.controls().setPosition(0f); + System.out.println("finished play"); + mediaPlayer.controls().play(); + System.out.println("/finished"); + } + }.start();*/ + } + + + @Override + public void stopped(MediaPlayer mediaPlayer) { + System.out.println("stopped"); + } + + + + + @Override + public void playing(uk.co.caprica.vlcj.player.base.MediaPlayer mediaPlayer) { + if (!loaded) { + if (positionSet) { + embeddedMediaPlayer.controls().setPosition(position); + } else { + embeddedMediaPlayer.controls().setPosition(((float) time) / length); + } + } + //System.out.println("playing"); + finished = false; + //embeddedMediaPlayer.controls().setRepeat(true); + } + + }); + //embeddedMediaPlayer.controls().setRepeat(true); + mediaListPlayer = mediaPlayerFactory.mediaPlayers().newMediaListPlayer(); + + mediaListPlayer.events().addMediaListPlayerEventListener(new MediaListPlayerEventAdapter() { + @Override + public void nextItem(MediaListPlayer mediaListPlayer, MediaRef item) { + //System.out.println("nextItem()"); + } + }); + + mediaListPlayer.mediaPlayer().setMediaPlayer(embeddedMediaPlayer); + + + + mediaListPlayer.controls().setMode(PlaybackMode.LOOP); + } + + public boolean isFinished() { + return finished; + } + + + + private class MyRenderCallback implements RenderCallback { + + private List videoSurfaces; + private int width; + private int height; + private BufferedImage image; + private int[] rgbBuffer; + + public BufferedImage getImage() { + return image; + } + + public void sendImage() { + for (FrameListener fl : videoSurfaces) { + fl.newFrameRecieved(this.image); + } + } + + + + public MyRenderCallback(List listeners) { + this.videoSurfaces = listeners; + } + + @Override + public void display(uk.co.caprica.vlcj.player.base.MediaPlayer mediaPlayer, ByteBuffer[] nativeBuffers, BufferFormat bufferFormat) { + synchronized (displayLock) { + if (singleFrame) { + singleFrame = false; + if (image == null) { + this.width = bufferFormat.getWidth(); + this.height = bufferFormat.getHeight(); + this.image = new BufferedImage(this.width, this.height, BufferedImage.TYPE_INT_ARGB); + rgbBuffer = new int[image.getWidth() * image.getHeight()]; + } + + nativeBuffers[0].asIntBuffer().get(rgbBuffer, 0, bufferFormat.getHeight() * bufferFormat.getWidth()); + image.setRGB(0, 0, image.getWidth(), image.getHeight(), rgbBuffer, 0, image.getWidth()); + + + } + + if (!loaded) { + loaded = true; + //System.out.println("just loaded"); + if (positionSet) { + embeddedMediaPlayer.controls().setPosition(position); + } else { + embeddedMediaPlayer.controls().setPosition(((float) time) / length); + } + } + } + embeddedMediaPlayer.controls().pause(); + sendImage(); + //System.out.println("display return"); + } + } +} diff --git a/nbproject/project.xml b/nbproject/project.xml index 427da9d9c..19b61acf4 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -238,21 +238,17 @@ test - + libsrc/ffdec_lib/src - + libsrc/ffdec_lib/test - + libsrc/ffdec_lib/lexers - - - libsrc/ffdec_lib/graphviz - build.xml @@ -324,7 +320,7 @@ src - lib/LZMA.jar;lib/jna-3.5.1.jar;lib/jpproxy.jar;lib/trident-6.2.jar;lib/substance-flamingo-6.2.jar;lib/flamingo-6.2.jar;lib/substance-6.2.jar;lib/jl1.0.1.jar;lib/nellymoser.jar;lib/gif.jar;lib/avi.jar;lib/ttf.jar;lib/jpacker.jar;lib/sfntly.jar;lib/gnujpdf.jar;libsrc/ffdec_lib/src;lib/tablelayout.jar;lib/jsyntaxpane-0.9.5.jar;lib/JavactiveX.jar;lib/flashdebugger.jar;lib/treetable.jar;lib/minimal-json-0.9.5.jar;lib/graphs.jar + lib/LZMA.jar;lib/jpproxy.jar;lib/trident-6.2.jar;lib/substance-flamingo-6.2.jar;lib/flamingo-6.2.jar;lib/substance-6.2.jar;lib/jl1.0.1.jar;lib/nellymoser.jar;lib/gif.jar;lib/avi.jar;lib/ttf.jar;lib/jpacker.jar;lib/sfntly.jar;lib/gnujpdf.jar;libsrc/ffdec_lib/src;lib/tablelayout.jar;lib/jsyntaxpane-0.9.5.jar;lib/JavactiveX.jar;lib/flashdebugger.jar;lib/treetable.jar;lib/minimal-json-0.9.5.jar;lib/graphs.jar;lib/vlcj-4.7.3.jar;lib/jna-5.11.0.jar;lib/jna-platform-5.11.0.jar build javadoc reports diff --git a/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/src/com/jpexs/decompiler/flash/gui/MainPanel.java index 8974df332..f82a57347 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/MainPanel.java @@ -132,6 +132,7 @@ import com.jpexs.decompiler.flash.tags.DefineButtonTag; import com.jpexs.decompiler.flash.tags.DefineShape2Tag; import com.jpexs.decompiler.flash.tags.DefineSoundTag; import com.jpexs.decompiler.flash.tags.DefineSpriteTag; +import com.jpexs.decompiler.flash.tags.DefineVideoStreamTag; import com.jpexs.decompiler.flash.tags.DoActionTag; import com.jpexs.decompiler.flash.tags.DoInitActionTag; import com.jpexs.decompiler.flash.tags.EndTag; @@ -4608,6 +4609,9 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se return; } boolean internalViewer = !isAdobeFlashPlayerEnabled(); + + boolean isVideoButNotDrawable = (treeItem instanceof DefineVideoStreamTag) && (!Configuration.vlcPlayerLocation.hasValue() || !new File(Configuration.vlcPlayerLocation.get()).exists()); + if (treeItem instanceof SWF) { SWF swf = (SWF) treeItem; if (internalViewer) { @@ -4640,7 +4644,7 @@ public final class MainPanel extends JPanel implements TreeSelectionListener, Se SWF imageSWF = makeTimelinedImage(imageTag); previewPanel.showImagePanel(imageSWF, imageSWF, 0, false, true, true, true); - } else if ((treeItem instanceof DrawableTag) && (!(treeItem instanceof TextTag)) && (!(treeItem instanceof FontTag)) && internalViewer) { + } else if (!isVideoButNotDrawable && (treeItem instanceof DrawableTag) && (!(treeItem instanceof TextTag)) && (!(treeItem instanceof FontTag)) && internalViewer) { final Tag tag = (Tag) treeItem; DrawableTag d = (DrawableTag) tag; Timelined timelined; diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties index fd9bb5cbf..fd00bb7c3 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog.properties @@ -623,3 +623,8 @@ config.description.flattenASPackages = Make one item per package instead of pack config.name.gui.scale = UI scale factor config.description.gui.scale = Scaling factor of graphics interface. Set this to 2.0 on Mac retina displays. Application true exit (not just restart after asking) is required. + + +config.name.vlcPlayerLocation = 7) VLC Player directory location +config.description.vlcPlayerLocation = VLC player directory location. It is used for video tags playback. + diff --git a/src/com/sun/jna/platform/win32/Advapi32Util.java b/src/com/sun/jna/platform/win32/Advapi32Util.java index bb3b6c08c..7a469e10c 100644 --- a/src/com/sun/jna/platform/win32/Advapi32Util.java +++ b/src/com/sun/jna/platform/win32/Advapi32Util.java @@ -253,7 +253,7 @@ public abstract class Advapi32Util { ArrayList result = new ArrayList<>(); int offset = 0; while (offset < data.size()) { - String s = data.getString(offset, true); + String s = data.getString(offset); //FIXME, true); offset += s.length() * Native.WCHAR_SIZE; offset += Native.WCHAR_SIZE; result.add(s); @@ -533,7 +533,7 @@ public abstract class Advapi32Util { int offset = 0; Memory data = new Memory(size); for (String s : arr) { - data.setString(offset, s, true); + data.setString(offset, s);//FIXME, true); offset += s.length() * Native.WCHAR_SIZE; offset += Native.WCHAR_SIZE; } @@ -771,7 +771,7 @@ public abstract class Advapi32Util { } case WinNT.REG_SZ: case WinNT.REG_EXPAND_SZ: { - keyValues.put(nameString, byteData.getString(0, true)); + keyValues.put(nameString, byteData.getString(0)); //FIXME, true); break; } case WinNT.REG_BINARY: { @@ -784,7 +784,7 @@ public abstract class Advapi32Util { ArrayList result = new ArrayList<>(); int offset = 0; while (offset < stringData.size()) { - String s = stringData.getString(offset, true); + String s = stringData.getString(offset); //FIXME, true); offset += s.length() * Native.WCHAR_SIZE; offset += Native.WCHAR_SIZE; result.add(s); @@ -965,7 +965,7 @@ public abstract class Advapi32Util { public EventLogRecord(Pointer pevlr) { _record = new EVENTLOGRECORD(pevlr); - _source = pevlr.getString(_record.size(), true); + _source = pevlr.getString(_record.size()); //, true); FIXME // data if (_record.DataLength.intValue() > 0) { _data = pevlr.getByteArray(_record.DataOffset.intValue(), @@ -977,7 +977,7 @@ public abstract class Advapi32Util { int count = _record.NumStrings.intValue(); long offset = _record.StringOffset.intValue(); while (count > 0) { - String s = pevlr.getString(offset, true); + String s = pevlr.getString(offset); //FIXME, true); strings.add(s); offset += s.length() * Native.WCHAR_SIZE; offset += Native.WCHAR_SIZE; diff --git a/src/com/sun/jna/platform/win32/BaseTSD.java b/src/com/sun/jna/platform/win32/BaseTSD.java index 64f38c753..060353a6c 100644 --- a/src/com/sun/jna/platform/win32/BaseTSD.java +++ b/src/com/sun/jna/platform/win32/BaseTSD.java @@ -17,6 +17,7 @@ package com.sun.jna.platform.win32; import com.sun.jna.IntegerType; +import com.sun.jna.Native; import com.sun.jna.Pointer; import com.sun.jna.ptr.ByReference; import com.sun.jna.win32.StdCallLibrary; @@ -40,7 +41,7 @@ public interface BaseTSD extends StdCallLibrary { } public LONG_PTR(long value) { - super(Pointer.SIZE, value); + super(Native.POINTER_SIZE, value); } public Pointer toPointer() { @@ -72,7 +73,7 @@ public interface BaseTSD extends StdCallLibrary { } public ULONG_PTR(long value) { - super(Pointer.SIZE, value, true); + super(Native.POINTER_SIZE, value, true); } public Pointer toPointer() { @@ -90,12 +91,12 @@ public interface BaseTSD extends StdCallLibrary { } public ULONG_PTRByReference(ULONG_PTR value) { - super(Pointer.SIZE); + super(Native.POINTER_SIZE); setValue(value); } public void setValue(ULONG_PTR value) { - if (Pointer.SIZE == 4) { + if (Native.POINTER_SIZE == 4) { getPointer().setInt(0, value.intValue()); } else { getPointer().setLong(0, value.longValue()); @@ -103,7 +104,7 @@ public interface BaseTSD extends StdCallLibrary { } public ULONG_PTR getValue() { - return new ULONG_PTR(Pointer.SIZE == 4 + return new ULONG_PTR(Native.POINTER_SIZE == 4 ? getPointer().getInt(0) : getPointer().getLong(0)); } @@ -119,7 +120,7 @@ public interface BaseTSD extends StdCallLibrary { } public DWORD_PTR(long value) { - super(Pointer.SIZE, value); + super(Native.POINTER_SIZE, value); } } diff --git a/src/com/sun/jna/platform/win32/WinBase.java b/src/com/sun/jna/platform/win32/WinBase.java index ab85662d1..89be1d9d1 100644 --- a/src/com/sun/jna/platform/win32/WinBase.java +++ b/src/com/sun/jna/platform/win32/WinBase.java @@ -16,6 +16,7 @@ */ package com.sun.jna.platform.win32; +import com.sun.jna.Native; import com.sun.jna.Platform; import com.sun.jna.Pointer; import com.sun.jna.Structure; @@ -39,7 +40,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { * Constant value representing an invalid HANDLE. */ HANDLE INVALID_HANDLE_VALUE - = new HANDLE(Pointer.createConstant(Pointer.SIZE == 8 + = new HANDLE(Pointer.createConstant(Native.POINTER_SIZE == 8 ? -1 : 0xFFFFFFFFL)); /** diff --git a/src/com/sun/jna/platform/win32/WinDef.java b/src/com/sun/jna/platform/win32/WinDef.java index 768c64f96..694544f72 100644 --- a/src/com/sun/jna/platform/win32/WinDef.java +++ b/src/com/sun/jna/platform/win32/WinDef.java @@ -17,6 +17,7 @@ package com.sun.jna.platform.win32; import com.sun.jna.IntegerType; +import com.sun.jna.Native; import com.sun.jna.Pointer; import com.sun.jna.Structure; import com.sun.jna.platform.win32.BaseTSD.LONG_PTR; @@ -510,7 +511,7 @@ public interface WinDef extends StdCallLibrary { * Instantiates a new int ptr. */ public INT_PTR() { - super(Pointer.SIZE); + super(Native.POINTER_SIZE); } /** @@ -519,7 +520,7 @@ public interface WinDef extends StdCallLibrary { * @param value the value */ public INT_PTR(long value) { - super(Pointer.SIZE, value); + super(Native.POINTER_SIZE, value); } /** @@ -541,7 +542,7 @@ public interface WinDef extends StdCallLibrary { * Instantiates a new uint ptr. */ public UINT_PTR() { - super(Pointer.SIZE); + super(Native.POINTER_SIZE); } /** @@ -550,7 +551,7 @@ public interface WinDef extends StdCallLibrary { * @param value the value */ public UINT_PTR(long value) { - super(Pointer.SIZE, value, true); + super(Native.POINTER_SIZE, value, true); } /** diff --git a/src/com/sun/jna/platform/win32/WinNT.java b/src/com/sun/jna/platform/win32/WinNT.java index 8c1a1fe3a..6b63af9f9 100644 --- a/src/com/sun/jna/platform/win32/WinNT.java +++ b/src/com/sun/jna/platform/win32/WinNT.java @@ -18,6 +18,7 @@ package com.sun.jna.platform.win32; import com.sun.jna.FromNativeContext; import com.sun.jna.Memory; +import com.sun.jna.Native; import com.sun.jna.NativeLong; import com.sun.jna.Pointer; import com.sun.jna.PointerType; @@ -1070,7 +1071,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { } public HANDLEByReference(HANDLE h) { - super(Pointer.SIZE); + super(Native.POINTER_SIZE); setValue(h); } diff --git a/src/com/sun/jna/platform/win32/WinReg.java b/src/com/sun/jna/platform/win32/WinReg.java index 2bcc94fc3..6e4ce7b3b 100644 --- a/src/com/sun/jna/platform/win32/WinReg.java +++ b/src/com/sun/jna/platform/win32/WinReg.java @@ -16,6 +16,7 @@ */ package com.sun.jna.platform.win32; +import com.sun.jna.Native; import com.sun.jna.Pointer; import com.sun.jna.platform.win32.WinNT.HANDLE; import com.sun.jna.ptr.ByReference; @@ -51,7 +52,7 @@ public interface WinReg extends StdCallLibrary { } public HKEYByReference(HKEY h) { - super(Pointer.SIZE); + super(Native.POINTER_SIZE); setValue(h); }