Merge pull request #650 from NicknineTheEagle/xma-ubi

Xma ubi
This commit is contained in:
NicknineTheEagle 2020-06-13 23:07:40 +03:00 committed by GitHub
commit 88be328495
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions

View File

@ -147,7 +147,7 @@ as explained below, but often will use default values. Accepted codec strings:
# * For Tiger Game.com
# - ASF Argonaut ASF ADPCM
# * For rare Argonaut games [Croc (SAT)]
# - EAXA Electronis Arts EA-XA ADPCM
# - EAXA Electronic Arts EA-XA ADPCM
# * For rare EA games [Harry Potter and the Chamber of Secrets (PC)]
codec = (codec string)
```

View File

@ -1104,7 +1104,7 @@ static VGMSTREAM* init_vgmstream_ubi_sb_base(ubi_sb_header* sb, STREAMFILE* sf_h
block_align = 0x98 * sb->channels;
encoder_delay = 1024 + 69*2; /* approximate */
vgmstream->codec_data = init_ffmpeg_atrac3_raw(sf_data, start_offset,sb->stream_size, sb->num_samples,sb->channels,sb->sample_rate, block_align, encoder_delay);
vgmstream->codec_data = init_ffmpeg_atrac3_raw(sf_data, start_offset, sb->stream_size, sb->num_samples, sb->channels, sb->sample_rate, block_align, encoder_delay);
if (!vgmstream->codec_data) goto fail;
vgmstream->coding_type = coding_FFmpeg;
vgmstream->layout_type = layout_none;
@ -2754,7 +2754,7 @@ static int check_project_file(STREAMFILE *sf_header, const char *name, int has_l
if (has_localized_banks) { /* try again for localized subfolders */
char buf[PATH_LIMIT];
snprintf(buf, PATH_LIMIT, "../%s", name);
sf_test = open_streamfile_by_filename(sf_header, name);
sf_test = open_streamfile_by_filename(sf_header, buf);
if (sf_test) {
close_streamfile(sf_test);
return 1;

View File

@ -14,9 +14,10 @@ VGMSTREAM * init_vgmstream_xma(STREAMFILE *streamFile) {
/* checks */
/* .xma: standard
* .xma2: Skullgirls (X360)
* .wav: Super Meat Boy (X360)
* .nps: Beautiful Katamari (X360)
* .str: Sonic & Sega All Stars Racing (X360) */
if ( !check_extensions(streamFile, "xma,xma2,nps,str") )
if ( !check_extensions(streamFile, "xma,xma2,wav,nps,str") )
goto fail;
/* check header */