Mirrors/psxavenc
2
0
Fork 1
mirror of https://github.com/WonderfulToolchain/psxavenc.git synced 2026-02-02 03:26:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix uninitialized coding flags when using PSX_AUDIO_XA_FORMAT_XA (#13)

Browse Source 
When using format `PSX_AUDIO_XA_FORMAT_XACD`, `psx_audio_xa_encode_init_sector` calls `psx_cdrom_init_sector`,
which calls `psx_cdrom_init_xa_subheader`, which zeroes out the subheader. But when using
`PSX_AUDIO_XA_FORMAT_XA`, `psx_audio_xa_encode_init_sector` doesn't call either init function, which leaves
`coding` uninitialized. All of the other subheader fields are assigned directly, so they aren't affected, but
`coding` is only OR'd with flags, so it can become corrupted. This could be fixed just by changing the first
OR with an assignment, but this PR instead calls `psx_cdrom_init_xa_subheader` directly when the format is
`PSX_AUDIO_XA_FORMAT_XA`.
This commit is contained in:
Spencer Alves
2026-01-03 10:23:23 -08:00
committed by GitHub
parent bdc24e897e
commit 82f3871c5f
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpsxav/adpcm.c
View File

@@ -266,6 +266,8 @@ static inline void psx_audio_xa_sync_subheader_copy(psx_cdrom_sector_mode2_t *bu
static void psx_audio_xa_encode_init_sector(psx_cdrom_sector_mode2_t *buffer, int lba, psx_audio_xa_settings_t settings) {
if (settings.format == PSX_AUDIO_XA_FORMAT_XACD)
psx_cdrom_init_sector((psx_cdrom_sector_t *)buffer, lba, PSX_CDROM_SECTOR_TYPE_MODE2_FORM2);
else if (settings.format == PSX_AUDIO_XA_FORMAT_XA)
psx_cdrom_init_xa_subheader(buffer->subheader, PSX_CDROM_SECTOR_TYPE_MODE2_FORM2);
buffer->subheader[0].file = settings.file_number;
buffer->subheader[0].channel = settings.channel_number & PSX_CDROM_SECTOR_XA_CHANNEL_MASK;