fix:playmov not freeing memory

assets/disk0/tvdos/bin/encodemov.js

@@ -1,4 +1,5 @@
 // some manual configurations
+//
 let IPFMODE = 2 // 1 or 2
 let TOTAL_FRAMES = 901
 let FPS = 30
@@ -9,6 +10,8 @@ let PATHFUN = (i) => `/welcome104crop/${(''+i).padStart(5,'0')}.bmp` // how can
 //     ffmpeg -i file.mp4 file/%05d.bmp
 // the input frames must be resized (and cropped) beforehand, using ImageMagick is recommended, like so:
 //     mogrify -path ./path/to/write/results/ -resize 560x448^ -gravity Center -extent 560x448 ./path/to/source/files/*
+//
+// end of manual configuration
 
 const FBUF_SIZE = WIDTH * HEIGHT
 let infile = sys.malloc(512000) // somewhat arbitrary
@@ -34,6 +37,11 @@ function appendToOutfilePtr(ptr, len) {
     outfile.pappend(ptr, len)
 }
 
+let packetType = [
+    4, (IPFMODE - 1)
+]
+let syncPacket = [255, 255]
+
 // write header to the file
 let headerBytes = [
     0x1F, 0x54, 0x53, 0x56, 0x4D, 0x4D, 0x4F, 0x56, // magic
@@ -41,7 +49,7 @@ let headerBytes = [
     HEIGHT & 255, (HEIGHT >> 8) & 255, // height
     FPS & 255, (FPS >> 8) & 255, // FPS
     TOTAL_FRAMES & 255, (TOTAL_FRAMES >> 8) & 255, (TOTAL_FRAMES >> 16) & 255, (TOTAL_FRAMES >> 24) & 255, // frame count
-    0x04, IPFMODE - 1, // type 4 frames (force no-alpha)
+    0xFF, 0x00, // new standard deprecates global type
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // reserved
 ]
 
@@ -51,6 +59,11 @@ if (!ipfFun) throw Error("Unknown IPF mode "+IPFMODE)
 outfile.bwrite(headerBytes)
 
 for (let f = 1; f <= TOTAL_FRAMES; f++) {
+
+    // insert sync packet
+    if (f > 1) appendToOutfile(syncPacket)
+
+
     let fname = PATHFUN(f)
     let framefile = files.open(_G.shell.resolvePathInput(fname).full)
     let fileLen = framefile.size
@@ -73,6 +86,7 @@ for (let f = 1; f <= TOTAL_FRAMES; f++) {
         (gzlen >>> 24) & 255
     ]
 
+    appendToOutfile(packetType)
     appendToOutfile(frameSize)
     appendToOutfilePtr(gzippedImage, gzlen)
 

assets/disk0/tvdos/bin/playmov.js

@@ -1,14 +1,16 @@
 
-let filename = exec_args[1]
-
 const FBUF_SIZE = 560*448
 const MAGIC = [0x1F, 0x54, 0x53, 0x56, 0x4D, 0x4D, 0x4F, 0x56]
 const port = _TVDOS.DRV.FS.SERIAL._toPorts("A")[0]
 
-println("Reading...")
+
+const fullFilePath = _G.shell.resolvePathInput(exec_args[1])
+const FILE_LENGTH = files.open(fullFilePath.full).size
+
+serial.println(`Reading ${FILE_LENGTH} bytes...`)
 
 com.sendMessage(port, "DEVRST\x17")
-com.sendMessage(port, `OPENR"${filename}",1`)
+com.sendMessage(port, `OPENR"${fullFilePath.string}",1`)
 let statusCode = com.getStatusCode(port)
 
 if (statusCode != 0) {
@@ -133,31 +135,32 @@ let fps = readShort(); if (fps == 0) fps = 9999
 
 let frameTime = 1.0 / fps
 let frameCount = readInt() % 16777216
-let type = readShort()
+let globalType = readShort()
 sys.free(readBytes(12)) // skip 12 bytes
 let akku = frameTime
 let framesRendered = 0
 //serial.println(readCount) // must say 18
 //serial.println(`Dim: (${width}x${height}), FPS: ${fps}, Frames: ${frameCount}`)
 
-if (type != 4 && type != 5 && type != 260 && type != 261) {
+/*if (type != 4 && type != 5 && type != 260 && type != 261) {
     printerrln("Not an iPF mov")
     return 1
+}*/
+if (globalType != 255) {
+    printerrln(`Unsupported MOV type (${globalType})`)
+    return 1
 }
 
+
 let ipfbuf = sys.malloc(FBUF_SIZE)
 graphics.setGraphicsMode(4)
 
-let fb1 = sys.malloc(FBUF_SIZE)
-let fb2 = sys.malloc(FBUF_SIZE)
-
 let startTime = sys.nanoTime()
 
-let decodefun = (type > 255) ? graphics.decodeIpf2 : graphics.decodeIpf1
 let framesRead = 0
-let breakReadLoop = false
 
-while (framesRendered < frameCount && !breakReadLoop) {
+renderLoop:
+while (framesRendered < frameCount && readCount < FILE_LENGTH) {
     let t1 = sys.nanoTime()
 
     if (akku >= frameTime) {
@@ -167,29 +170,50 @@ while (framesRendered < frameCount && !breakReadLoop) {
             akku -= frameTime
             frameUnit += 1
         }
-        //frameUnit += 1 // forse set FPS to 9999, comment above WHILE loop and uncomment this line to perform benchmark...?
 
         if (frameUnit != 0) {
             // skip frames if necessary
-            while (frameUnit >= 1) {
+            while (frameUnit >= 1 && readCount < FILE_LENGTH) {
-                let payloadLen = readInt()
 
-                if (framesRead >= frameCount) {
+                let packetType = readShort()
-                    breakReadLoop = true
+
-                    break
+                // sync packets
+                if (65535 == packetType) {
+                    frameUnit -= 1
                 }
+                // video packets
+                else if (packetType < 2047) {
+                    // iPF
+                    if (packetType == 4 || packetType == 5 || packetType == 260 || packetType == 261) {
+                        let decodefun = (packetType > 255) ? graphics.decodeIpf2 : graphics.decodeIpf1
+                        let payloadLen = readInt()
 
-                framesRead += 1
+                        if (framesRead >= frameCount) {
-                let gzippedPtr = readBytes(payloadLen)
+                            break renderLoop
-                framesRendered += 1
+                        }
 
-                if (frameUnit == 1) {
+                        framesRead += 1
-                    gzip.decompFromTo(gzippedPtr, payloadLen, ipfbuf) // should return FBUF_SIZE
+                        let gzippedPtr = readBytes(payloadLen)
-                    decodefun(ipfbuf, -1048577, -1310721, width, height, (type & 255) == 5)
+                        framesRendered += 1
+
+                        if (frameUnit == 1) {
+                            gzip.decompFromTo(gzippedPtr, payloadLen, ipfbuf) // should return FBUF_SIZE
+                            decodefun(ipfbuf, -1048577, -1310721, width, height, (packetType & 255) == 5)
+                        }
+
+                        sys.free(gzippedPtr)
+                    }
+                    else {
+                        throw Error(`Unknown Video Packet with type ${packetType} at offset ${readCount - 2}`)
+                    }
+                }
+                // audio packets
+                else if (4096 <= packetType && packetType <= 6133) {
+                    TODO(`Audio Packet with type ${packetType} at offset ${readCount - 2}`)
+                }
+                else {
+                    TODO(`Unknown Packet with type ${packetType} at offset ${readCount - 2}`)
                 }
-
-                sys.free(gzippedPtr)
-                frameUnit -= 1
             }
         }
         else {

tsvm_executable/src/net/torvald/tsvm/MMUMenu.kt

@@ -103,7 +103,7 @@ class MMUMenu(parent: VMEmuExecutable, x: Int, y: Int, w: Int, h: Int) : EmuMenu
                     batch.color = plotColours[ptr % plotColset.size]
                     batch.fillRect(xoff, yoff + 1, 10, 10)
                     batch.color = Color.WHITE
-                    FONT.draw(batch, "  $size at $ptr", xoff, yoff)
+                    FONT.draw(batch, "  ${size * vm.MALLOC_UNIT} at ${ptr * vm.MALLOC_UNIT}", xoff, yoff)
                 }
             }
         }