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

Rename some blocked layouts for clarity (hopefully)

Browse Source
This commit is contained in:
bnnm 2017-11-25 01:18:27 +01:00
parent d0be7e0c36
commit db3af4d407
15 changed files with 40 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/formats.c
View File

@ -520,7 +520,7 @@ static const layout_info layout_info_list[] = {
{layout_ast_blocked, "AST blocked"}, {layout_ast_blocked, "AST blocked"},
{layout_halpst_blocked, "HALPST blocked"}, {layout_halpst_blocked, "HALPST blocked"},
{layout_xa_blocked, "CD-ROM XA"}, {layout_xa_blocked, "CD-ROM XA"},
{layout_ea_blocked, "blocked (EA SCHl)"}, {layout_blocked_ea_schl, "blocked (EA SCHl)"},
{layout_blocked_ea_1snh, "blocked (EA 1SNh)"}, {layout_blocked_ea_1snh, "blocked (EA 1SNh)"},
{layout_caf_blocked, "CAF blocked"}, {layout_caf_blocked, "CAF blocked"},
{layout_wsi_blocked, ".wsi blocked"}, {layout_wsi_blocked, ".wsi blocked"},
@ -538,7 +538,7 @@ static const layout_info layout_info_list[] = {
{layout_psx_mgav_blocked, "MGAV blocked"}, {layout_psx_mgav_blocked, "MGAV blocked"},
{layout_ps2_adm_blocked, "ADM blocked"}, {layout_ps2_adm_blocked, "ADM blocked"},
{layout_dsp_bdsp_blocked, "DSP blocked"}, {layout_dsp_bdsp_blocked, "DSP blocked"},
{layout_ivaud_blocked, "GTA IV blocked"}, {layout_blocked_ivaud, "blocked (IVAUD)"},
{layout_ps2_iab_blocked, "IAB blocked"}, {layout_ps2_iab_blocked, "IAB blocked"},
{layout_ps2_strlr_blocked, "The Bouncer STR blocked"}, {layout_ps2_strlr_blocked, "The Bouncer STR blocked"},
{layout_rws_blocked, "RWS blocked"}, {layout_rws_blocked, "RWS blocked"},
@ -549,7 +549,7 @@ static const layout_info layout_info_list[] = {
{layout_aix, "AIX interleave, internally 18-byte interleaved"}, {layout_aix, "AIX interleave, internally 18-byte interleaved"},
{layout_aax, "AAX blocked, 18-byte interleaved"}, {layout_aax, "AAX blocked, 18-byte interleaved"},
{layout_scd_int, "SCD multistream interleave"}, {layout_scd_int, "SCD multistream interleave"},
{layout_ea_sns_blocked, "Electronic Arts SNS blocked"}, {layout_blocked_ea_sns, "blocked (EA SNS)"},
{layout_blocked_awc, "blocked (AWC)"}, {layout_blocked_awc, "blocked (AWC)"},
{layout_blocked_vgs, "blocked (VGS)"}, {layout_blocked_vgs, "blocked (VGS)"},
#ifdef VGM_USE_VORBIS #ifdef VGM_USE_VORBIS

12
src/layout/blocked.c
View File

@ -80,8 +80,8 @@ void render_vgmstream_blocked(sample * buffer, int32_t sample_count, VGMSTREAM *
case layout_xa_blocked: case layout_xa_blocked:
xa_block_update(vgmstream->next_block_offset,vgmstream); xa_block_update(vgmstream->next_block_offset,vgmstream);
break; break;
case layout_ea_blocked: case layout_blocked_ea_schl:
ea_schl_block_update(vgmstream->next_block_offset,vgmstream); block_update_ea_schl(vgmstream->next_block_offset,vgmstream);
break; break;
case layout_blocked_ea_1snh: case layout_blocked_ea_1snh:
block_update_ea_1snh(vgmstream->next_block_offset,vgmstream); block_update_ea_1snh(vgmstream->next_block_offset,vgmstream);
@ -125,8 +125,8 @@ void render_vgmstream_blocked(sample * buffer, int32_t sample_count, VGMSTREAM *
case layout_filp_blocked: case layout_filp_blocked:
filp_block_update(vgmstream->next_block_offset,vgmstream); filp_block_update(vgmstream->next_block_offset,vgmstream);
break; break;
case layout_ivaud_blocked: case layout_blocked_ivaud:
ivaud_block_update(vgmstream->next_block_offset,vgmstream); block_update_ivaud(vgmstream->next_block_offset,vgmstream);
break; break;
case layout_psx_mgav_blocked: case layout_psx_mgav_blocked:
psx_mgav_block_update(vgmstream->next_block_offset,vgmstream); psx_mgav_block_update(vgmstream->next_block_offset,vgmstream);
@ -152,8 +152,8 @@ void render_vgmstream_blocked(sample * buffer, int32_t sample_count, VGMSTREAM *
case layout_hwas_blocked: case layout_hwas_blocked:
hwas_block_update(vgmstream->next_block_offset,vgmstream); hwas_block_update(vgmstream->next_block_offset,vgmstream);
break; break;
case layout_ea_sns_blocked: case layout_blocked_ea_sns:
ea_sns_block_update(vgmstream->next_block_offset,vgmstream); block_update_ea_sns(vgmstream->next_block_offset,vgmstream);
break; break;
case layout_blocked_awc: case layout_blocked_awc:
block_update_awc(vgmstream->next_block_offset,vgmstream); block_update_awc(vgmstream->next_block_offset,vgmstream);

2
src/layout/ea_block.c → src/layout/blocked_ea_schl.c
View File

@ -3,7 +3,7 @@
#include "../vgmstream.h" #include "../vgmstream.h"
/* set up for the block at the given offset */ /* set up for the block at the given offset */
void ea_schl_block_update(off_t block_offset, VGMSTREAM * vgmstream) { void block_update_ea_schl(off_t block_offset, VGMSTREAM * vgmstream) {
int i; int i;
int new_schl = 0; int new_schl = 0;
STREAMFILE* streamFile = vgmstream->ch[0].streamfile; STREAMFILE* streamFile = vgmstream->ch[0].streamfile;

2
src/layout/ea_sns_blocked.c → src/layout/blocked_ea_sns.c
View File

@ -3,7 +3,7 @@
#include "../vgmstream.h" #include "../vgmstream.h"
/* EA "SNS "blocks (most common in .SNS) */ /* EA "SNS "blocks (most common in .SNS) */
void ea_sns_block_update(off_t block_offset, VGMSTREAM * vgmstream) { void block_update_ea_sns(off_t block_offset, VGMSTREAM * vgmstream) {
STREAMFILE* streamFile = vgmstream->ch[0].streamfile; STREAMFILE* streamFile = vgmstream->ch[0].streamfile;
uint32_t block_size, block_samples; uint32_t block_size, block_samples;
size_t file_size = get_streamfile_size(streamFile); size_t file_size = get_streamfile_size(streamFile);

2
src/layout/ivaud_layout.c → src/layout/blocked_ivaud.c
View File

@ -2,7 +2,7 @@
#include "../vgmstream.h" #include "../vgmstream.h"
/* set up for the block at the given offset */ /* set up for the block at the given offset */
void ivaud_block_update(off_t block_offset, VGMSTREAM * vgmstream) { void block_update_ivaud(off_t block_offset, VGMSTREAM * vgmstream) {
int i; int i;
off_t start_offset; off_t start_offset;
off_t interleave_size; off_t interleave_size;

7
src/layout/layout.h
View File

@ -15,7 +15,7 @@ void halpst_block_update(off_t block_ofset, VGMSTREAM * vgmstream);
void xa_block_update(off_t block_offset, VGMSTREAM * vgmstream); void xa_block_update(off_t block_offset, VGMSTREAM * vgmstream);
void ea_schl_block_update(off_t block_offset, VGMSTREAM * vgmstream); void block_update_ea_schl(off_t block_offset, VGMSTREAM * vgmstream);
void block_update_ea_1snh(off_t block_offset, VGMSTREAM * vgmstream); void block_update_ea_1snh(off_t block_offset, VGMSTREAM * vgmstream);
@ -45,7 +45,7 @@ void thp_block_update(off_t block_offset, VGMSTREAM * vgmstream);
void filp_block_update(off_t block_offset, VGMSTREAM * vgmstream); void filp_block_update(off_t block_offset, VGMSTREAM * vgmstream);
void ivaud_block_update(off_t block_offset, VGMSTREAM * vgmstream); void block_update_ivaud(off_t block_offset, VGMSTREAM * vgmstream);
void psx_mgav_block_update(off_t block_offset, VGMSTREAM * vgmstream); void psx_mgav_block_update(off_t block_offset, VGMSTREAM * vgmstream);
@ -63,8 +63,7 @@ void rws_block_update(off_t block_offset, VGMSTREAM * vgmstream);
void hwas_block_update(off_t block_offset, VGMSTREAM * vgmstream); void hwas_block_update(off_t block_offset, VGMSTREAM * vgmstream);
void ea_sns_block_update(off_t block_offset, VGMSTREAM * vgmstream); void block_update_ea_sns(off_t block_offset, VGMSTREAM * vgmstream);
void block_update_awc(off_t block_offset, VGMSTREAM * vgmstream); void block_update_awc(off_t block_offset, VGMSTREAM * vgmstream);
void block_update_vgs(off_t block_offset, VGMSTREAM * vgmstream); void block_update_vgs(off_t block_offset, VGMSTREAM * vgmstream);

6
src/libvgmstream.vcproj
View File

@ -1611,11 +1611,11 @@
> >
</File> </File>
<File <File
RelativePath=".\layout\ea_block.c" RelativePath=".\layout\blocked_ea_schl.c"
> >
</File> </File>
<File <File
RelativePath=".\layout\ea_sns_blocked.c" RelativePath=".\layout\blocked_ea_sns.c"
> >
</File> </File>
<File <File
@ -1647,7 +1647,7 @@
> >
</File> </File>
<File <File
RelativePath=".\layout\ivaud_layout.c" RelativePath=".\layout\blocked_ivaud.c"
> >
</File> </File>
<File <File

6
src/libvgmstream.vcxproj
View File

@ -476,8 +476,8 @@
<ClCompile Include="layout\blocked_vgs.c" /> <ClCompile Include="layout\blocked_vgs.c" />
<ClCompile Include="layout\caf_blocked.c" /> <ClCompile Include="layout\caf_blocked.c" />
<ClCompile Include="layout\blocked_dec.c" /> <ClCompile Include="layout\blocked_dec.c" />
<ClCompile Include="layout\ea_block.c" /> <ClCompile Include="layout\blocked_ea_schl.c" />
<ClCompile Include="layout\ea_sns_blocked.c" /> <ClCompile Include="layout\blocked_ea_sns.c" />
<ClCompile Include="layout\emff_blocked.c" /> <ClCompile Include="layout\emff_blocked.c" />
<ClCompile Include="layout\filp_blocked.c" /> <ClCompile Include="layout\filp_blocked.c" />
<ClCompile Include="layout\gsb_blocked.c" /> <ClCompile Include="layout\gsb_blocked.c" />
@ -485,7 +485,7 @@
<ClCompile Include="layout\ims_block.c" /> <ClCompile Include="layout\ims_block.c" />
<ClCompile Include="layout\interleave.c" /> <ClCompile Include="layout\interleave.c" />
<ClCompile Include="layout\interleave_byte.c" /> <ClCompile Include="layout\interleave_byte.c" />
<ClCompile Include="layout\ivaud_layout.c" /> <ClCompile Include="layout\blocked_ivaud.c" />
<ClCompile Include="layout\mus_acm_layout.c" /> <ClCompile Include="layout\mus_acm_layout.c" />
<ClCompile Include="layout\mxch_blocked.c" /> <ClCompile Include="layout\mxch_blocked.c" />
<ClCompile Include="layout\nolayout.c" /> <ClCompile Include="layout\nolayout.c" />

6
src/libvgmstream.vcxproj.filters
View File

@ -940,10 +940,10 @@
<ClCompile Include="layout\blocked_dec.c"> <ClCompile Include="layout\blocked_dec.c">
<Filter>layout\Source Files</Filter> <Filter>layout\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="layout\ea_block.c"> <ClCompile Include="layout\blocked_ea_schl.c">
<Filter>layout\Source Files</Filter> <Filter>layout\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="layout\ea_sns_blocked.c"> <ClCompile Include="layout\blocked_ea_sns.c">
<Filter>layout\Source Files</Filter> <Filter>layout\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="layout\emff_blocked.c"> <ClCompile Include="layout\emff_blocked.c">
@ -970,7 +970,7 @@
<ClCompile Include="layout\interleave_byte.c"> <ClCompile Include="layout\interleave_byte.c">
<Filter>layout\Source Files</Filter> <Filter>layout\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="layout\ivaud_layout.c"> <ClCompile Include="layout\blocked_ivaud.c">
<Filter>layout\Source Files</Filter> <Filter>layout\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="layout\mus_acm_layout.c"> <ClCompile Include="layout\mus_acm_layout.c">

4
src/meta/ea_schl.c
View File

@ -250,7 +250,7 @@ static VGMSTREAM * init_vgmstream_ea_variable_header(STREAMFILE *streamFile, ea_
} }
} }
else { else {
vgmstream->layout_type = layout_ea_blocked; vgmstream->layout_type = layout_blocked_ea_schl;
} }
if (is_bnk) if (is_bnk)
@ -413,7 +413,7 @@ static VGMSTREAM * init_vgmstream_ea_variable_header(STREAMFILE *streamFile, ea_
} }
else { else {
/* setup first block to update offsets */ /* setup first block to update offsets */
ea_schl_block_update(start_offset,vgmstream); block_update_ea_schl(start_offset,vgmstream);
} }

4
src/meta/ea_schl_fixed.c
View File

@ -58,7 +58,7 @@ VGMSTREAM * init_vgmstream_ea_schl_fixed(STREAMFILE *streamFile) {
vgmstream->meta_type = meta_EA_SCHL_fixed; vgmstream->meta_type = meta_EA_SCHL_fixed;
vgmstream->layout_type = layout_ea_blocked; vgmstream->layout_type = layout_blocked_ea_schl;
switch (ea.codec) { switch (ea.codec) {
case EA_CODEC_PCM: case EA_CODEC_PCM:
@ -80,7 +80,7 @@ VGMSTREAM * init_vgmstream_ea_schl_fixed(STREAMFILE *streamFile) {
goto fail; goto fail;
/* setup first block to update offsets */ /* setup first block to update offsets */
ea_schl_block_update(start_offset,vgmstream); block_update_ea_schl(start_offset,vgmstream);
return vgmstream; return vgmstream;

8
src/meta/ea_snu.c
View File

@ -84,7 +84,7 @@ VGMSTREAM * init_vgmstream_ea_snu(STREAMFILE *streamFile) {
switch(codec) { switch(codec) {
case 0x04: /* "Xas1": EA-XAS (Dead Space PC/PS3) */ case 0x04: /* "Xas1": EA-XAS (Dead Space PC/PS3) */
vgmstream->coding_type = coding_EA_XAS; vgmstream->coding_type = coding_EA_XAS;
vgmstream->layout_type = layout_ea_sns_blocked; vgmstream->layout_type = layout_blocked_ea_sns;
break; break;
#if 0 #if 0
@ -99,7 +99,7 @@ VGMSTREAM * init_vgmstream_ea_snu(STREAMFILE *streamFile) {
vgmstream->codec_data = init_mpeg_custom_codec_data(streamFile, mpeg_start_offset, &vgmstream->coding_type, vgmstream->channels, MPEG_EAL32S, &cfg); vgmstream->codec_data = init_mpeg_custom_codec_data(streamFile, mpeg_start_offset, &vgmstream->coding_type, vgmstream->channels, MPEG_EAL32S, &cfg);
if (!vgmstream->codec_data) goto fail; if (!vgmstream->codec_data) goto fail;
vgmstream->layout_type = layout_ea_sns_blocked; vgmstream->layout_type = layout_blocked_ea_sns;
break; break;
} }
#endif #endif
@ -154,8 +154,8 @@ VGMSTREAM * init_vgmstream_ea_snu(STREAMFILE *streamFile) {
if (!vgmstream_open_stream(vgmstream,streamFile,start_offset)) if (!vgmstream_open_stream(vgmstream,streamFile,start_offset))
goto fail; goto fail;
if (vgmstream->layout_type == layout_ea_sns_blocked) if (vgmstream->layout_type == layout_blocked_ea_sns)
ea_sns_block_update(start_offset, vgmstream); block_update_ea_sns(start_offset, vgmstream);
return vgmstream; return vgmstream;

4
src/meta/ivaud.c
View File

@ -38,7 +38,7 @@ VGMSTREAM * init_vgmstream_ivaud(STREAMFILE *streamFile) {
vgmstream->sample_rate = read_32bitLE(block_table_offset + 0x04,streamFile); vgmstream->sample_rate = read_32bitLE(block_table_offset + 0x04,streamFile);
vgmstream->coding_type = coding_IMA_int; vgmstream->coding_type = coding_IMA_int;
vgmstream->layout_type = layout_ivaud_blocked; vgmstream->layout_type = layout_blocked_ivaud;
vgmstream->meta_type = meta_PC_IVAUD; vgmstream->meta_type = meta_PC_IVAUD;
/* open the file for reading */ /* open the file for reading */
@ -57,7 +57,7 @@ VGMSTREAM * init_vgmstream_ivaud(STREAMFILE *streamFile) {
// to avoid troubles with "extra" samples // to avoid troubles with "extra" samples
vgmstream->num_samples=((read_32bitLE(0x60,streamFile)/2)*2); vgmstream->num_samples=((read_32bitLE(0x60,streamFile)/2)*2);
ivaud_block_update(start_offset,vgmstream); block_update_ivaud(start_offset,vgmstream);
return vgmstream; return vgmstream;

6
src/vgmstream.c
View File

@ -923,7 +923,7 @@ void render_vgmstream(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstre
case layout_ast_blocked: case layout_ast_blocked:
case layout_halpst_blocked: case layout_halpst_blocked:
case layout_xa_blocked: case layout_xa_blocked:
case layout_ea_blocked: case layout_blocked_ea_schl:
case layout_blocked_ea_1snh: case layout_blocked_ea_1snh:
case layout_caf_blocked: case layout_caf_blocked:
case layout_wsi_blocked: case layout_wsi_blocked:
@ -938,7 +938,7 @@ void render_vgmstream(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstre
case layout_xvas_blocked: case layout_xvas_blocked:
case layout_thp_blocked: case layout_thp_blocked:
case layout_filp_blocked: case layout_filp_blocked:
case layout_ivaud_blocked: case layout_blocked_ivaud:
case layout_psx_mgav_blocked: case layout_psx_mgav_blocked:
case layout_ps2_adm_blocked: case layout_ps2_adm_blocked:
case layout_dsp_bdsp_blocked: case layout_dsp_bdsp_blocked:
@ -947,7 +947,7 @@ void render_vgmstream(sample * buffer, int32_t sample_count, VGMSTREAM * vgmstre
case layout_ps2_strlr_blocked: case layout_ps2_strlr_blocked:
case layout_rws_blocked: case layout_rws_blocked:
case layout_hwas_blocked: case layout_hwas_blocked:
case layout_ea_sns_blocked: case layout_blocked_ea_sns:
case layout_blocked_awc: case layout_blocked_awc:
case layout_blocked_vgs: case layout_blocked_vgs:
render_vgmstream_blocked(buffer,sample_count,vgmstream); render_vgmstream_blocked(buffer,sample_count,vgmstream);

6
src/vgmstream.h
View File

@ -212,7 +212,7 @@ typedef enum {
layout_ast_blocked, layout_ast_blocked,
layout_halpst_blocked, layout_halpst_blocked,
layout_xa_blocked, layout_xa_blocked,
layout_ea_blocked, layout_blocked_ea_schl,
layout_blocked_ea_1snh, layout_blocked_ea_1snh,
layout_caf_blocked, layout_caf_blocked,
layout_wsi_blocked, layout_wsi_blocked,
@ -231,13 +231,13 @@ typedef enum {
layout_ps2_adm_blocked, layout_ps2_adm_blocked,
layout_dsp_bdsp_blocked, layout_dsp_bdsp_blocked,
layout_mxch_blocked, layout_mxch_blocked,
layout_ivaud_blocked, /* GTA IV .ivaud blocks */ layout_blocked_ivaud, /* GTA IV .ivaud blocks */
layout_tra_blocked, /* DefJam Rapstar .tra blocks */ layout_tra_blocked, /* DefJam Rapstar .tra blocks */
layout_ps2_iab_blocked, layout_ps2_iab_blocked,
layout_ps2_strlr_blocked, layout_ps2_strlr_blocked,
layout_rws_blocked, layout_rws_blocked,
layout_hwas_blocked, layout_hwas_blocked,
layout_ea_sns_blocked, /* newest Electronic Arts blocks, found in SNS/SNU/SPS/etc formats */ layout_blocked_ea_sns, /* newest Electronic Arts blocks, found in SNS/SNU/SPS/etc formats */
layout_blocked_awc, /* Rockstar AWC */ layout_blocked_awc, /* Rockstar AWC */
layout_blocked_vgs, /* Guitar Hero II (PS2) */ layout_blocked_vgs, /* Guitar Hero II (PS2) */