curioustorvald/tsvm
1
0
Fork 0
mirror of https://github.com/curioustorvald/tsvm.git synced 2026-06-12 23:54:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

video and audio stuffs; playmov now uses hardware queue

Browse Source
This commit is contained in:
minjaesong
2023-01-23 03:20:35 +09:00
parent e53aa7e98d
commit c1031545ec
7 changed files with 23 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,12 @@
// some manual configurations // some manual configurations
// //
let IPFMODE = 2 // 1 or 2 let IPFMODE = 2 // 1 or 2
let TOTAL_FRAMES = 1318 let TOTAL_FRAMES = 3813
let FPS = 30 let FPS = 30
let WIDTH = 560 let WIDTH = 560
let HEIGHT = 448 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 PATHFUN = (i) => `/ddol2/${(''+i).padStart(5,'0')}.bmp` // how can be the image file found, if a frame number (starts from 1) were given
let AUDIOTRACK = 'namu.mp2' let AUDIOTRACK = 'ddol.mp2'
let AUDIOFORMAT = 'MP2fr' // PCMu8 or MP2fr let AUDIOFORMAT = 'MP2fr' // PCMu8 or MP2fr
// to export video to its frames: // to export video to its frames:
// ffmpeg -i file.mp4 file/%05d.bmp // ffmpeg -i file.mp4 file/%05d.bmp
@@ -16,6 +16,7 @@ let AUDIOFORMAT = 'MP2fr' // PCMu8 or MP2fr
// end of manual configuration // end of manual configuration
let MP2_RATE_INDEX; let MP2_RATE_INDEX;
let MP2_PACKETSIZE; let MP2_PACKETSIZE;
const DECODE_TIME_FACTOR = 1.000
let outfilename = exec_args[1] let outfilename = exec_args[1]
if (!outfilename) { if (!outfilename) {
@@ -52,7 +53,7 @@ const videoPacketType = [4, (IPFMODE - 1)]
const syncPacket = [255, 255] const syncPacket = [255, 255]
const AUDIO_SAMPLE_SIZE = 2 * (((32000 / FPS) + 1)|0) // times 2 because stereo const AUDIO_SAMPLE_SIZE = 2 * (((32000 / FPS) + 1)|0) // times 2 because stereo
const AUDIO_BLOCK_SIZE = ("MP2fr" == AUDIOFORMAT) ? 0x240 : 0 const AUDIO_BLOCK_SIZE = ("MP2fr" == AUDIOFORMAT) ? 0x240 : 0
const AUDIO_QUEUE_SIZE = ("MP2fr" == AUDIOFORMAT) ? Math.ceil(AUDIO_SAMPLE_SIZE / 2304) + 1 : 0 const AUDIO_QUEUE_SIZE = ("MP2fr" == AUDIOFORMAT) ? Math.ceil(AUDIO_SAMPLE_SIZE / (2304 * DECODE_TIME_FACTOR)) + 1 : 0
// write header to the file // write header to the file
let headerBytes = [ let headerBytes = [
0x1F, 0x54, 0x53, 0x56, 0x4D, 0x4D, 0x4F, 0x56, // magic 0x1F, 0x54, 0x53, 0x56, 0x4D, 0x4D, 0x4F, 0x56, // magic
@@ -83,8 +84,8 @@ function getRepeatCount(fnum) {
return (fnum == 1) ? 2 : 1 return (fnum == 1) ? 2 : 1
} }
else if ("MP2fr" == AUDIOFORMAT) { else if ("MP2fr" == AUDIOFORMAT) {
let r = Math.ceil((AUDIO_SAMPLE_SIZE - audioSamplesWrote) / AUDIO_SAMPLE_SIZE) + ((fnum == 1) ? 1 : 0) let r = Math.ceil((AUDIO_SAMPLE_SIZE - audioSamplesWrote) / AUDIO_SAMPLE_SIZE) * ((fnum == 1) ? 2 : 1)
return (fnum > TOTAL_FRAMES) ? Math.ceil(audioRemaining / MP2_PACKETSIZE) : r return (fnum == 2) ? 1 : (fnum > TOTAL_FRAMES) ? Math.ceil(audioRemaining / MP2_PACKETSIZE) : r
} }
} }
@@ -117,7 +118,8 @@ for (let f = 1; ; f++) {
if (audioRemaining > 0) { if (audioRemaining > 0) {
// first frame gets two audio packets // first frame gets two audio packets
for (let repeat = 0; repeat < getRepeatCount(f); repeat++) { let rrrr = getRepeatCount(f) // must be called only once
for (let q = 0; q < rrrr; q++) {
print(`Frame ${f}/${TOTAL_FRAMES} (${AUDIOFORMAT}) ->`) print(`Frame ${f}/${TOTAL_FRAMES} (${AUDIOFORMAT}) ->`)
serial.print(`Frame ${f}/${TOTAL_FRAMES} (${AUDIOFORMAT}) ->`) serial.print(`Frame ${f}/${TOTAL_FRAMES} (${AUDIOFORMAT}) ->`)
@@ -140,7 +142,7 @@ for (let f = 1; ; f++) {
actualBytesToRead = Math.min(MP2_PACKETSIZE, audioRemaining) actualBytesToRead = Math.min(MP2_PACKETSIZE, audioRemaining)
audioFile.pread(infile, actualBytesToRead, audioBytesRead) audioFile.pread(infile, actualBytesToRead, audioBytesRead)
audioSamplesWrote += 2304 if (f > 1) audioSamplesWrote += 2304 / DECODE_TIME_FACTOR // a little hack to ensure first 2 or so frames get more MP2 frames than they should
} }
else throw Error("Unknown audio format: " + AUDIOFORMAT) else throw Error("Unknown audio format: " + AUDIOFORMAT)

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

@@ -47,7 +47,7 @@ const FRAME_TIME = 1.0 / fps
const FRAME_COUNT = seqread.readInt() % 16777216 const FRAME_COUNT = seqread.readInt() % 16777216
const globalType = seqread.readShort() const globalType = seqread.readShort()
const audioQueueInfo = seqread.readShort() const audioQueueInfo = seqread.readShort()
let AUDIO_QUEUE_LENGTH = (audioQueueInfo >> 12) + 1 const AUDIO_QUEUE_LENGTH = (audioQueueInfo >> 12) + 1
const AUDIO_QUEUE_BYTES = (audioQueueInfo & 0xFFF) << 2 const AUDIO_QUEUE_BYTES = (audioQueueInfo & 0xFFF) << 2
sys.free(seqread.readBytes(10)) // skip 12 bytes sys.free(seqread.readBytes(10)) // skip 12 bytes
let audioQueuePos = 0 let audioQueuePos = 0
@@ -71,12 +71,6 @@ graphics.setGraphicsMode(4)
let startTime = sys.nanoTime() let startTime = sys.nanoTime()
let framesRead = 0 let framesRead = 0
let audioFired = false let audioFired = false
let audioQueue = (AUDIO_QUEUE_LENGTH < 1) ? undefined : new Int32Array(AUDIO_QUEUE_LENGTH)
if (AUDIO_QUEUE_BYTES > 0 && AUDIO_QUEUE_LENGTH > 1) {
for (let i = 0; i < AUDIO_QUEUE_LENGTH; i++) {
audioQueue[i] = sys.malloc(AUDIO_QUEUE_BYTES)
}
}
audio.resetParams(0) audio.resetParams(0)
audio.purgeQueue(0) audio.purgeQueue(0)
@@ -231,11 +225,6 @@ while (!stopPlay && seqread.getReadCount() < FILE_LENGTH) {
// MP2 // MP2
if (packetType >>> 8 == 17) { 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
audioQueue.push(sys.malloc(AUDIO_QUEUE_BYTES))
}
if (!mp2Initialised) { if (!mp2Initialised) {
mp2Initialised = true mp2Initialised = true
audio.mp2Init() audio.mp2Init()
@@ -243,7 +232,7 @@ while (!stopPlay && seqread.getReadCount() < FILE_LENGTH) {
seqread.readBytes(readLength, SND_BASE_ADDR - 2368) seqread.readBytes(readLength, SND_BASE_ADDR - 2368)
audio.mp2Decode() audio.mp2Decode()
sys.memcpy(SND_BASE_ADDR - 64, audioQueue[audioQueuePos++], 2304) audio.mp2UploadDecoded(0)
} }
// RAW PCM packets (decode on the fly) // RAW PCM packets (decode on the fly)
else if (packetType == 0x1000 || packetType == 0x1001) { else if (packetType == 0x1000 || packetType == 0x1001) {
@@ -262,23 +251,6 @@ while (!stopPlay && seqread.getReadCount() < FILE_LENGTH) {
} }
// manage audio playback
if (audioFired && audioQueue) {
if (audio.getPosition(0) < 1 && audioQueuePos > 0) {
// push audio sample
audio.putPcmDataByPtr(audioQueue[0], AUDIO_QUEUE_BYTES, 0)
audio.setSampleUploadLength(0, AUDIO_QUEUE_BYTES)
audio.startSampleUpload(0)
// unshift the queue
const tmp = audioQueue[0]
for (let i = 1; i < AUDIO_QUEUE_LENGTH; i++) audioQueue[i - 1] = audioQueue[i]
audioQueue[AUDIO_QUEUE_LENGTH - 1] = tmp
audioQueuePos -= 1
sys.spin()
}
}
} }
} }
else { else {
@@ -314,9 +286,7 @@ finally {
sys.free(ipfbuf) sys.free(ipfbuf)
if (AUDIO_QUEUE_BYTES > 0 && AUDIO_QUEUE_LENGTH > 1) { if (AUDIO_QUEUE_BYTES > 0 && AUDIO_QUEUE_LENGTH > 1) {
for (let i = 0; i < AUDIO_QUEUE_LENGTH; i++) {
sys.free(audioQueue[i])
}
} }
//audio.stop(0) //audio.stop(0)

2
assets/disk0/tvdos/bin/playpcm.js
View File

@@ -45,7 +45,7 @@ seqread.prepare(filename)
let BLOCK_SIZE = 4096 let BLOCK_SIZE = 4096
let INFILE_BLOCK_SIZE = BLOCK_SIZE let INFILE_BLOCK_SIZE = BLOCK_SIZE
const QUEUE_MAX = 4 // according to the spec const QUEUE_MAX = 8 // according to the spec
let nChannels = 2 let nChannels = 2
let samplingRate = pcm.HW_SAMPLING_RATE; let samplingRate = pcm.HW_SAMPLING_RATE;

11
assets/disk0/tvdos/bin/playwav.js
View File

@@ -53,7 +53,7 @@ if (seqread.readFourCC() != "WAVE") {
let BLOCK_SIZE = 0 let BLOCK_SIZE = 0
let INFILE_BLOCK_SIZE = 0 let INFILE_BLOCK_SIZE = 0
const QUEUE_MAX = 4 // according to the spec const QUEUE_MAX = 8 // according to the spec
let pcmType; let pcmType;
let nChannels; let nChannels;
@@ -217,14 +217,14 @@ while (!stopPlay && seqread.getReadCount() < FILE_SIZE - 8) {
} }
} }
printPlayBar(startOffset)
let queueSize = audio.getPosition(0) let queueSize = audio.getPosition(0)
if (queueSize <= 1) { if (queueSize <= 1) {
printPlayBar(startOffset)
// upload four samples for lag-safely // upload four samples for lag-safely
for (let repeat = QUEUE_MAX - queueSize; repeat > 0; repeat--) { for (let repeat = 0; repeat < QUEUE_MAX; repeat++) {
let remainingBytes = FILE_SIZE - 8 - seqread.getReadCount() let remainingBytes = FILE_SIZE - 8 - seqread.getReadCount()
readLength = (remainingBytes < INFILE_BLOCK_SIZE) ? remainingBytes : INFILE_BLOCK_SIZE readLength = (remainingBytes < INFILE_BLOCK_SIZE) ? remainingBytes : INFILE_BLOCK_SIZE
@@ -244,10 +244,7 @@ while (!stopPlay && seqread.getReadCount() < FILE_SIZE - 8) {
audio.setSampleUploadLength(0, decodedSampleLength) audio.setSampleUploadLength(0, decodedSampleLength)
audio.startSampleUpload(0) audio.startSampleUpload(0)
sys.spin()
if (repeat > 1) sys.sleep(10)
printPlayBar(startOffset)
} }
audio.play(0) audio.play(0)

3
terranmon.txt
View File

@@ -643,6 +643,7 @@ Play Head Flags
resetting will: resetting will:
set position to 0, set position to 0,
set length param to 0, set length param to 0,
set queue capacity to 8 samples,
unset play bit unset play bit
q: purge queues (likely do nothing if not PCM); always 0 when read q: purge queues (likely do nothing if not PCM); always 0 when read
p: play (0 if not -- mute all output) p: play (0 if not -- mute all output)
@@ -650,7 +651,7 @@ Play Head Flags
ssss: PCM Mode set PCM Queue Size ssss: PCM Mode set PCM Queue Size
0 - 4 samples 0 - 4 samples
1 - 6 samples 1 - 6 samples
2 - 8 samples 2 - 8 samples (the default size)
3 - 12 samples 3 - 12 samples
4 - 16 samples 4 - 16 samples
5 - 24 samples 5 - 24 samples

4
tsvm_core/src/net/torvald/tsvm/peripheral/AudioAdapter.kt
View File

@@ -412,7 +412,7 @@ class AudioAdapter(val vm: VM) : PeriBase(VM.PERITYPE_SOUND) {
position = 0 position = 0
pcmUploadLength = 0 pcmUploadLength = 0
isPlaying = false isPlaying = false
pcmQueueSizeIndex = 0 pcmQueueSizeIndex = 2
} }
fun purgeQueue() { fun purgeQueue() {
@@ -431,7 +431,7 @@ class AudioAdapter(val vm: VM) : PeriBase(VM.PERITYPE_SOUND) {
} }
companion object { companion object {
val QUEUE_SIZE = intArrayOf(4,6,8,12,16,24,32,48,64,96,128,256,384,512,768) val QUEUE_SIZE = intArrayOf(4,6,8,12,16,24,32,48,64,96,128,192,256,384,512,768)
} }
} }

2
tsvm_executable/src/net/torvald/tsvm/AudioMenu.kt
View File

@@ -81,7 +81,7 @@ class AudioMenu(parent: VMEmuExecutable, x: Int, y: Int, w: Int, h: Int) : EmuMe
// Queue sparkline // Queue sparkline
batch.color = COL_SOUNDSCOPE_BACK batch.color = COL_SOUNDSCOPE_BACK
batch.fillRect(x + 5*FONT.W + 2, y + 2*FONT.H, FONT.W * 7, FONT.H) batch.fillRect(x + 5*FONT.W + 2, y + 2*FONT.H, FONT.W * 7, FONT.H)
val qgrsize = ahead.getPcmQueueCapacity().let { ahead.position.coerceAtMost(it) / it.toDouble() }.times(FONT.W * 7).roundToInt() val qgrsize = ahead.getPcmQueueCapacity().let { ahead.position / it.toDouble() }.times(FONT.W * 7).roundToInt()
batch.color = COL_HIGHLIGHT2 batch.color = COL_HIGHLIGHT2
batch.fillRect(x + 5*FONT.W + 2, y + 2*FONT.H + 1, qgrsize, FONT.H - 2) batch.fillRect(x + 5*FONT.W + 2, y + 2*FONT.H + 1, qgrsize, FONT.H - 2)