refactor: Cleanup develhook logic
> refactor hooks::devel to work better with hooks::wmisc > minor naming consistency changes
This commit is contained in:
[ ]
+98
-93
@@ -769,105 +769,110 @@ void *on_enum_valid_soundbanks(void *song, int32_t difficulty, int32_t unk2)
|
||||
*((char *) song + offset_.DAT_song_id + 8 + difficulty) = suffix;
|
||||
return r;
|
||||
}
|
||||
void run_tests()
|
||||
static class Tests : public hooks::devel::Routine
|
||||
{
|
||||
size_t szs3p;
|
||||
BYTE *wav = nullptr;
|
||||
uint32_t wavsz = 0;
|
||||
char avspath[AVSPATHMAX];
|
||||
avs::core::avs_file_t avsmnt = 0;
|
||||
char sig[5] = " ";
|
||||
int id = 25073;
|
||||
if (!mf_broken::init())
|
||||
public:
|
||||
using Routine::Routine;
|
||||
void entry_main() override
|
||||
{
|
||||
log_warning("hooks::soundbank", "MF initialization failed, skipping..");
|
||||
}
|
||||
|
||||
// Filesystem tests, s3p unpacking
|
||||
snprintf(avspath, sizeof(avspath), "data/sound/%05d", id);
|
||||
if (snd_bank::has_format(avspath, ".ifs")) avsmnt = snd_bank::map_ifs(avspath);
|
||||
snprintf(avspath + strlen(avspath), 7, "/%05d", id);
|
||||
snd_bank::has_format(avspath, ".s3p");
|
||||
snd_bank::has_format(avspath, ".2dx");
|
||||
snd_bank::has_format(avspath, "_pre.2dx");
|
||||
uint8_t *bufs3p = snd_bank::read_bank_any(avspath, ".s3p", &szs3p);
|
||||
snd_s3p *snds3p = snd_s3p::unpack(bufs3p);
|
||||
if (avsmnt) avs::core::avs_fs_umount(avsmnt);
|
||||
|
||||
// S3P => WMA => WAV => 2DX pipeline
|
||||
if (snds3p)
|
||||
{
|
||||
// S3P/S3V metadata
|
||||
memcpy(sig, snds3p->header()->sig, 4);
|
||||
log_info("hooks::soundbank", "{}::Bank[S3P]::Signature {}", id, sig);
|
||||
log_info("hooks::soundbank", "{}::Bank[S3P]::Size {}", id, szs3p);
|
||||
log_info("hooks::soundbank", "{}::Bank[S3P]::VoiceCount {}", id, snds3p->header()->voice_cnt);
|
||||
log_info("hooks::soundbank", "{}::Bank[S3P]::Voice[0]::Size {}", id, snds3p->voice_ptr(0)->sz);
|
||||
memcpy(sig, snds3p->voice(0)->sig, 4);
|
||||
log_info("hooks::soundbank", "{}::Bank[S3P]::Voice[0]::Signature {}", id, sig);
|
||||
snd_bank::dump("raw_wma.wma", snds3p->voice(0)->asf(), snds3p->voice(0)->sz);
|
||||
|
||||
// MF codec (tainted PCM data, bad)
|
||||
mf_broken::asf_to_wav(snds3p->voice(0)->asf(), snds3p->voice(0)->sz, &wav, &wavsz);
|
||||
snd_bank::dump("mf_wav.wav", wav, wavsz);
|
||||
free(wav);
|
||||
wav = nullptr;
|
||||
wavsz = 0;
|
||||
|
||||
// AV codec (1:1 unmodified PCM data, other than resampling if enabled)
|
||||
wav = (BYTE *) malloc(snd_2dx::assertsz_asf(snds3p->voice(0)->sz, avcodec::bmswac_resampler_f32));
|
||||
avcodec::BmswTranscoderAsfToWav(snds3p->voice(0)->asf(), snds3p->voice(0)->sz, &wav, &wavsz, avcodec::bmswac_resampler_f32);
|
||||
snd_bank::dump("ac_wav.wav", wav, wavsz);
|
||||
free(wav);
|
||||
wav = nullptr;
|
||||
wavsz = 0;
|
||||
|
||||
// S3P=>2DX (max 4076 voices)
|
||||
size_t i, j;
|
||||
snd_2dx *snd2dx = snd_2dx::pack(id);
|
||||
log_info("hooks::soundbank", "{}::Bank[2DX]::Name {}", id, snd2dx->header()->name);
|
||||
for (i = 0; i < snds3p->header()->voice_cnt; i++)
|
||||
size_t szs3p;
|
||||
BYTE *wav = nullptr;
|
||||
uint32_t wavsz = 0;
|
||||
char avspath[AVSPATHMAX];
|
||||
avs::core::avs_file_t avsmnt = 0;
|
||||
char sig[5] = " ";
|
||||
int id = 25073;
|
||||
if (!mf_broken::init())
|
||||
{
|
||||
// WMA=>WAV transcode
|
||||
snd_s3p::bank::voice_hdr *voicesrc = snds3p->voice(i);
|
||||
j = snd2dx->voice_emplace(snd_2dx::assertsz_asf(voicesrc->sz));
|
||||
snd_2dx::bank::voice_hdr *voicedst = snd2dx->voice(j);
|
||||
BYTE *voicedst_wave = voicedst->wave();
|
||||
//mf_broken::asf_to_wav(voicesrc->asf(), voicesrc->sz, &voicedst_wave, &voicedst->sz);
|
||||
avcodec::BmswTranscoderAsfToWav(voicesrc->asf(), voicesrc->sz, &voicedst_wave, &voicedst->sz, snd_bank::resampler());
|
||||
snd2dx->voice_ptr(j)->sz(voicedst); // updates voice_ptr table, do not skip
|
||||
|
||||
log_warning("hooks::soundbank", "MF initialization failed, skipping..");
|
||||
}
|
||||
|
||||
// Valid 2DX (trim is not necessary)
|
||||
log_info("hooks::soundbank", "{}::Bank[2DX]::Dumping", id);
|
||||
snd_2dx::bank *buf2dx = snd2dx->serialize(false);
|
||||
snd_bank::dump("ac_soundbank.2dx", reinterpret_cast<const uint8_t *>(buf2dx), buf2dx->sz());
|
||||
}
|
||||
else
|
||||
{
|
||||
log_info("hooks::soundbank", "Tests failed");
|
||||
}
|
||||
// Filesystem tests, s3p unpacking
|
||||
snprintf(avspath, sizeof(avspath), "data/sound/%05d", id);
|
||||
if (snd_bank::has_format(avspath, ".ifs")) avsmnt = snd_bank::map_ifs(avspath);
|
||||
snprintf(avspath + strlen(avspath), 7, "/%05d", id);
|
||||
snd_bank::has_format(avspath, ".s3p");
|
||||
snd_bank::has_format(avspath, ".2dx");
|
||||
snd_bank::has_format(avspath, "_pre.2dx");
|
||||
uint8_t *bufs3p = snd_bank::read_bank_any(avspath, ".s3p", &szs3p);
|
||||
snd_s3p *snds3p = snd_s3p::unpack(bufs3p);
|
||||
if (avsmnt) avs::core::avs_fs_umount(avsmnt);
|
||||
|
||||
// Caching and intermediate 2dx storage detection
|
||||
BmsbEnumValidSoundbanks_t t = BmsbEnumValidSoundbanks;
|
||||
BmsbEnumValidSoundbanks = [](void *, int32_t, int32_t) -> void * { return nullptr; };
|
||||
char *tmp = (char *) malloc(0x3b8 + strlen("00000000") + 1);
|
||||
int arr[6] = {25073, 24016, 26057, 25073, 26087, 29095};
|
||||
strcpy(tmp, "SJISTITLE");
|
||||
strcpy(tmp + 0xc0, "SJISARTIST");
|
||||
strcpy(tmp + 0x3b8, "00000000");
|
||||
for (int it: arr)
|
||||
{
|
||||
*(int32_t *) (tmp + 0x3b0) = it;
|
||||
on_enum_valid_soundbanks(tmp, 3, 0);
|
||||
}
|
||||
// S3P => WMA => WAV => 2DX pipeline
|
||||
if (snds3p)
|
||||
{
|
||||
// S3P/S3V metadata
|
||||
memcpy(sig, snds3p->header()->sig, 4);
|
||||
log_info("hooks::soundbank", "{}::Bank[S3P]::Signature {}", id, sig);
|
||||
log_info("hooks::soundbank", "{}::Bank[S3P]::Size {}", id, szs3p);
|
||||
log_info("hooks::soundbank", "{}::Bank[S3P]::VoiceCount {}", id, snds3p->header()->voice_cnt);
|
||||
log_info("hooks::soundbank", "{}::Bank[S3P]::Voice[0]::Size {}", id, snds3p->voice_ptr(0)->sz);
|
||||
memcpy(sig, snds3p->voice(0)->sig, 4);
|
||||
log_info("hooks::soundbank", "{}::Bank[S3P]::Voice[0]::Signature {}", id, sig);
|
||||
snd_bank::dump("raw_wma.wma", snds3p->voice(0)->asf(), snds3p->voice(0)->sz);
|
||||
|
||||
free(tmp);
|
||||
BmsbEnumValidSoundbanks = t;
|
||||
snd_bank::flush_cache();
|
||||
mf_broken::deinit();
|
||||
}
|
||||
// MF codec (tainted PCM data, bad)
|
||||
mf_broken::asf_to_wav(snds3p->voice(0)->asf(), snds3p->voice(0)->sz, &wav, &wavsz);
|
||||
snd_bank::dump("mf_wav.wav", wav, wavsz);
|
||||
free(wav);
|
||||
wav = nullptr;
|
||||
wavsz = 0;
|
||||
|
||||
// AV codec (1:1 unmodified PCM data, other than resampling if enabled)
|
||||
wav = (BYTE *) malloc(snd_2dx::assertsz_asf(snds3p->voice(0)->sz, avcodec::bmswac_resampler_f32));
|
||||
avcodec::BmswTranscoderAsfToWav(snds3p->voice(0)->asf(), snds3p->voice(0)->sz, &wav, &wavsz, avcodec::bmswac_resampler_f32);
|
||||
snd_bank::dump("ac_wav.wav", wav, wavsz);
|
||||
free(wav);
|
||||
wav = nullptr;
|
||||
wavsz = 0;
|
||||
|
||||
// S3P=>2DX (max 4076 voices)
|
||||
size_t i, j;
|
||||
snd_2dx *snd2dx = snd_2dx::pack(id);
|
||||
log_info("hooks::soundbank", "{}::Bank[2DX]::Name {}", id, snd2dx->header()->name);
|
||||
for (i = 0; i < snds3p->header()->voice_cnt; i++)
|
||||
{
|
||||
// WMA=>WAV transcode
|
||||
snd_s3p::bank::voice_hdr *voicesrc = snds3p->voice(i);
|
||||
j = snd2dx->voice_emplace(snd_2dx::assertsz_asf(voicesrc->sz));
|
||||
snd_2dx::bank::voice_hdr *voicedst = snd2dx->voice(j);
|
||||
BYTE *voicedst_wave = voicedst->wave();
|
||||
//mf_broken::asf_to_wav(voicesrc->asf(), voicesrc->sz, &voicedst_wave, &voicedst->sz);
|
||||
avcodec::BmswTranscoderAsfToWav(voicesrc->asf(), voicesrc->sz, &voicedst_wave, &voicedst->sz, snd_bank::resampler());
|
||||
snd2dx->voice_ptr(j)->sz(voicedst); // updates voice_ptr table, do not skip
|
||||
|
||||
}
|
||||
|
||||
// Valid 2DX (trim is not necessary)
|
||||
log_info("hooks::soundbank", "{}::Bank[2DX]::Dumping", id);
|
||||
snd_2dx::bank *buf2dx = snd2dx->serialize(false);
|
||||
snd_bank::dump("ac_soundbank.2dx", reinterpret_cast<const uint8_t *>(buf2dx), buf2dx->sz());
|
||||
}
|
||||
else
|
||||
{
|
||||
log_info("hooks::soundbank", "Tests failed");
|
||||
}
|
||||
|
||||
// Caching and intermediate 2dx storage detection
|
||||
BmsbEnumValidSoundbanks_t t = BmsbEnumValidSoundbanks;
|
||||
BmsbEnumValidSoundbanks = [](void *, int32_t, int32_t) -> void * { return nullptr; };
|
||||
char *tmp = (char *) malloc(0x3b8 + strlen("00000000") + 1);
|
||||
int arr[6] = {25073, 24016, 26057, 25073, 26087, 29095};
|
||||
strcpy(tmp, "SJISTITLE");
|
||||
strcpy(tmp + 0xc0, "SJISARTIST");
|
||||
strcpy(tmp + 0x3b8, "00000000");
|
||||
for (int it: arr)
|
||||
{
|
||||
*(int32_t *) (tmp + 0x3b0) = it;
|
||||
on_enum_valid_soundbanks(tmp, 3, 0);
|
||||
}
|
||||
|
||||
free(tmp);
|
||||
BmsbEnumValidSoundbanks = t;
|
||||
snd_bank::flush_cache();
|
||||
mf_broken::deinit();
|
||||
}
|
||||
} tests_("sndb_test");
|
||||
void init(HINSTANCE hmodule, const char *model, const char *ext)
|
||||
{
|
||||
if (false && IsDebuggerPresent())
|
||||
@@ -960,7 +965,7 @@ void init(HINSTANCE hmodule, const char *model, const char *ext)
|
||||
// Setup on_enum_valid_ksbd and optional tests
|
||||
offset_.guard = new memutils::VProtectGuard((void *) offset_.RD_05d_2dx, SNDPATHFMTMAX);
|
||||
detour::trampoline(reinterpret_cast<void *>(offset_.TX_BmsbEnumValidSoundbanks), reinterpret_cast<void *>(on_enum_valid_soundbanks), reinterpret_cast<void **>(&BmsbEnumValidSoundbanks));
|
||||
hooks::devel::bind_routine(hooks::devel::sndb_test, run_tests);
|
||||
hooks::devel::bind_routine(&tests_);
|
||||
|
||||
log_info("hooks::soundbank", "Soundbank preprocessor ready");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user