progressive and interlaced scanning, and fixed video audio sync with previous frame

Author: dynmie

src/main/java/me/dynmie/monolizer/MonoMain.java

@@ -1,6 +1,7 @@
 package me.dynmie.monolizer;
 
 import me.dynmie.monolizer.player.Asciifier;
+import me.dynmie.monolizer.player.ScanType;
 import me.dynmie.monolizer.player.VideoPlayer;
 import org.jline.terminal.Terminal;
 import org.jline.terminal.TerminalBuilder;
@@ -17,6 +18,11 @@
 public class MonoMain {
 
     public static void main(String[] args) throws IOException {
+//        BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(FileDescriptor.out), 1080 * 720 * 22);
+//
+//        PrintStream ps = new PrintStream(bos, false, "CP437"); // autoFlush = true
+//        System.setOut(ps);
+
         Terminal terminal = TerminalBuilder.terminal();
 
         File sourceFile = new File("source.mp4");
@@ -52,7 +58,7 @@ public static void main(String[] args) throws IOException {
 
         NonBlockingReader reader = terminal.reader();
 
-        VideoPlayer player = new VideoPlayer(System.out, sourceFile, width, height, new Asciifier(
+        VideoPlayer player = new VideoPlayer(System.out, sourceFile, width, height, ScanType.PROGRESSIVE, new Asciifier(
                 false,
                 false,
                 true,
@@ -106,6 +112,7 @@ public static void main(String[] args) throws IOException {
                         player.pause();
                     }
                 }
+                case 'i' -> player.setScanType(player.getScanType().next());
                 case 'q' -> player.stop();
             }
         }

src/main/java/me/dynmie/monolizer/player/Asciifier.java

@@ -34,7 +34,7 @@ public Asciifier(boolean color, boolean fullPixel, boolean textDithering, char[]
         this.brightnessLevels = brightnessLevels;
     }
 
-    public String createFrame(BufferedImage image) {
+    public String[] createFrame(BufferedImage image) {
         int width = image.getWidth();
         int height = image.getHeight();
 
@@ -50,6 +50,7 @@ public String createFrame(BufferedImage image) {
                         int currentColor = image.getRGB(x, y);
 
                         boolean almostSameColor = isAlmostSameColor(currentColor, prevColor);
+//                        boolean almostSameColor = false;
 
                         String pixel = createPixel(width, height, x, y, currentColor, almostSameColor, textDitheringErrors);
                         builder.append(pixel);
@@ -61,7 +62,7 @@ public String createFrame(BufferedImage image) {
 
                     lines[y] = builder.toString();
                 });
-        return String.join("\n", lines);
+        return lines;
     }
 
     private String createPixel(int width, int height, int x, int y, int currentColor, boolean almostSameColor, float[][] textDitheringErrors) {

src/main/java/me/dynmie/monolizer/player/ScanType.java

@@ -0,0 +1,14 @@
+package me.dynmie.monolizer.player;
+
+/**
+ * @author dynmie
+ */
+public enum ScanType {
+    PROGRESSIVE,
+    INTERLACED,
+    INTERLACED_NO_PREV;
+
+    public ScanType next() {
+        return values()[(ordinal() + 1) % values().length];
+    }
+}

src/main/java/me/dynmie/monolizer/player/VideoPlayer.java

@@ -27,21 +27,34 @@ public class VideoPlayer {
     private final File source;
     private volatile int width;
     private volatile int height;
+    private volatile ScanType scanType;
     private volatile Asciifier asciifier;
 
     private volatile boolean running = false;
     private volatile boolean paused = false;
 
     private Thread thread;
 
-    public VideoPlayer(OutputStream outputStream, File source, int width, int height, Asciifier asciifier) {
+    private long frameCount = 0;
+    private long lastFrameWriteDelayMicros = 0;
+
+    public VideoPlayer(OutputStream outputStream, File source, int width, int height, ScanType scanType, Asciifier asciifier) {
         this.outputStream = outputStream;
         this.source = source;
         this.width = width;
         this.height = height;
+        this.scanType = scanType;
         this.asciifier = asciifier;
     }
 
+    public ScanType getScanType() {
+        return scanType;
+    }
+
+    public void setScanType(ScanType scanType) {
+        this.scanType = scanType;
+    }
+
     public void setResolution(int width, int height) {
         this.width = width;
         this.height = height;
@@ -180,15 +193,9 @@ private void run() {
                         BufferedImage image = converter.convert(imageFrame);
                         imageFrame.close();
 
-                        String prefix = "";
-                        if (!asciifier.isColor()) {
-                            prefix += ConsoleUtils.getForegroundResetCode();
-                        }
-                        if (!asciifier.isFullPixel()) {
-                            prefix += ConsoleUtils.getBackgroundResetCode();
-                        }
 
-                        String text = prefix + ConsoleUtils.getResetCursorPositionEscapeCode() + asciifier.createFrame(image);
+
+                        String[] text = asciifier.createFrame(image) ;
 
                         atomicQueueSize.incrementAndGet();
                         imageExecutor.submit(() -> {
@@ -203,7 +210,7 @@ private void run() {
                             if (delayMicros < 0 && queueSize > 1) return; // we're behind! skip the frame.
 
                             // recalculate delta
-                            delayMicros = imageFrame.timestamp - playbackTimer.elapsedMicros();
+                            delayMicros = imageFrame.timestamp - playbackTimer.elapsedMicros() - lastFrameWriteDelayMicros;
                             // if video is faster than audio
                             if (delayMicros > 0) {
                                 // wait for audio to catch up with the video
@@ -228,8 +235,25 @@ private void run() {
                                 }
                             }
 
-                            writer.write(text);
-                            writer.flush();
+                            long startTime = System.nanoTime();
+
+                            String prefix = "";
+                            if (!asciifier.isColor()) {
+                                prefix += ConsoleUtils.getForegroundResetCode();
+                            }
+                            if (!asciifier.isFullPixel()) {
+                                prefix += ConsoleUtils.getBackgroundResetCode();
+                            }
+
+                            writer.write(prefix + ConsoleUtils.getResetCursorPositionEscapeCode());
+
+                            writeFrame(writer, text);
+
+                            long endTime = System.nanoTime();
+
+                            lastFrameWriteDelayMicros = TimeUnit.NANOSECONDS.toMicros(endTime - startTime);
+
+                            frameCount++;
                         });
                     });
                 } else if (frame.samples != null) { // if frame is audio frame
@@ -303,6 +327,50 @@ private void run() {
         paused = false;
     }
 
+    private void writeFrame(PrintWriter writer, String[] frame) {
+        switch (scanType) {
+            case INTERLACED -> writeInterlaced(writer, frame, false);
+            case INTERLACED_NO_PREV -> writeInterlaced(writer, frame, true);
+            case PROGRESSIVE -> writeProgressive(writer, frame);
+            default -> throw new IllegalStateException("Unexpected value: " + scanType);
+        }
+    }
+
+    private void writeInterlaced(PrintWriter writer, String[] frame, boolean clearPrevious) {
+        boolean even = (frameCount % 2) == 0;
+
+        for (int i = 0; i < frame.length; i++) {
+            boolean lineEven = (i % 2 == 0);
+
+            boolean shouldNewLine = !((i + 1) % frame.length == 0);
+
+            if (even == lineEven) {
+                writer.write(frame[i]);
+                if (shouldNewLine) {
+                    writer.write("\n");
+                }
+            } else if (shouldNewLine) {
+                if (!clearPrevious) {
+                    writer.write("\033[B");
+                } else {
+                    writer.write(ConsoleUtils.getBackgroundResetCode() + "\033[2K\n");
+                }
+            }
+        }
+
+        writer.flush();
+    }
+
+    private void writeProgressive(PrintWriter writer, String[] frame) {
+        for (int i = 0; i < frame.length; i++) {
+            writer.write(frame[i]);
+            if (!((i + 1) % frame.length == 0)) {
+                writer.write("\n");
+            }
+        }
+        writer.flush();
+    }
+
     private void createThread() {
         if (running) {
             throw new IllegalStateException("This getVideos player is already running!");