curioustorvald/tsvm
1
0
Fork 0
mirror of https://github.com/curioustorvald/tsvm.git synced 2026-03-07 19:51:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

mov: mp2 packet now has no length bytes as they are redundant

Browse Source
This commit is contained in:
minjaesong
2023-01-20 03:17:39 +09:00
parent dedc910155
commit b1041dff5f
3 changed files with 55 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
assets/disk0/tvdos/bin/encodemov.js
View File

@@ -8,13 +8,14 @@ let HEIGHT = 448
let PATHFUN = (i) => `/namu2/${(''+i).padStart(5,'0')}.png` // how can be the image file found, if a frame number (starts from 1) were given
let AUDIOTRACK = 'namu.mp2'
let AUDIOFORMAT = 'MP2fr' // PCMu8 or MP2fr
let MP2_PACKETSIZE;
// to export video to its frames:
// 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
let MP2_RATE_INDEX;
let MP2_PACKETSIZE;
let outfilename = exec_args[1]
if (!outfilename) {
@@ -43,7 +44,7 @@ function appendToOutfilePtr(ptr, len) {
function audioFormatToAudioPacketType() {
return ("PCMu8" == AUDIOFORMAT) ? [1, 16]
: ("MP2fr" == AUDIOFORMAT) ? [1, 17]
: ("MP2fr" == AUDIOFORMAT) ? [255, 17]
: [255, 16]
}
@@ -87,6 +88,25 @@ function getRepeatCount(fnum) {
}
}
function mp2PacketSizeToRateIndex(packetSize, isMono) {
let r = (144 == packetSize) ? 0
: (216 == packetSize) ? 2
: (252 == packetSize) ? 4
: (288 == packetSize) ? 6
: (360 == packetSize) ? 8
: (432 == packetSize) ? 10
: (504 == packetSize) ? 12
: (576 == packetSize) ? 14
: (720 == packetSize) ? 16
: (864 == packetSize) ? 18
: (1008 == packetSize) ? 20
: (1152 == packetSize) ? 22
: (1440 == packetSize) ? 24
: (1728 == packetSize) ? 26 : undefined
if (r === undefined) throw Error("Unknown MP2 Packet Size: "+packetSize)
return r + isMono
}
let audioSamplesWrote = 0
for (let f = 1; ; f++) {
@@ -115,6 +135,7 @@ for (let f = 1; ; f++) {
if (!MP2_PACKETSIZE) {
audioFile.pread(infile, 3, 0)
MP2_PACKETSIZE = audio.mp2GetInitialFrameSize([sys.peek(infile),sys.peek(infile+1),sys.peek(infile+2)])
audioPacketType[0] = mp2PacketSizeToRateIndex(MP2_PACKETSIZE, sys.peek(infile+4) >> 6 == 3)
}
actualBytesToRead = Math.min(MP2_PACKETSIZE, audioRemaining)
@@ -132,7 +153,7 @@ for (let f = 1; ; f++) {
]
appendToOutfile(audioPacketType)
appendToOutfile(audioSize)
if ("MP2fr" != AUDIOFORMAT) appendToOutfile(audioSize);
appendToOutfilePtr(infile, actualBytesToRead)

8
assets/disk0/tvdos/bin/playmov.js
View File

@@ -6,7 +6,7 @@ const FBUF_SIZE = WIDTH * HEIGHT
const AUTO_BGCOLOUR_CHANGE = true
const MAGIC = [0x1F, 0x54, 0x53, 0x56, 0x4D, 0x4D, 0x4F, 0x56]
const pcm = require("pcm")
const MP2_FRAME_SIZE = [144,216,252,288,360,432,504,576,720,864,1008,1152,1440,1728]
const fullFilePath = _G.shell.resolvePathInput(exec_args[1])
const FILE_LENGTH = files.open(fullFilePath.full).size
@@ -227,11 +227,13 @@ while (!stopPlay && seqread.getReadCount() < FILE_LENGTH) {
}
// audio packets
else if (4096 <= packetType && packetType <= 6143) {
let readLength = seqread.readInt()
let readLength = (packetType >>> 8 == 17) ?
MP2_FRAME_SIZE[(packetType & 255) >>> 1] // if the packet is MP2, deduce it from the packet type
: seqread.readInt() // else, read 4 more bytes
if (readLength == 0) throw Error("Readlength is zero")
// MP2
if (packetType == 0x1100 || packetType == 0x1101) {
if (packetType >>> 8 == 17) {
if (audioQueue[audioQueuePos] === undefined) {
// throw Error(`Audio queue overflow: attempt to write to index ${audioQueuePos}; queue size: ${audioQueue.length}; frame: ${framesRead}`)
AUDIO_QUEUE_LENGTH += 1