Skip to content

[BOX32] Fix vorbis pcmout/lapout/analysis_buffer pointer conversion #3630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptitSeb merged 2 commits into from
Mar 9, 2026
Merged

[BOX32] Fix vorbis pcmout/lapout/analysis_buffer pointer conversion #3630

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
313f97e
Fix 32-bit vorbis pcmout/lapout/analysis_buffer pointer conversion
runlevel5 Mar 8, 2026
4b33608
move pcm32 buffer into dsp shadow struct for thread safety
runlevel5 Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 43 additions & 9 deletions src/wrapped32/wrappedlibvorbis.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ typedef struct {
int64_t floor_bits;
int64_t res_bits;
void *backend_state;
ptr_t pcm32[256]; // buffer for converting native float** to ptr_t[] for 32-bit code
} my_vorbis_dsp_state_t;

typedef struct {
Expand Down Expand Up @@ -538,12 +539,20 @@ EXPORT int my32_vorbis_synthesis_init(x64emu_t* emu, void* vd, void* vi)
return ret;
}

EXPORT void* my32_vorbis_analysis_buffer(x64emu_t* emu, void* vd, int vals)
EXPORT ptr_t my32_vorbis_analysis_buffer(x64emu_t* emu, void* vd, int vals)
{
my_vorbis_dsp_state_t* dsp_shadow = getDspShadow(vd);
void* ret = my->vorbis_analysis_buffer(dsp_shadow, vals);
float** native_buf = my->vorbis_analysis_buffer(dsp_shadow, vals);
vorbis_dsp_state_to_32(vd, dsp_shadow);
return ret;
if(native_buf) {
my_vorbis_info_t* vi = (my_vorbis_info_t*)dsp_shadow->vi;
int channels = vi ? vi->channels : 0;
if(channels > 256) channels = 256;
for(int i = 0; i < channels; i++)
dsp_shadow->pcm32[i] = to_ptrv(native_buf[i]);
return to_ptrv(dsp_shadow->pcm32);
}
return 0;
}

EXPORT int my32_vorbis_analysis_wrote(x64emu_t* emu, void* vd, int vals)
Expand Down Expand Up @@ -663,21 +672,46 @@ EXPORT int my32_vorbis_synthesis_blockin(x64emu_t* emu, void* vd, void* vb)
return ret;
}

EXPORT int my32_vorbis_synthesis_pcmout(x64emu_t* emu, void* vd, void* pcm)
EXPORT int my32_vorbis_synthesis_pcmout(x64emu_t* emu, void* vd, ptr_t* pcm)
{
my_vorbis_dsp_state_t* dsp_shadow = getDspShadow(vd);
// pcm is float***, the library writes a pointer to its internal float** array
// The float** and float* data are native pointers allocated by the library
int ret = my->vorbis_synthesis_pcmout(dsp_shadow, pcm);
float** native_pcm = NULL;
int ret = my->vorbis_synthesis_pcmout(dsp_shadow, pcm ? &native_pcm : NULL);
vorbis_dsp_state_to_32(vd, dsp_shadow);
if(pcm) {
if(native_pcm) {
// Convert the float** (array of native float* per channel) to ptr_t[]
my_vorbis_info_t* vi = (my_vorbis_info_t*)dsp_shadow->vi;
int channels = vi ? vi->channels : 0;
if(channels > 256) channels = 256;
for(int i = 0; i < channels; i++)
dsp_shadow->pcm32[i] = to_ptrv(native_pcm[i]);
*pcm = to_ptrv(dsp_shadow->pcm32);
} else {
*pcm = 0;
}
}
return ret;
}

EXPORT int my32_vorbis_synthesis_lapout(x64emu_t* emu, void* vd, void* pcm)
EXPORT int my32_vorbis_synthesis_lapout(x64emu_t* emu, void* vd, ptr_t* pcm)
{
my_vorbis_dsp_state_t* dsp_shadow = getDspShadow(vd);
int ret = my->vorbis_synthesis_lapout(dsp_shadow, pcm);
float** native_pcm = NULL;
int ret = my->vorbis_synthesis_lapout(dsp_shadow, pcm ? &native_pcm : NULL);
vorbis_dsp_state_to_32(vd, dsp_shadow);
if(pcm) {
if(native_pcm) {
my_vorbis_info_t* vi = (my_vorbis_info_t*)dsp_shadow->vi;
int channels = vi ? vi->channels : 0;
if(channels > 256) channels = 256;
for(int i = 0; i < channels; i++)
dsp_shadow->pcm32[i] = to_ptrv(native_pcm[i]);
*pcm = to_ptrv(dsp_shadow->pcm32);
} else {
*pcm = 0;
}
}
return ret;
}

Expand Down
Loading