LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-04 10:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

video playback speed, hangs fixes, correct frame display

Browse Source
This commit is contained in:
Jindra Petřík
2022-12-04 23:22:40 +01:00
parent 85668bbb07
commit 1ba6b91965
4 changed files with 66 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
libsrc/ffdec_lib/src/com/jpexs/video/SimpleMediaPlayer.java
View File

@@ -40,7 +40,7 @@ public class SimpleMediaPlayer {
private final EmbeddedMediaPlayer embeddedMediaPlayer;
private final MediaListPlayer mediaListPlayer;
private final MediaPlayerFactory mediaPlayerFactory;
private boolean paused = true;
private boolean paused = false;
private long time = 0L;
@@ -93,41 +93,7 @@ public class SimpleMediaPlayer {
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) {
@@ -136,9 +102,13 @@ public class SimpleMediaPlayer {
singleFrame = true;
}
//System.out.println("setting position: "+ position);
embeddedMediaPlayer.controls().pause();
if (!isPaused()) {
embeddedMediaPlayer.controls().pause();
}
embeddedMediaPlayer.controls().setPosition(position);
embeddedMediaPlayer.controls().play();
//embeddedMediaPlayer.controls().nextFrame();
setPaused(false);
embeddedMediaPlayer.controls().play();
/*if (paused) {
try {
displayLock.wait();
@@ -151,10 +121,14 @@ public class SimpleMediaPlayer {
//embeddedMediaPlayer.controls().play();
}
public boolean isPaused() {
public synchronized boolean isPaused() {
return paused;
}
public synchronized void setPaused(boolean val) {
this.paused = val;
}
/*public void rewind() {
System.out.println("rewinding");
//embeddedMediaPlayer.controls().stop();
@@ -230,11 +204,15 @@ public class SimpleMediaPlayer {
@Override
public void stopped(MediaPlayer mediaPlayer) {
System.out.println("stopped");
//System.out.println("stopped");
}
@Override
public void paused(MediaPlayer mediaPlayer) {
setPaused(true);
}
@Override
public void playing(uk.co.caprica.vlcj.player.base.MediaPlayer mediaPlayer) {
@@ -247,6 +225,7 @@ public class SimpleMediaPlayer {
}
//System.out.println("playing");
finished = false;
setPaused(false);
//embeddedMediaPlayer.controls().setRepeat(true);
}
@@ -301,7 +280,7 @@ public class SimpleMediaPlayer {
@Override
public void display(uk.co.caprica.vlcj.player.base.MediaPlayer mediaPlayer, ByteBuffer[] nativeBuffers, BufferFormat bufferFormat) {
synchronized (displayLock) {
if (singleFrame) {
if (singleFrame) {
singleFrame = false;
if (image == null) {
this.width = bufferFormat.getWidth();
@@ -326,8 +305,10 @@ public class SimpleMediaPlayer {
}
}
}
embeddedMediaPlayer.controls().pause();
sendImage();
if (!isPaused()) {
embeddedMediaPlayer.controls().pause();
}
sendImage();
//System.out.println("display return");
}
}