Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2025-02-06 14:44:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjust .awc num_samples for multichannel of varying samples

Browse Source
This commit is contained in:
bnnm 2020-03-08 19:38:54 +01:00
parent 27bdf23fdd
commit d67ead8afa
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/meta/awc.c
View File

@ -25,16 +25,15 @@ typedef struct {
static int parse_awc_header(STREAMFILE* streamFile, awc_header* awc); static int parse_awc_header(STREAMFILE* streamFile, awc_header* awc);
/* AWC - from RAGE (Rockstar Advanced Game Engine) audio (Red Dead Redemption, Max Payne 3, GTA5) */ /* AWC - from RAGE (Rockstar Advanced Game Engine) audio [Red Dead Redemption, Max Payne 3, GTA5 (multi)] */
VGMSTREAM * init_vgmstream_awc(STREAMFILE *streamFile) { VGMSTREAM * init_vgmstream_awc(STREAMFILE *streamFile) {
VGMSTREAM * vgmstream = NULL; VGMSTREAM * vgmstream = NULL;
awc_header awc = {0}; awc_header awc = {0};
/* check extension */
/* checks */
if (!check_extensions(streamFile,"awc")) if (!check_extensions(streamFile,"awc"))
goto fail; goto fail;
/* check header */
if (!parse_awc_header(streamFile, &awc)) if (!parse_awc_header(streamFile, &awc))
goto fail; goto fail;
@ -295,16 +294,21 @@ static int parse_awc_header(STREAMFILE* streamFile, awc_header* awc) {
sample_rate = (uint16_t)read_16bit(offset + 0x0c + 0x10*ch + 0x0a,streamFile); sample_rate = (uint16_t)read_16bit(offset + 0x0c + 0x10*ch + 0x0a,streamFile);
codec = read_8bit(offset + 0x0c + 0x10*ch + 0x0c, streamFile); codec = read_8bit(offset + 0x0c + 0x10*ch + 0x0c, streamFile);
/* validate as all channels should repeat this (when channels is even and > 2 seems /* validate channels differences */
* it's stereo pairs, and num_samples can vary slightly but no matter) */
if ((awc->num_samples && !(awc->num_samples >= num_samples - 10 && awc->num_samples <= num_samples + 10)) || if ((awc->num_samples && !(awc->num_samples >= num_samples - 10 && awc->num_samples <= num_samples + 10)) ||
(awc->sample_rate && awc->sample_rate != sample_rate) || (awc->sample_rate && awc->sample_rate != sample_rate)) {
(awc->codec && awc->codec != codec)) { VGM_LOG("AWC: found header diffs in channel %i, ns=%i vs %i, sr=%i vs %i\n",
VGM_LOG("AWC: found header diffs in channel %i, ns=%i vs %i, sr=%i vs %i, c=%i vs %i\n", ch, awc->num_samples, num_samples, awc->sample_rate, sample_rate);
ch, awc->num_samples, num_samples, awc->sample_rate, sample_rate, awc->codec, codec); /* sometimes (often cutscenes in Max Payne 3 and RDR DLC) channels have bif sample diffs,
//goto fail; //todo some Max Payne 3 cutscene channels have huge sample diffs * probably one stream is simply silent after its samples end */
} }
if ((awc->codec && awc->codec != codec)) {
VGM_LOG("AWC: found header diffs in channel %i, c=%i vs %i\n", ch, awc->codec, codec);
goto fail;
}
if (awc->num_samples < num_samples) /* use biggest channel */
awc->num_samples = num_samples; awc->num_samples = num_samples;
awc->sample_rate = sample_rate; awc->sample_rate = sample_rate;
awc->codec = codec; awc->codec = codec;