Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-12-01 01:27:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
bnnm 2021-10-24 10:28:48 +02:00
parent 3c8dc615ab
commit 656c70e67b
3 changed files with 185 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cli/vrts.bat
View File

@ -105,7 +105,10 @@ for /f "delims=" %%x in ('%CMD_DIR% ^| %CMD_FIND%') do (
call :performance_file "!CMD_FILE!" call :performance_file "!CMD_FILE!"
) )
setlocal DisableDelayedExpansion REM this doesn't seem to properly disable it and will error out after N files
REM but using endlocal will remove vars and counters won't work
REM setlocal DisableDelayedExpansion
endlocal
) )
REM # find time elapsed REM # find time elapsed

90
src/meta/ck.c
View File

@ -2,42 +2,43 @@
/* .cks - Cricket Audio stream [Part Time UFO (Android), Mega Man 1-6 (Android)] */ /* .cks - Cricket Audio stream [Part Time UFO (Android), Mega Man 1-6 (Android)] */
VGMSTREAM * init_vgmstream_cks(STREAMFILE *streamFile) { VGMSTREAM* init_vgmstream_cks(STREAMFILE* sf) {
VGMSTREAM* vgmstream = NULL; VGMSTREAM* vgmstream = NULL;
off_t start_offset; off_t start_offset;
int loop_flag, channel_count, codec, sample_rate; int loop_flag, channels, codec, sample_rate;
int32_t num_samples, loop_start, loop_end; int32_t num_samples, loop_start, loop_end;
size_t block_size; size_t block_size;
/* checks */ /* checks */
if (!check_extensions(streamFile, "cks")) if (!is_id32be(0x00,sf, "ckmk"))
goto fail; goto fail;
if (read_32bitBE(0x00,streamFile) != 0x636B6D6B) /* "ckmk" */ if (!check_extensions(sf, "cks"))
goto fail;
/* 0x04(4): platform bitflags (from LSB: iOS, Android, OS X, Windows, WP8, Linux, tvOS, undefined/ignored) */
if (read_32bitLE(0x08,streamFile) != 0x00) /* expected file type (0x00: stream, 0x01: bank, 0x02+: unknown) */
goto fail;
if (read_32bitLE(0x0c,streamFile) != 0x02) /* file version (always 0x02) */
goto fail; goto fail;
codec = read_8bit(0x10,streamFile); /* 0x04(4): platform bitflags (from LSB: iOS, Android, OS X, Windows, WP8, Linux, tvOS, undefined/ignored) */
channel_count = read_8bit(0x11,streamFile); if (read_u32le(0x08,sf) != 0x00) /* expected file type (0x00: stream, 0x01: bank, 0x02+: unknown) */
sample_rate = (uint16_t)read_16bitLE(0x12,streamFile); goto fail;
num_samples = read_32bitLE(0x14,streamFile) * read_16bitLE(0x1a,streamFile); /* number_of_blocks * samples_per_frame */ if (read_u32le(0x0c,sf) != 0x02) /* file version (always 0x02) */
block_size = read_16bitLE(0x18,streamFile); goto fail;
codec = read_u8(0x10,sf);
channels = read_u8(0x11,sf);
sample_rate = read_u16le(0x12,sf);
num_samples = read_s32le(0x14,sf) * read_u16le(0x1a,sf); /* number_of_blocks * samples_per_frame */
block_size = read_u16le(0x18,sf);
/* 0x1c(2): volume */ /* 0x1c(2): volume */
/* 0x1e(2): pan */ /* 0x1e(2): pan */
loop_start = read_32bitLE(0x20,streamFile); loop_start = read_s32le(0x20,sf);
loop_end = read_32bitLE(0x24,streamFile); loop_end = read_s32le(0x24,sf);
loop_flag = read_16bitLE(0x28,streamFile) != 0; /* loop count (-1 = forever) */ loop_flag = read_s16le(0x28,sf) != 0; /* loop count (-1 = forever) */
/* 0x2a(2): unused? */ /* 0x2a(2): unused? */
start_offset = 0x2c; start_offset = 0x2c;
/* build the VGMSTREAM */ /* build the VGMSTREAM */
vgmstream = allocate_vgmstream(channel_count, loop_flag); vgmstream = allocate_vgmstream(channels, loop_flag);
if (!vgmstream) goto fail; if (!vgmstream) goto fail;
vgmstream->sample_rate = sample_rate; vgmstream->sample_rate = sample_rate;
@ -56,15 +57,15 @@ VGMSTREAM * init_vgmstream_cks(STREAMFILE *streamFile) {
break; break;
case 0x02: /* adpcm [Part Time UFO (Android), Mega Man 1-6 (Android)] */ case 0x02: /* adpcm [Part Time UFO (Android), Mega Man 1-6 (Android)] */
vgmstream->coding_type = coding_MSADPCM_ck; vgmstream->coding_type = coding_MSADPCM_ck;
vgmstream->frame_size = block_size / channel_count; /* always 0x18 */ vgmstream->frame_size = block_size / channels; /* always 0x18 */
break; break;
default: default:
goto fail; goto fail;
} }
vgmstream->layout_type = layout_interleave; vgmstream->layout_type = layout_interleave;
vgmstream->interleave_block_size = block_size / channel_count; vgmstream->interleave_block_size = block_size / channels;
if (!vgmstream_open_stream(vgmstream,streamFile,start_offset)) if (!vgmstream_open_stream(vgmstream, sf, start_offset))
goto fail; goto fail;
return vgmstream; return vgmstream;
@ -75,29 +76,30 @@ fail:
/* .ckb - Cricket Audio bank [Fire Emblem Heroes (Android), Mega Man 1-6 (Android)] */ /* .ckb - Cricket Audio bank [Fire Emblem Heroes (Android), Mega Man 1-6 (Android)] */
VGMSTREAM * init_vgmstream_ckb(STREAMFILE *streamFile) { VGMSTREAM* init_vgmstream_ckb(STREAMFILE* sf) {
VGMSTREAM* vgmstream = NULL; VGMSTREAM* vgmstream = NULL;
off_t start_offset, name_offset = 0; off_t start_offset, name_offset = 0;
int loop_flag, channel_count, codec, sample_rate; int loop_flag = 0, channels = 0, codec = 0, sample_rate = 0;
int32_t num_samples, loop_start, loop_end; int32_t num_samples = 0, loop_start = 0, loop_end = 0;
size_t block_size, stream_size; size_t block_size = 0, stream_size = 0;
int total_subsongs, target_subsong = streamFile->stream_index; int total_subsongs, target_subsong = sf->stream_index;
/* checks */ /* checks */
if (!check_extensions(streamFile, "ckb")) if (!is_id32be(0x00,sf, "ckmk"))
goto fail; goto fail;
if (read_32bitBE(0x00,streamFile) != 0x636B6D6B) /* "ckmk" */ if (!check_extensions(sf, "ckb"))
goto fail; goto fail;
/* 0x04(4): platform bitflags (from LSB: iOS, Android, OS X, Windows, WP8, Linux, tvOS, undefined/ignored) */ /* 0x04(4): platform bitflags (from LSB: iOS, Android, OS X, Windows, WP8, Linux, tvOS, undefined/ignored) */
if (read_32bitLE(0x08,streamFile) != 0x01) /* expected file type (0x00: stream, 0x01: bank, 0x02+: unknown) */ if (read_u32le(0x08,sf) != 0x01) /* expected file type (0x00: stream, 0x01: bank, 0x02+: unknown) */
goto fail; goto fail;
if (read_32bitLE(0x0c,streamFile) != 0x02) /* file version (always 0x02) */ if (read_u32le(0x0c,sf) != 0x02) /* file version (always 0x02) */
goto fail; goto fail;
/* 0x10: bank name (size 0x1c+1) */ /* 0x10: bank name (size 0x1c+1) */
/* 0x30/34: reserved? */ /* 0x30/34: reserved? */
total_subsongs = read_32bitLE(0x38,streamFile); total_subsongs = read_u32le(0x38,sf);
if (target_subsong == 0) target_subsong = 1; if (target_subsong == 0) target_subsong = 1;
if (target_subsong < 0 || target_subsong > total_subsongs || total_subsongs < 1) goto fail; if (target_subsong < 0 || target_subsong > total_subsongs || total_subsongs < 1) goto fail;
/* 0x3c: total_subsongs again? (ignored) */ /* 0x3c: total_subsongs again? (ignored) */
@ -111,18 +113,18 @@ VGMSTREAM * init_vgmstream_ckb(STREAMFILE *streamFile) {
for (i = 0; i < total_subsongs; i++) { for (i = 0; i < total_subsongs; i++) {
name_offset = header_offset+0x00; /* stream name (size 0x1c+1) */ name_offset = header_offset+0x00; /* stream name (size 0x1c+1) */
codec = read_8bit(header_offset+0x20,streamFile); codec = read_8bit(header_offset+0x20,sf);
channel_count = read_8bit(header_offset+0x21,streamFile); channels = read_8bit(header_offset+0x21,sf);
sample_rate = (uint16_t)read_16bitLE(header_offset+0x22,streamFile); sample_rate = (uint16_t)read_16bitLE(header_offset+0x22,sf);
num_samples = read_32bitLE(header_offset+0x24,streamFile) * read_16bitLE(header_offset+0x2a,streamFile); /* number_of_blocks * samples_per_frame */ num_samples = read_32bitLE(header_offset+0x24,sf) * read_16bitLE(header_offset+0x2a,sf); /* number_of_blocks * samples_per_frame */
block_size = read_16bitLE(header_offset+0x28,streamFile); block_size = read_16bitLE(header_offset+0x28,sf);
/* 0x2c(2): volume */ /* 0x2c(2): volume */
/* 0x2e(2): pan */ /* 0x2e(2): pan */
loop_start = read_32bitLE(header_offset+0x30,streamFile); loop_start = read_32bitLE(header_offset+0x30,sf);
loop_end = read_32bitLE(header_offset+0x34,streamFile); loop_end = read_32bitLE(header_offset+0x34,sf);
loop_flag = read_16bitLE(header_offset+0x38,streamFile) != 0; /* loop count (-1 = forever) */ loop_flag = read_16bitLE(header_offset+0x38,sf) != 0; /* loop count (-1 = forever) */
/* 0x3a(2): unused? */ /* 0x3a(2): unused? */
stream_size = read_32bitLE(header_offset+0x3c,streamFile); stream_size = read_32bitLE(header_offset+0x3c,sf);
/* 0x40/44(4): unused? */ /* 0x40/44(4): unused? */
if (target_subsong == (i+1)) if (target_subsong == (i+1))
@ -136,7 +138,7 @@ VGMSTREAM * init_vgmstream_ckb(STREAMFILE *streamFile) {
/* build the VGMSTREAM */ /* build the VGMSTREAM */
vgmstream = allocate_vgmstream(channel_count, loop_flag); vgmstream = allocate_vgmstream(channels, loop_flag);
if (!vgmstream) goto fail; if (!vgmstream) goto fail;
vgmstream->sample_rate = sample_rate; vgmstream->sample_rate = sample_rate;
@ -146,7 +148,7 @@ VGMSTREAM * init_vgmstream_ckb(STREAMFILE *streamFile) {
vgmstream->num_streams = total_subsongs; vgmstream->num_streams = total_subsongs;
vgmstream->stream_size = stream_size; vgmstream->stream_size = stream_size;
read_string(vgmstream->stream_name,0x1c+1, name_offset,streamFile); read_string(vgmstream->stream_name,0x1c+1, name_offset,sf);
vgmstream->meta_type = meta_CKB; vgmstream->meta_type = meta_CKB;
@ -165,9 +167,9 @@ VGMSTREAM * init_vgmstream_ckb(STREAMFILE *streamFile) {
goto fail; goto fail;
} }
vgmstream->layout_type = layout_interleave; vgmstream->layout_type = layout_interleave;
vgmstream->interleave_block_size = block_size / channel_count; vgmstream->interleave_block_size = block_size / channels;
if (!vgmstream_open_stream(vgmstream,streamFile,start_offset)) if (!vgmstream_open_stream(vgmstream,sf,start_offset))
goto fail; goto fail;
return vgmstream; return vgmstream;

5
src/streamfile.c
View File

@ -119,7 +119,7 @@ static size_t stdio_read(STDIO_STREAMFILE* sf, uint8_t* dst, offv_t offset, size
#ifdef VGM_DEBUG_OUTPUT #ifdef VGM_DEBUG_OUTPUT
if (offset < sf->buf_offset && length > 0) { if (offset < sf->buf_offset && length > 0) {
VGM_LOG("stdio: rebuffer, requested %x vs %x (sf %x)\n", (uint32_t)offset, (uint32_t)sf->buf_offset, (uint32_t)sf); //VGM_LOG("stdio: rebuffer, requested %x vs %x (sf %x)\n", (uint32_t)offset, (uint32_t)sf->buf_offset, (uint32_t)sf);
//sf->rebuffer++; //sf->rebuffer++;
//if (rebuffer > N) ... //if (rebuffer > N) ...
} }
@ -352,7 +352,7 @@ static size_t buffer_read(BUFFER_STREAMFILE* sf, uint8_t* dst, offv_t offset, si
#ifdef VGM_DEBUG_OUTPUT #ifdef VGM_DEBUG_OUTPUT
if (offset < sf->buf_offset) { if (offset < sf->buf_offset) {
VGM_LOG("buffer: rebuffer, requested %x vs %x (sf %x)\n", (uint32_t)offset, (uint32_t)sf->buf_offset, (uint32_t)sf); //VGM_LOG("buffer: rebuffer, requested %x vs %x (sf %x)\n", (uint32_t)offset, (uint32_t)sf->buf_offset, (uint32_t)sf);
} }
#endif #endif
@ -1274,7 +1274,6 @@ STREAMFILE* read_filemap_file_pos(STREAMFILE* sf, int file_num, int* p_pos) {
/* better way? */ /* better way? */
if (strcmp(line, "#@reset-pos") == 0) { if (strcmp(line, "#@reset-pos") == 0) {
file_pos = 0; file_pos = 0;
VGM_LOG("pos =%i\n", file_pos);
} }
continue; continue;
} }