Merge pull request #648 from NicknineTheEagle/ubi

Ubi BAO: Fixed layers with varying sample rate
This commit is contained in:
NicknineTheEagle 2020-06-10 22:02:07 +03:00 committed by GitHub
commit c2b7b58c11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -989,12 +989,10 @@ static int parse_type_layer(ubi_bao_header * bao, off_t offset, STREAMFILE* stre
if (bao->sample_rate != sample_rate || bao->stream_type != stream_type) { if (bao->sample_rate != sample_rate || bao->stream_type != stream_type) {
VGM_LOG("UBI BAO: layer headers don't match at %x\n", (uint32_t)table_offset); VGM_LOG("UBI BAO: layer headers don't match at %x\n", (uint32_t)table_offset);
if (bao->cfg.layer_ignore_error) { if (!bao->cfg.layer_ignore_error) {
continue;
}
goto fail; goto fail;
} }
}
/* uncommonly channels may vary per layer [Rayman Raving Rabbids: TV Party (Wii) ex. 0x22000cbc.pk] */ /* uncommonly channels may vary per layer [Rayman Raving Rabbids: TV Party (Wii) ex. 0x22000cbc.pk] */
bao->layer_channels[i] = channels; bao->layer_channels[i] = channels;