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

TAV: fix - TAD audio incorrectly decoding due to incorrect step size reconstruction

Browse Source
This commit is contained in:
minjaesong
2025-10-30 22:02:57 +09:00
parent 991d035bcc
commit c61bf7750f
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -488,8 +488,6 @@ class AudioAdapter(val vm: VM) : PeriBase(VM.PERITYPE_SOUND) {
((tadInputBin[offset++].toUint()) shl 24) ((tadInputBin[offset++].toUint()) shl 24)
) )
// println("Q$maxIndex, SampleCount: $sampleCount, payloadSize: $payloadSize")
// Decompress payload // Decompress payload
val compressed = ByteArray(payloadSize) val compressed = ByteArray(payloadSize)
UnsafeHelper.memcpyRaw(null, tadInputBin.ptr + offset, compressed, UnsafeHelper.getArrayOffset(compressed), payloadSize.toLong()) UnsafeHelper.memcpyRaw(null, tadInputBin.ptr + offset, compressed, UnsafeHelper.getArrayOffset(compressed), payloadSize.toLong())
@@ -724,17 +722,19 @@ class AudioAdapter(val vm: VM) : PeriBase(VM.PERITYPE_SOUND) {
} }
private fun dwt97InverseMultilevel(data: FloatArray, length: Int, levels: Int) { private fun dwt97InverseMultilevel(data: FloatArray, length: Int, levels: Int) {
// Calculate the length at the deepest level // Pre-calculate all intermediate lengths used during forward transform
var currentLength = length // Forward uses: data[0..length-1], then data[0..(length+1)/2-1], etc.
for (level in 0 until levels) { val lengths = IntArray(levels + 1)
currentLength = (currentLength + 1) / 2 lengths[0] = length
for (i in 1..levels) {
lengths[i] = (lengths[i - 1] + 1) / 2
} }
// Inverse transform: double size FIRST, then apply inverse DWT // Inverse transform: apply inverse DWT using exact forward lengths in reverse order
// Forward applied DWT with lengths: [length, (length+1)/2, ((length+1)/2+1)/2, ...]
// Inverse must use same lengths in reverse: [..., ((length+1)/2+1)/2, (length+1)/2, length]
for (level in levels - 1 downTo 0) { for (level in levels - 1 downTo 0) {
currentLength *= 2 // MULTIPLY FIRST dwt97Inverse1d(data, lengths[level])
if (currentLength > length) currentLength = length
dwt97Inverse1d(data, currentLength) // THEN apply inverse
} }
} }

23
video_encoder/decoder_tad.c
View File

@@ -313,24 +313,25 @@ static void dwt_dd4_inverse_1d(float *data, int length) {
} }
static void dwt_inverse_multilevel(float *data, int length, int levels) { static void dwt_inverse_multilevel(float *data, int length, int levels) {
// Calculate the length at the deepest level (size of low-pass after all forward DWTs) // Pre-calculate all intermediate lengths used during forward transform
int current_length = length; // Forward uses: data[0..length-1], then data[0..(length+1)/2-1], etc.
for (int level = 0; level < levels; level++) { int *lengths = malloc((levels + 1) * sizeof(int));
current_length = (current_length + 1) / 2; lengths[0] = length;
for (int i = 1; i <= levels; i++) {
lengths[i] = (lengths[i - 1] + 1) / 2;
} }
// For 8 levels on 32768: 32768→16384→8192→4096→2048→1024→512→256→128
// Inverse transform: double size FIRST, then apply inverse DWT // Inverse transform: apply inverse DWT using exact forward lengths in reverse order
// Level 8 inverse: 128 low + 128 high → 256 reconstructed // Forward applied DWT with lengths: [length, (length+1)/2, ((length+1)/2+1)/2, ...]
// Level 7 inverse: 256 reconstructed + 256 high → 512 reconstructed // Inverse must use same lengths in reverse: [..., ((length+1)/2+1)/2, (length+1)/2, length]
// ... Level 1 inverse: 16384 reconstructed + 16384 high → 32768 reconstructed
for (int level = levels - 1; level >= 0; level--) { for (int level = levels - 1; level >= 0; level--) {
current_length *= 2; // MULTIPLY FIRST: 128→256, 256→512, ..., 16384→32768 int current_length = lengths[level];
if (current_length > length) current_length = length;
// dwt_haar_inverse_1d(data, current_length); // THEN apply inverse // dwt_haar_inverse_1d(data, current_length); // THEN apply inverse
// dwt_dd4_inverse_1d(data, current_length); // THEN apply inverse // dwt_dd4_inverse_1d(data, current_length); // THEN apply inverse
dwt_97_inverse_1d(data, current_length); // THEN apply inverse dwt_97_inverse_1d(data, current_length); // THEN apply inverse
} }
free(lengths);
} }
//============================================================================= //=============================================================================