kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated VGMStream to r1050-2955-g9aaba3b3

CQTexperiment
Christopher Snowhill 2020-05-16 19:01:23 -07:00
parent cbe7dcfd4f
commit c009a17ccd
4 changed files with 121 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Frameworks/vgmstream/vgmstream/src/coding/ptadpcm_decoder.c
View File

@ -80,7 +80,7 @@ void decode_ptadpcm(VGMSTREAMCHANNEL *stream, sample_t *outbuf, int channelspaci
sample_count++; sample_count++;
/* decode nibbles */ /* decode nibbles */
for (i = first_sample; i < first_sample + samples_to_do; i++) { for (i = 0; i < samples_per_frame - 2; i++) {
uint8_t nibbles = frame[0x05 + i/2]; uint8_t nibbles = frame[0x05 + i/2];
int32_t sample; int32_t sample;

6
Frameworks/vgmstream/vgmstream/src/meta/ea_schl.c
View File

@ -1285,8 +1285,10 @@ static VGMSTREAM * init_vgmstream_ea_variable_header(STREAMFILE* sf, ea_header*
case EA_CODEC2_MT5: { /* MicroTalk (5:1 compression) */ case EA_CODEC2_MT5: { /* MicroTalk (5:1 compression) */
int use_pcm_blocks = 0; int use_pcm_blocks = 0;
if (ea->version == EA_VERSION_V3 || (ea->version == EA_VERSION_V2 && if (ea->version == EA_VERSION_V3 || (ea->version == EA_VERSION_V2 &&
(ea->platform == EA_PLATFORM_PC || ea->platform == EA_PLATFORM_MAC))) { (ea->platform == EA_PLATFORM_PC ||
ea->platform == EA_PLATFORM_MAC ||
ea->platform == EA_PLATFORM_GENERIC))) {
use_pcm_blocks = 1; use_pcm_blocks = 1;
} }

3
Frameworks/vgmstream/vgmstream/src/meta/hca_keys.h
View File

@ -334,6 +334,9 @@ static const hcakey_info hcakey_list[] = {
/* Detective Conan Runner / Case Closed Runner (Android) */ /* Detective Conan Runner / Case Closed Runner (Android) */
{1175268187653273344}, // 104f643098e3f700 {1175268187653273344}, // 104f643098e3f700
/* I Chu EtoileStage (Android) */
{1433227444226663680}, // 13E3D8C45778A500
/* Dragalia Lost (iOS/Android) */ /* Dragalia Lost (iOS/Android) */
{2967411924141, subkeys_dgl, sizeof(subkeys_dgl) / sizeof(subkeys_dgl[0]) }, // 000002B2E7889CAD {2967411924141, subkeys_dgl, sizeof(subkeys_dgl) / sizeof(subkeys_dgl[0]) }, // 000002B2E7889CAD

226
Frameworks/vgmstream/vgmstream/src/meta/vxn.c
View File

@ -1,113 +1,113 @@
#include "meta.h" #include "meta.h"
#include "../coding/coding.h" #include "../coding/coding.h"
/* VXN - from Gameloft mobile games */ /* VXN - from Gameloft mobile games */
VGMSTREAM * init_vgmstream_vxn(STREAMFILE *streamFile) { VGMSTREAM* init_vgmstream_vxn(STREAMFILE* sf) {
VGMSTREAM * vgmstream = NULL; VGMSTREAM* vgmstream = NULL;
int loop_flag = 0, channel_count, codec, sample_rate, block_align, bits, num_samples; int loop_flag = 0, channel_count, codec, sample_rate, block_align, bits, num_samples;
off_t start_offset, stream_offset, chunk_offset, first_offset = 0x00; off_t start_offset, stream_offset, chunk_offset, first_offset = 0x00;
size_t stream_size; size_t stream_size;
int total_subsongs, target_subsong = streamFile->stream_index; int total_subsongs, target_subsong = sf->stream_index;
/* checks */ /* checks */
if (!check_extensions(streamFile,"vxn")) if (!check_extensions(sf,"vxn"))
goto fail; goto fail;
if (read_32bitBE(0x00,streamFile) != 0x566F784E) /* "VoxN" */ if (read_u32be(0x00,sf) != 0x566F784E) /* "VoxN" */
goto fail; goto fail;
if (read_32bitLE(0x10,streamFile) != get_streamfile_size(streamFile) ) if (read_u32le(0x10,sf) != get_streamfile_size(sf))
goto fail; goto fail;
/* header is RIFF-like with many custom chunks */ /* header is RIFF-like with many custom chunks */
if (!find_chunk_le(streamFile, 0x41666D74,first_offset,0, &chunk_offset,NULL)) /* "Afmt" */ if (!find_chunk_le(sf, 0x41666D74,first_offset,0, &chunk_offset,NULL)) /* "Afmt" */
goto fail; goto fail;
codec = (uint16_t)read_16bitLE(chunk_offset+0x00, streamFile); codec = read_u16le(chunk_offset+0x00, sf);
channel_count = (uint16_t)read_16bitLE(chunk_offset+0x02, streamFile); channel_count = read_u16le(chunk_offset+0x02, sf);
sample_rate = read_32bitLE(chunk_offset+0x04, streamFile); sample_rate = read_u32le(chunk_offset+0x04, sf);
block_align = (uint16_t)read_16bitLE(chunk_offset+0x08, streamFile); block_align = read_u16le(chunk_offset+0x08, sf);
bits = read_16bitLE(chunk_offset+0x0a, streamFile); bits = read_16bitLE(chunk_offset+0x0a, sf);
/* files are divided into segment subsongs, often a leadout and loop in that order /* files are divided into segment subsongs, often a leadout and loop in that order
* (the "Plst" and "Rule" chunks may have order info) */ * (the "Plst" and "Rule" chunks may have order info) */
if (!find_chunk_le(streamFile, 0x5365676D,first_offset,0, &chunk_offset,NULL)) /* "Segm" */ if (!find_chunk_le(sf, 0x5365676D,first_offset,0, &chunk_offset,NULL)) /* "Segm" */
goto fail; goto fail;
total_subsongs = read_32bitLE(chunk_offset+0x00, streamFile); total_subsongs = read_u32le(chunk_offset+0x00, 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;
stream_offset = read_32bitLE(chunk_offset+0x04 + (target_subsong-1)*0x18 + 0x00, streamFile); stream_offset = read_u32le(chunk_offset+0x04 + (target_subsong-1)*0x18 + 0x00, sf);
stream_size = read_32bitLE(chunk_offset+0x04 + (target_subsong-1)*0x18 + 0x04, streamFile); stream_size = read_u32le(chunk_offset+0x04 + (target_subsong-1)*0x18 + 0x04, sf);
num_samples = read_32bitLE(chunk_offset+0x04 + (target_subsong-1)*0x18 + 0x08, streamFile); num_samples = read_u32le(chunk_offset+0x04 + (target_subsong-1)*0x18 + 0x08, sf);
if (!find_chunk_le(streamFile, 0x44617461,first_offset,0, &chunk_offset,NULL)) /* "Data" */ if (!find_chunk_le(sf, 0x44617461,first_offset,0, &chunk_offset,NULL)) /* "Data" */
goto fail; goto fail;
start_offset = chunk_offset + stream_offset; start_offset = chunk_offset + stream_offset;
/* build the VGMSTREAM */ /* build the VGMSTREAM */
vgmstream = allocate_vgmstream(channel_count,loop_flag); vgmstream = allocate_vgmstream(channel_count,loop_flag);
if (!vgmstream) goto fail; if (!vgmstream) goto fail;
vgmstream->sample_rate = sample_rate; vgmstream->sample_rate = sample_rate;
vgmstream->num_samples = num_samples; vgmstream->num_samples = num_samples;
vgmstream->num_streams = total_subsongs; vgmstream->num_streams = total_subsongs;
vgmstream->stream_size = stream_size; vgmstream->stream_size = stream_size;
vgmstream->meta_type = meta_VXN; vgmstream->meta_type = meta_VXN;
switch (codec) { switch (codec) {
case 0x0001: /* PCM */ case 0x0001: /* PCM */
if (bits != 16) goto fail; if (bits != 16) goto fail;
vgmstream->coding_type = coding_PCM16LE; vgmstream->coding_type = coding_PCM16LE;
vgmstream->interleave_block_size = block_align; vgmstream->interleave_block_size = block_align;
vgmstream->layout_type = layout_interleave; vgmstream->layout_type = layout_interleave;
break; break;
case 0x0002: /* MSADPCM (ex. Asphalt 7) */ case 0x0002: /* MSADPCM (ex. Asphalt 7) */
if (bits != 4) goto fail; if (bits != 4) goto fail;
vgmstream->coding_type = coding_MSADPCM; vgmstream->coding_type = coding_MSADPCM;
vgmstream->frame_size = block_align; vgmstream->frame_size = block_align;
vgmstream->layout_type = layout_none; vgmstream->layout_type = layout_none;
if (find_chunk_le(streamFile, 0x4D736165,first_offset,0, &chunk_offset,NULL)) { /* "Msae" */ if (find_chunk_le(sf, 0x4D736165,first_offset,0, &chunk_offset,NULL)) { /* "Msae" */
if (!msadpcm_check_coefs(streamFile, chunk_offset + 0x02)) if (!msadpcm_check_coefs(sf, chunk_offset + 0x02))
goto fail; goto fail;
} }
break; break;
case 0x0011: /* MS-IMA (ex. Asphalt 6) */ case 0x0011: /* MS-IMA (ex. Asphalt 6) */
if (bits != 16) goto fail; if (bits != 4 && bits != 16) goto fail; /* 16=common, 4=Asphalt Injection (Vita) */
vgmstream->coding_type = coding_MS_IMA; vgmstream->coding_type = coding_MS_IMA;
vgmstream->interleave_block_size = block_align; vgmstream->interleave_block_size = block_align;
vgmstream->layout_type = layout_none; vgmstream->layout_type = layout_none;
break; break;
#ifdef VGM_USE_FFMPEG #ifdef VGM_USE_FFMPEG
case 0x0800: /* Musepack (ex. Asphalt Xtreme) */ case 0x0800: /* Musepack (ex. Asphalt Xtreme) */
if (bits != -1) goto fail; if (bits != -1) goto fail;
vgmstream->codec_data = init_ffmpeg_offset(streamFile, start_offset,stream_size); vgmstream->codec_data = init_ffmpeg_offset(sf, start_offset,stream_size);
if (!vgmstream->codec_data) goto fail; if (!vgmstream->codec_data) goto fail;
vgmstream->coding_type = coding_FFmpeg; vgmstream->coding_type = coding_FFmpeg;
vgmstream->layout_type = layout_none; vgmstream->layout_type = layout_none;
/* unlike standard .mpc, .vxn has no seek table so no need to fix */ /* unlike standard .mpc, .vxn has no seek table so no need to fix */
//ffmpeg_set_force_seek(vgmstream->codec_data); //ffmpeg_set_force_seek(vgmstream->codec_data);
break; break;
#endif #endif
default: default:
VGM_LOG("VXN: unknown codec 0x%02x\n", codec); VGM_LOG("VXN: unknown codec 0x%02x\n", codec);
goto fail; goto fail;
} }
if ( !vgmstream_open_stream(vgmstream, streamFile, start_offset) ) if (!vgmstream_open_stream(vgmstream, sf, start_offset))
goto fail; goto fail;
return vgmstream; return vgmstream;
fail: fail:
close_vgmstream(vgmstream); close_vgmstream(vgmstream);
return NULL; return NULL;
} }