Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-03-02 00:20:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjust ASF shift modes after debugging info

Browse Source
This commit is contained in:
bnnm 2018-07-27 17:13:10 +02:00
parent 4337f00d5d
commit 87bd10073d
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/coding/asf_decoder.c
View File

@ -1,9 +1,8 @@
#include "coding.h" #include "coding.h"
/* Decodes Argonaut's ASF ADPCM codec. Algorithm follows Croc2_asf2raw.exe, and the waveform /* Decodes Argonaut's ASF ADPCM codec, used in some of their PC games.
* looks almost correct, but should reverse engineer asfcodec.adl (DLL) for accuracy. */ * Algorithm should be accurate (reverse engineered from asfcodec.adl DLL). */
#define carry(a, b) (((uint32_t)(a) > (uint32_t)((a) + (b))))
void decode_asf(VGMSTREAMCHANNEL * stream, sample * outbuf, int channelspacing, int32_t first_sample, int32_t samples_to_do) { void decode_asf(VGMSTREAMCHANNEL * stream, sample * outbuf, int channelspacing, int32_t first_sample, int32_t samples_to_do) {
off_t frame_offset; off_t frame_offset;
int i, frames_in, sample_count = 0; int i, frames_in, sample_count = 0;
@ -31,25 +30,19 @@ void decode_asf(VGMSTREAMCHANNEL * stream, sample * outbuf, int channelspacing,
new_sample = i&1 ? /* high nibble first */ new_sample = i&1 ? /* high nibble first */
get_low_nibble_signed(nibbles): get_low_nibble_signed(nibbles):
get_high_nibble_signed(nibbles); get_high_nibble_signed(nibbles);
new_sample = new_sample << (shift + 6); /* move sample to upper nibble, then shift + 2 (IOW: shift + 6) */
new_sample = (new_sample << 4) << (shift + 2);
switch(mode) { /* mode is checked as a flag, so there are 2 modes only, but lower nibble
case 0x00: * may have other values at last frame (ex 0x02/09), could be control flags (loop related?) */
new_sample = (new_sample + (hist1 << 6)) >> 6; if (mode & 0x4) { /* ~filters: 2, -1 */
break;
case 0x04:
new_sample = (new_sample + (hist1 << 7) - (hist2 << 6)) >> 6; new_sample = (new_sample + (hist1 << 7) - (hist2 << 6)) >> 6;
break; }
else { /* ~filters: 1, 0 */
default: /* other modes (ex 0x02/09) seem only at last frame as 0 */ new_sample = (new_sample + (hist1 << 6)) >> 6;
//VGM_LOG("ASF: unknown mode %x at %lx\n", mode,frame_offset);
//new_sample = 0; /* maybe? */
break;
} }
//new_sample = clamp16(new_sample); /* must not */ //new_sample = clamp16(new_sample); /* must not */
outbuf[sample_count] = (int16_t)new_sample; outbuf[sample_count] = (int16_t)new_sample;
sample_count += channelspacing; sample_count += channelspacing;