Mostly done, just gotta put it on a calculator

Author: AlexApps99

badapple.sh

@@ -3,29 +3,30 @@
 W=80
 H=64
 VID_SIZE="${W}x${H}"
-FPS=30
+FPS=20
 
 # Download video
+echo "Downloading video..."
 youtube-dl https://www.youtube.com/watch?v=FtutLA63Cp8 -o bad
 
+echo "Converting video..."
 # Convert video to two tone black and white
-# This approach had too much dithering
-#ffmpeg -hide_banner -loglevel error -y -i bad.mkv -vf "fps=$FPS,scale=$VID_SIZE,format=monob" -sws_dither none -f rawvideo worse
-
-# This approach has weird jagged edges and I don't like it much either, oh well...
-ffmpeg -hide_banner -loglevel error -y -i bad.mkv -f lavfi -i color=gray -f lavfi -i color=black -f lavfi -i color=white -lavfi "fps=$FPS,scale=320:240,threshold,scale=$VID_SIZE,format=monob" -sws_dither none -f rawvideo bad_mono
+ffmpeg -hide_banner -loglevel error -y -i bad.mkv -vf "fps=$FPS,scale=$VID_SIZE,format=monob" -f rawvideo bad_mono
+du -bsh bad_mono | cut -f -1
 
 # Script to encode the video
-python3 videnc.py
-
-# Compare file sizes
-du -bsh bad_mono bad_mono.enc
+echo "Encoding video..."
+python3 videnc.py $W $H
+du -bsh bad_mono.enc | cut -f -1
 
 # Compile decoder
-cc decoder/main.c -o decoder/decoder
+echo "Compiling decoder..."
+cc -DW=$W -DH=$H -DNDEBUG -O2 decoder/main.c -o decoder/decoder
 
 # Test decoder against original data
+echo "Testing decoder..."
 decoder/decoder | cmp - bad_mono
 
 # Display decoded video
+echo "Displaying decoded video..."
 decoder/decoder | ffplay -hide_banner -loglevel error -f rawvideo -pixel_format monob -video_size $VID_SIZE -framerate $FPS pipe:

decoder/main.c

@@ -3,9 +3,8 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
-#define W (80)
-#define H (64)
 #define PIXELS (W * H)
 #define VRAM_BYTES (PIXELS / 8)
 #define MIN_RLE_SIZE (PIXELS / 128)
@@ -15,7 +14,7 @@ static uint8_t buf[MIN_RLE_SIZE] = {0};
 static uint16_t pixels = 0;
 static FILE *f = NULL;
 
-static void full() { assert(fread(vram, VRAM_BYTES, 1, f) == 1); }
+static void full() { fread(vram, VRAM_BYTES, 1, f); }
 
 #include "rle_dec.h"
 #include "rle_dec_d.h"
@@ -24,12 +23,12 @@ static void full_rle() {
   pixels = 0;
   // By reading a lot at once this will
   // mean less read calls
-  assert(fread(buf, MIN_RLE_SIZE, 1, f) == 1);
+  fread(buf, MIN_RLE_SIZE, 1, f);
   for (uint8_t i = 0; i < MIN_RLE_SIZE; i++) {
     rle_dec(buf[i]);
   }
   while (pixels < PIXELS) {
-    assert(fread(buf, 1, 1, f) == 1);
+    fread(buf, 1, 1, f);
     rle_dec(buf[0]);
   }
 }
@@ -38,16 +37,18 @@ static void delta() {
   pixels = 0;
   // By reading a lot at once this will
   // mean less read calls
-  assert(fread(buf, MIN_RLE_SIZE, 1, f) == 1);
+  fread(buf, MIN_RLE_SIZE, 1, f);
   for (uint8_t i = 0; i < MIN_RLE_SIZE; i++) {
     rle_dec_d(buf[i]);
   }
   while (pixels < PIXELS) {
-    assert(fread(buf, 1, 1, f) == 1);
+    fread(buf, 1, 1, f);
     rle_dec_d(buf[0]);
   }
 }
 
+static void fill(uint8_t col) { memset(vram, col, VRAM_BYTES); }
+
 int main() {
   f = fopen("bad_mono.enc", "rb");
   if (!f)
@@ -67,8 +68,14 @@ int main() {
     case 3: // Delta
       delta();
       break;
+    case 4: // Clear screen
+      fill(0x00);
+      break;
+    case 5: // Clear screen
+      fill(0xFF);
+      break;
     default:
-      assert(69 == 420);
+      assert(buf[0] > 5);
       break;
     }
     fwrite(vram, VRAM_BYTES, 1, stdout);

rle.py

@@ -39,13 +39,13 @@ def rle_enc(byts):
   with open("bad_mono.rle", "wb") as w:
     for bts in rle_enc(byts): w.write(bts)
 
-  import heatshrink2
+  #import heatshrink2
 
-  with heatshrink2.open('bad_mono.rle.bin', 'wb') as w:
-    with open("bad_mono.rle", "rb") as f:
-      w.write(f.read())
+  #with heatshrink2.open('bad_mono.rle.bin', 'wb') as w:
+  #  with open("bad_mono.rle", "rb") as f:
+  #    w.write(f.read())
 
-  with heatshrink2.open('bad_mono.bin', 'wb') as w:
-    with open("bad_mono", "rb") as f:
-      w.write(f.read())
+  #with heatshrink2.open('bad_mono.bin', 'wb') as w:
+  #  with open("bad_mono", "rb") as f:
+  #    w.write(f.read())
 

videnc.py

@@ -1,5 +1,8 @@
+import sys
 from rle import rle_enc, bits
 
+BYTES_NUM = (int(sys.argv[1]) * int(sys.argv[2])) // 8
+
 
 def fullenc(b):
   return b'\x01' + b
@@ -9,7 +12,7 @@ def fullenc_rle(b):
   return b'\x02' + b''.join(rle_enc(b))
 
 
-def blank():
+def unchanged():
   return b'\x00'
 
 
@@ -27,26 +30,38 @@ def delta_rle(byts, prev):
   return b'\x03' + b''.join(rle_enc(xored))
 
 
+def blank(b):
+  if b == b"\x00" * BYTES_NUM:
+    return b'\x04'
+  elif b == b"\xFF" * BYTES_NUM:
+    return b'\x05'
+  else:
+    return None
+
+
 # Some more codes could be made:
 # Blank variants that SET a flat color rather than retain previous frames
 def encoder():
   prev_frame = None
 
   with open("bad_mono", "rb") as f:
-    while (byts := f.read((80 * 64) // 8)):
+    while (byts := f.read(BYTES_NUM)):
       if byts == prev_frame:
-        yield blank()
+        yield unchanged()
       else:
-        full = fullenc(byts)
-        rle = fullenc_rle(byts)
-        dlt = delta_rle(byts, prev_frame)
-
-        if dlt is not None and len(dlt) < len(rle) and len(dlt) < len(full):
-          yield dlt
-        elif len(rle) < len(full):
-          yield rle
+        blk = blank(byts)
+        if blk is not None:
+          yield blk
         else:
-          yield full
+          full = fullenc(byts)
+          rle = fullenc_rle(byts)
+          dlt = delta_rle(byts, prev_frame)
+          if dlt is not None and len(dlt) < len(rle) and len(dlt) < len(full):
+            yield dlt
+          elif len(rle) < len(full):
+            yield rle
+          else:
+            yield full
 
         prev_frame = byts