gpu: reading image will return its actual channel count and mov encoder will actually use it

assets/disk0/encodeipf.js

@@ -101,7 +101,7 @@ infile = sys.malloc(fileLen)
 dma.comToRam(0, 0, infile, fileLen)
 
 // decode
-const [imgw, imgh, imageData, channels] = graphics.decodeImage(infile, fileLen) // stored as [R | G | B | (A)]
+const [imgw, imgh, channels, imageData] = graphics.decodeImage(infile, fileLen) // stored as [R | G | B | (A)]
 sys.free(infile)
 let hasAlpha = (4 == channels) && configUseAlpha
 let outBlock = sys.malloc(64)

assets/disk0/encodeipf2.js

@@ -105,7 +105,7 @@ infile = sys.malloc(fileLen)
 dma.comToRam(0, 0, infile, fileLen)
 
 // decode
-const [imgw, imgh, imageData, channels] = graphics.decodeImage(infile, fileLen) // stored as [R | G | B | (A)]
+const [imgw, imgh, channels, imageData] = graphics.decodeImage(infile, fileLen) // stored as [R | G | B | (A)]
 sys.free(infile)
 let hasAlpha = (4 == channels) && configUseAlpha
 let outBlock = sys.malloc(64)

assets/disk0/encodemovipf.js

@@ -47,12 +47,12 @@ for (let f = 1; f <= TOTAL_FRAMES; f++) {
     let fileLen = filesystem.getFileLen("A")
     dma.comToRam(0, 0, infile, fileLen)
 
-    graphics.decodeImageTo(infile, fileLen, imagearea)
+    let [_1, _2, channels, _3] = graphics.decodeImageTo(infile, fileLen, imagearea)
 
-    print(`Encoding frame ${f}...`)
+    print(`Frame ${f}/${TOTAL_FRAMES} (Ch: ${channels}) ->`)
 
 //    graphics.imageToDisplayableFormat(imagearea, decodearea, 560, 448, 3, 1)
-    graphics.encodeIpf1(imagearea, ipfarea, WIDTH, HEIGHT, 3, false, f)
+    graphics.encodeIpf1(imagearea, ipfarea, WIDTH, HEIGHT, channels, false, f)
 
     let gzlen = gzip.compFromTo(ipfarea, FBUF_SIZE, gzippedImage)
 

assets/disk0/encodemovipf2.js

@@ -47,12 +47,12 @@ for (let f = 1; f <= TOTAL_FRAMES; f++) {
     let fileLen = filesystem.getFileLen("A")
     dma.comToRam(0, 0, infile, fileLen)
 
-    graphics.decodeImageTo(infile, fileLen, imagearea)
+    let [_1, _2, channels, _3] = graphics.decodeImageTo(infile, fileLen, imagearea)
 
-    print(`Encoding frame ${f}...`)
+    print(`Frame ${f}/${TOTAL_FRAMES} (Ch: ${channels}) ->`)
 
 //    graphics.imageToDisplayableFormat(imagearea, decodearea, 560, 448, 3, 1)
-    graphics.encodeIpf2(imagearea, ipfarea, WIDTH, HEIGHT, 3, false, f)
+    graphics.encodeIpf2(imagearea, ipfarea, WIDTH, HEIGHT, channels, false, f)
 
     let gzlen = gzip.compFromTo(ipfarea, FBUF_SIZE, gzippedImage)
 

assets/disk0/home/jpdectest.js

@@ -18,7 +18,7 @@ dma.comToRam(0, 0, infile, fileLen)
 println("decoding")
 
 // decode
-const [imgw, imgh, imageData] = graphics.decodeImageResample(infile, fileLen, -1, -1)
+const [imgw, imgh, channels, imageData] = graphics.decodeImageResample(infile, fileLen, -1, -1)
 
 println(`dim: ${imgw}x${imgh}`)
 println(`converting to displayable format...`)

assets/disk0/home/jpdectesthigh.js

@@ -18,7 +18,7 @@ dma.comToRam(0, 0, infile, fileLen)
 println("decoding")
 
 // decode
-const [imgw, imgh, imageData] = graphics.decodeImageResample(infile, fileLen, -1, -1)
+const [imgw, imgh, channels, imageData] = graphics.decodeImageResample(infile, fileLen, -1, -1)
 
 println(`dim: ${imgw}x${imgh}`)
 println(`converting to displayable format...`)

assets/disk0/movprobe.js

@@ -0,0 +1,153 @@
+
+let filename = exec_args[1]
+
+const MAGIC = [0x1F, 0x54, 0x53, 0x56, 0x4D, 0x4D, 0x4F, 0x56]
+const port = filesystem._toPorts("A")[0]
+
+com.sendMessage(port, "DEVRST\x17")
+com.sendMessage(port, `OPENR"${filename}",1`)
+let statusCode = com.getStatusCode(port)
+
+if (statusCode != 0) {
+    printerrln(`No such file (${statusCode})`)
+    return statusCode
+}
+
+com.sendMessage(port, "READ")
+statusCode = com.getStatusCode(port)
+if (statusCode != 0) {
+    printerrln("READ failed with "+statusCode)
+    return statusCode
+}
+
+let readCount = 0
+
+function readBytes(length) {
+    let ptr = sys.malloc(length)
+    let requiredBlocks = Math.floor((readCount + length) / 4096) - Math.floor(readCount / 4096)
+
+    let completedReads = 0
+
+    //serial.println(`readBytes(${length}); readCount = ${readCount}`)
+
+    for (let bc = 0; bc < requiredBlocks + 1; bc++) {
+        if (completedReads >= length) break
+
+        if (readCount % 4096 == 0) {
+            //serial.println("READ from serial")
+            // pull the actual message
+            sys.poke(-4093 - port, 6);sys.sleep(0) // spinning is required as Graal run is desynced with the Java side
+
+            let blockTransferStatus = ((sys.peek(-4085 - port*2) & 255) | ((sys.peek(-4086 - port*2) & 255) << 8))
+            let thisBlockLen = blockTransferStatus & 4095
+            if (thisBlockLen == 0) thisBlockLen = 4096 // [1, 4096]
+            let hasMore = (blockTransferStatus & 0x8000 != 0)
+
+
+            //serial.println(`block: (${thisBlockLen})[${[...Array(thisBlockLen).keys()].map(k => (sys.peek(-4097 - k) & 255).toString(16).padStart(2,'0')).join()}]`)
+
+            let remaining = Math.min(thisBlockLen, length - completedReads)
+
+            //serial.println(`Pulled a block (${thisBlockLen}); readCount = ${readCount}, completedReads = ${completedReads}, remaining = ${remaining}`)
+
+            // copy from read buffer to designated position
+            sys.memcpy(-4097, ptr + completedReads, remaining)
+
+            // increment readCount properly
+            readCount += remaining
+            completedReads += remaining
+        }
+        else {
+            let padding = readCount % 4096
+            let remaining = length - completedReads
+            let thisBlockLen = Math.min(4096 - padding, length - completedReads)
+
+            //serial.println(`padding = ${padding}; remaining = ${remaining}`)
+
+            //serial.println(`block: (${thisBlockLen})[${[...Array(thisBlockLen).keys()].map(k => (sys.peek(-4097 - padding - k) & 255).toString(16).padStart(2,'0')).join()}]`)
+
+            //serial.println(`Reusing a block (${thisBlockLen}); readCount = ${readCount}, completedReads = ${completedReads}`)
+
+            // copy from read buffer to designated position
+            sys.memcpy(-4097 - padding, ptr + completedReads, thisBlockLen)
+
+            // increment readCount properly
+            readCount += thisBlockLen
+            completedReads += thisBlockLen
+        }
+    }
+
+    //serial.println(`END readBytes(${length}); readCount = ${readCount}\n`)
+
+    return ptr
+}
+
+function readInt() {
+    let b = readBytes(4)
+    let i = (sys.peek(b) & 255) | ((sys.peek(b+1) & 255) << 8) | ((sys.peek(b+2) & 255) << 16) | ((sys.peek(b+3) & 255) << 24)
+
+    //serial.println(`readInt(); bytes: ${sys.peek(b)}, ${sys.peek(b+1)}, ${sys.peek(b+2)}, ${sys.peek(b+3)} = ${i}\n`)
+
+    sys.free(b)
+    return i
+}
+
+function readShort() {
+    let b = readBytes(2)
+    let i = (sys.peek(b) & 255) | ((sys.peek(b+1) & 255) << 8)
+
+    //serial.println(`readShort(); bytes: ${sys.peek(b)}, ${sys.peek(b+1)} = ${i}\n`)
+
+    sys.free(b)
+    return i
+}
+
+
+let magic = readBytes(8)
+let magicMatching = true
+
+// check if magic number matches
+MAGIC.forEach((b,i) => {
+    let testb = sys.peek(magic + i) & 255 // for some reason this must be located here
+    if (testb != b) {
+        magicMatching = false
+    }
+})
+sys.free(magic)
+if (!magicMatching) {
+    println("Not a movie file (MAGIC mismatch)")
+    return 1
+}
+
+function toCodecStr(i) {
+    let low = i & 255
+    let high = (i >> 8) & 255
+
+    return (0 == low) ? "RAW256.gz" :
+             (1 == low) ? "RAW256PAL.gz" :
+             (2 == low) ? "RAW4096.gz" :
+             (4 == low || 5 == low) ? `IPF${high+1}${(5 == low) ? "A" : ""}.gz` :
+             (16 == low) ? "MJPEG" :
+             (18 == low) ? "MPNG" :
+             (20 == low) ? "MTGA" :
+             (21 == low) ? "MTGA.gz" :
+             (255 == low) ? "(frame-dependent)" :
+             `Unknown: ${low},${high}`
+}
+
+let width = readShort()
+let height = readShort()
+let fps = readShort(); if (fps == 0) fps = 9999
+let frameTime = 1.0 / fps
+let frameCount = readInt()
+let type = 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}`)
+
+
+println(`Dim: ${width}x${height}`)
+println(`Frames: ${frameCount} at rate of ${fps} fps`)
+println(`Codec: ${toCodecStr(type)}`)