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

Merge pull request #598 from bnnm/adxkey-ptadpcm-genh

Browse Source 
adxkey ptadpcm genh
This commit is contained in:
bnnm 2020-04-15 18:36:13 +02:00 committed by GitHub
commit 8135607bfe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/meta/adx_keys.h
View File

@ -234,8 +234,8 @@ static const adxkey_info adxkey9_list[] = {
/* Detective Conan Runner / Case Closed Runner (Android) */
{0x0613,0x0e3d,0x6dff, NULL,1175268187653273344}, // 104f643098e3f700
/* Persona 5 Royal (PS4)*/
{0x0000,0x1c85,0x1043, NULL,29902882}, // guessed with VGAudio
/* Persona 5 Royal (PS4) */
{0x0000,0x1c85,0x7043, NULL,29915170}, // 0000000001C87822
};

6
src/meta/genh.c
View File

@ -454,6 +454,12 @@ static int parse_genh(STREAMFILE * streamFile, genh_header * genh) {
genh->num_samples = genh->num_samples > 0 ? genh->num_samples : genh->loop_end_sample;
genh->loop_flag = genh->loop_start_sample != -1;
/* fix for buggy GENHs that used to work before interleaved XBOX-IMA was added
* (could do check for other cases, but maybe it's better to give bad sound on nonsense values) */
if (genh->codec == XBOX && genh->interleave < 0x24) { /* found as 0x2 */
genh->interleave = 0;
}
return 1;
fail:

4
src/meta/wwise.c
View File

@ -190,9 +190,7 @@ VGMSTREAM * init_vgmstream_wwise(STREAMFILE *streamFile) {
case 0xFFFF: ww.codec = VORBIS; break;
case 0x3039: ww.codec = OPUSNX; break; /* later renamed from "OPUS" */
case 0x3040: ww.codec = OPUS; break;
#if 0
case 0x8311: ww.codec = PTADPCM; break;
#endif
case 0x8311: ww.codec = PTADPCM; break; /* newer, rare [Genshin Impact (PC)] */
default:
goto fail;
}