mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rawmidi: allocate the read buffer in the params call

Browse source 
It is better to allocate the read buffer for the framing stream
in the params setup call.

Suggested-by: David Henningsson <coding@diwic.se>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2021-10-11 14:33:29 +02:00
parent 392d5b06f8
commit a6a22d82a0
1 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/rawmidi/rawmidi_hw.c
View file

@ -108,17 +108,32 @@ static int snd_rawmidi_hw_info(snd_rawmidi_t *rmidi, snd_rawmidi_info_t * info)
static int snd_rawmidi_hw_params(snd_rawmidi_t *rmidi, snd_rawmidi_params_t * params) static int snd_rawmidi_hw_params(snd_rawmidi_t *rmidi, snd_rawmidi_params_t * params)
{ {
snd_rawmidi_hw_t *hw = rmidi->private_data; snd_rawmidi_hw_t *hw = rmidi->private_data;
int tstamp;
params->stream = rmidi->stream; params->stream = rmidi->stream;
if (ioctl(hw->fd, SNDRV_RAWMIDI_IOCTL_PARAMS, params) < 0) { if (ioctl(hw->fd, SNDRV_RAWMIDI_IOCTL_PARAMS, params) < 0) {
SYSERR("SNDRV_RAWMIDI_IOCTL_PARAMS failed"); SYSERR("SNDRV_RAWMIDI_IOCTL_PARAMS failed");
return -errno; return -errno;
} }
buf_reset(hw); buf_reset(hw);
if (hw->buf && tstamp = (params->mode & SNDRV_RAWMIDI_MODE_FRAMING_MASK) == SNDRV_RAWMIDI_MODE_FRAMING_TSTAMP;
((params->mode & SNDRV_RAWMIDI_MODE_FRAMING_MASK) != SNDRV_RAWMIDI_MODE_FRAMING_TSTAMP)) { if (hw->buf && !tstamp) {
free(hw->buf); free(hw->buf);
hw->buf = NULL; hw->buf = NULL;
hw->buf_size = 0; hw->buf_size = 0;
} else if (tstamp) {
size_t alloc_size;
void *buf;
alloc_size = page_size();
if (params->buffer_size > alloc_size)
alloc_size = params->buffer_size;
if (alloc_size != hw->buf_size) {
buf = realloc(hw->buf, alloc_size);
if (buf == NULL)
return -ENOMEM;
hw->buf = buf;
hw->buf_size = alloc_size;
}
} }
return 0; return 0;
} }
@ -230,7 +245,6 @@ static ssize_t snd_rawmidi_hw_tread(snd_rawmidi_t *rmidi, struct timespec *tstam
{ {
snd_rawmidi_hw_t *hw = rmidi->private_data; snd_rawmidi_hw_t *hw = rmidi->private_data;
ssize_t result = 0, ret; ssize_t result = 0, ret;
size_t alloc_size;
/* no timestamp */ /* no timestamp */
tstamp->tv_sec = tstamp->tv_nsec = 0; tstamp->tv_sec = tstamp->tv_nsec = 0;
@ -245,15 +259,6 @@ static ssize_t snd_rawmidi_hw_tread(snd_rawmidi_t *rmidi, struct timespec *tstam
size -= result; size -= result;
} }
alloc_size = page_align(size * 2); /* keep room for the frame meta data */
if (alloc_size > hw->buf_size) {
void *buf = realloc(hw->buf, alloc_size);
if (buf == NULL)
return result > 0 ? result : -ENOMEM;
hw->buf = buf;
hw->buf_size = alloc_size;
}
buf_reset(hw); buf_reset(hw);
ret = read(hw->fd, hw->buf, hw->buf_size); ret = read(hw->fd, hw->buf, hw->buf_size);
if (ret < 0) if (ret < 0)