Skip to content
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

Jump to bottom

[WAVEOUT] Dynamic alloc of WAVEHDR #873

Merged
merged 1 commit into from
May 3, 2021
Merged

[WAVEOUT] Dynamic alloc of WAVEHDR #873

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 7 additions & 12 deletions src/drivers/fluid_waveout.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@
#include <ks.h>
#include <ksmedia.h>

/* Number of driver buffers in the chain */
#define NB_SOUND_BUFFERS 4

/**
* The driver handle multiple channels.
* Actually the number maximum of channels is limited to 2 * WAVEOUT_MAX_STEREO_CHANNELS.
Expand Down Expand Up @@ -82,7 +79,7 @@ typedef struct
float **drybuf;

HWAVEOUT hWaveOut;
WAVEHDR waveHeader[NB_SOUND_BUFFERS];
WAVEHDR *waveHeader;

int periods; /* numbers of internal driver buffers */
int num_frames;
Expand Down Expand Up @@ -286,13 +283,6 @@ new_fluid_waveout_audio_driver2(fluid_settings_t *settings, fluid_audio_func_t f
fluid_settings_getint(settings, "audio.period-size", &period_size);
fluid_settings_getint(settings, "synth.audio-channels", &audio_channels);

if(periods > NB_SOUND_BUFFERS)
{
FLUID_LOG(FLUID_INFO, "audio.periods %d exceeds internal limit %d",
periods, NB_SOUND_BUFFERS);
return NULL;
}

/* Clear format structure */
ZeroMemory(&wfx, sizeof(WAVEFORMATEXTENSIBLE));

Expand Down Expand Up @@ -359,13 +349,18 @@ new_fluid_waveout_audio_driver2(fluid_settings_t *settings, fluid_audio_func_t f
lenBuffer = wfx.Format.nBlockAlign * period_size;
/* create and clear the driver data */
dev = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
sizeof(fluid_waveout_audio_driver_t) + lenBuffer * periods);
sizeof(fluid_waveout_audio_driver_t) +
lenBuffer * periods +
sizeof(WAVEHDR) * periods);
if(dev == NULL)
{
FLUID_LOG(FLUID_ERR, "Out of memory");
return NULL;
}

/* Assign extra memory to WAVEHDR */
dev->waveHeader = (WAVEHDR *)((uintptr_t)(dev + 1) + lenBuffer * periods);

/* Save copy of synth */
dev->synth = data;
dev->func = func;
Expand Down