- Patch - mailman.alsa-project.org

[PATCH - alsa-lib 2/4] pcm_file: use snd_pcm_file_areas_read_infile for readi
by Adam Miartus 21 May '19

21 May '19

use previously introduced helper function, this commit unifies behavior of readi and readn corner case behavior of readi is changed by this commit, previously, in case 0 bytes were red from file (EOF), frames = 0 was returned, signaling api user as if no data was red from slave, after the patch, amount of frames red from slave with data red from slave stored in buffer is returned when EOF is reached Signed-off-by: Adam Miartus <amiartus(a)de.adit-jv.com> Reviewed-by: Timo Wischer <twischer(a)de.adit-jv.com> diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index 3c68265..dcaa41d 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -579,22 +579,21 @@ static snd_pcm_sframes_t snd_pcm_file_readi(snd_pcm_t *pcm, void *buffer, snd_pc { snd_pcm_file_t *file = pcm->private_data; snd_pcm_channel_area_t areas[pcm->channels]; - snd_pcm_sframes_t n; + snd_pcm_sframes_t frames; + + __snd_pcm_lock(pcm); + + frames = _snd_pcm_readi(file->gen.slave, buffer, size); + if (frames <= 0) + return frames; - n = _snd_pcm_readi(file->gen.slave, buffer, size); - if (n <= 0) - return n; - if (file->ifd >= 0) { - __snd_pcm_lock(pcm); - n = read(file->ifd, buffer, n * pcm->frame_bits / 8); - __snd_pcm_unlock(pcm); - if (n < 0) - return n; - n = n * 8 / pcm->frame_bits; - } snd_pcm_areas_from_buf(pcm, areas, buffer); - snd_pcm_file_add_frames(pcm, areas, 0, n); - return n; + snd_pcm_file_areas_read_infile(pcm, areas, 0, frames); + snd_pcm_file_add_frames(pcm, areas, 0, frames); + + __snd_pcm_unlock(pcm); + + return frames; } /* locking */ -- 2.7.4

1 0

[PATCH - alsa-lib 1/4] pcm_file: add support for infile reading in non interleaved mode
by Adam Miartus 21 May '19

21 May '19

add helper function to copy input file data to buffer mapped by areas, in case of an error, do not fill the areas, allowing device read buffer to be provided to api caller previously unused rbuf variable is reused for this purpose Signed-off-by: Adam Miartus <amiartus(a)de.adit-jv.com> Reviewed-by: Timo Wischer <twischer(a)de.adit-jv.com> diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index 3a19cef..3c68265 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -77,6 +77,7 @@ typedef struct { snd_pcm_uframes_t appl_ptr; snd_pcm_uframes_t file_ptr_bytes; snd_pcm_uframes_t wbuf_size; + snd_pcm_uframes_t rbuf_size; size_t wbuf_size_bytes; size_t wbuf_used_bytes; char *wbuf; @@ -266,6 +267,39 @@ static int snd_pcm_file_open_output_file(snd_pcm_file_t *file) return 0; } +/* fill areas with data from input file, return bytes red */ +static int snd_pcm_file_areas_read_infile(snd_pcm_t *pcm, + const snd_pcm_channel_area_t *areas, + snd_pcm_uframes_t offset, + snd_pcm_uframes_t frames) +{ + snd_pcm_file_t *file = pcm->private_data; + snd_pcm_channel_area_t areas_if[pcm->channels]; + ssize_t bytes; + + if (file->ifd < 0) + return -EBADF; + + if (file->rbuf == NULL) + return -ENOMEM; + + if (file->rbuf_size < frames) { + SYSERR("requested more frames than pcm buffer"); + return -ENOMEM; + } + + bytes = read(file->ifd, file->rbuf, snd_pcm_frames_to_bytes(pcm, frames)); + if (bytes < 0) { + SYSERR("read from file failed, error: %d", bytes); + return bytes; + } + + snd_pcm_areas_from_buf(pcm, areas_if, file->rbuf); + snd_pcm_areas_copy(areas, offset, areas_if, 0, pcm->channels, snd_pcm_bytes_to_frames(pcm, bytes), pcm->format); + + return bytes; +} + static void setup_wav_header(snd_pcm_t *pcm, struct wav_fmt *fmt) { fmt->fmt = TO_LE16(0x01); @@ -568,19 +602,19 @@ static snd_pcm_sframes_t snd_pcm_file_readn(snd_pcm_t *pcm, void **bufs, snd_pcm { snd_pcm_file_t *file = pcm->private_data; snd_pcm_channel_area_t areas[pcm->channels]; - snd_pcm_sframes_t n; + snd_pcm_sframes_t frames; - if (file->ifd >= 0) { - SNDERR("DEBUG: Noninterleaved read not yet implemented.\n"); - return 0; /* TODO: Noninterleaved read */ - } + __snd_pcm_lock(pcm); + frames = _snd_pcm_readn(file->gen.slave, bufs, size); + if (frames <= 0) + return frames; - n = _snd_pcm_readn(file->gen.slave, bufs, size); - if (n > 0) { - snd_pcm_areas_from_bufs(pcm, areas, bufs); - snd_pcm_file_add_frames(pcm, areas, 0, n); - } - return n; + snd_pcm_areas_from_bufs(pcm, areas, bufs); + snd_pcm_file_areas_read_infile(pcm, areas, 0, frames); + snd_pcm_file_add_frames(pcm, areas, 0, frames); + + __snd_pcm_unlock(pcm); + return frames; } static snd_pcm_sframes_t snd_pcm_file_mmap_commit(snd_pcm_t *pcm, @@ -609,9 +643,11 @@ static int snd_pcm_file_hw_free(snd_pcm_t *pcm) free(file->wbuf); free(file->wbuf_areas); free(file->final_fname); + free(file->rbuf); file->wbuf = NULL; file->wbuf_areas = NULL; file->final_fname = NULL; + file->rbuf = NULL; return snd_pcm_hw_free(file->gen.slave); } @@ -638,6 +674,15 @@ static int snd_pcm_file_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params) snd_pcm_file_hw_free(pcm); return -ENOMEM; } + assert(!file->rbuf); + file->rbuf_size = slave->buffer_size; + file->rbuf_size_bytes = snd_pcm_frames_to_bytes(slave, file->rbuf_size); + file->rbuf_used_bytes = 0; + file->rbuf = malloc(file->rbuf_size_bytes); + if (file->rbuf == NULL) { + snd_pcm_file_hw_free(pcm); + return -ENOMEM; + } file->appl_ptr = file->file_ptr_bytes = 0; for (channel = 0; channel < slave->channels; ++channel) { snd_pcm_channel_area_t *a = &file->wbuf_areas[channel]; -- 2.7.4

1 0

[PATCH - alsa-lib 0/4] Add pcm_file input file support for MMAP
by Adam Miartus 21 May '19

21 May '19

implement overwriting read buffer with input file in case of RW_NONINTERLEAVED and MMAP access modes for alsa file plugin first two patches introduce a helper function for copying data from input file to readi and readn buffers for user. to facilitate this snd_pcm_areas_from_buf and snd_pcm_areas_from_bufs with snd_pcm_areas_copy is used. Previous readi behaviour in corner case of input file EOF is changed (more in patch comment). Patch 3,4 introduce new api callback mmap_begin to ease overwritting mmaped buffer in case of MMAP access. Adam Miartus (4): pcm_file: add support for infile reading in non interleaved mode pcm_file: use snd_pcm_file_areas_read_infile for readi pcm: add mmap_begin callback to snd_pcm_fast_ops_t api pcm_file: add infile read support for mmap mode src/pcm/pcm.c | 6 +++ src/pcm/pcm_dmix.c | 1 + src/pcm/pcm_dshare.c | 1 + src/pcm/pcm_dsnoop.c | 1 + src/pcm/pcm_file.c | 125 ++++++++++++++++++++++++++++++++++++++---------- src/pcm/pcm_generic.h | 1 - src/pcm/pcm_hooks.c | 1 + src/pcm/pcm_hw.c | 2 + src/pcm/pcm_ioplug.c | 1 + src/pcm/pcm_local.h | 1 + src/pcm/pcm_meter.c | 1 + src/pcm/pcm_mmap_emul.c | 1 + src/pcm/pcm_multi.c | 1 + src/pcm/pcm_null.c | 1 + src/pcm/pcm_plugin.c | 1 + src/pcm/pcm_rate.c | 1 + src/pcm/pcm_share.c | 1 + src/pcm/pcm_shm.c | 1 + 18 files changed, 122 insertions(+), 26 deletions(-) -- 2.7.4

1 0

[PATCH - alsa-lib 1/4] pcm_file: add support for infile reading in non interleaved mode
by Adam Miartus 21 May '19

21 May '19

add helper function to copy input file data to buffer mapped by areas, in case of an error, do not fill the areas, allowing device read buffer to be provided to api caller previously unused rbuf variable is reused for this purpose Signed-off-by: Adam Miartus <amiartus(a)de.adit-jv.com> Reviewed-by: Timo Wischer <twischer(a)de.adit-jv.com> diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index 3a19cef..3c68265 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -77,6 +77,7 @@ typedef struct { snd_pcm_uframes_t appl_ptr; snd_pcm_uframes_t file_ptr_bytes; snd_pcm_uframes_t wbuf_size; + snd_pcm_uframes_t rbuf_size; size_t wbuf_size_bytes; size_t wbuf_used_bytes; char *wbuf; @@ -266,6 +267,39 @@ static int snd_pcm_file_open_output_file(snd_pcm_file_t *file) return 0; } +/* fill areas with data from input file, return bytes red */ +static int snd_pcm_file_areas_read_infile(snd_pcm_t *pcm, + const snd_pcm_channel_area_t *areas, + snd_pcm_uframes_t offset, + snd_pcm_uframes_t frames) +{ + snd_pcm_file_t *file = pcm->private_data; + snd_pcm_channel_area_t areas_if[pcm->channels]; + ssize_t bytes; + + if (file->ifd < 0) + return -EBADF; + + if (file->rbuf == NULL) + return -ENOMEM; + + if (file->rbuf_size < frames) { + SYSERR("requested more frames than pcm buffer"); + return -ENOMEM; + } + + bytes = read(file->ifd, file->rbuf, snd_pcm_frames_to_bytes(pcm, frames)); + if (bytes < 0) { + SYSERR("read from file failed, error: %d", bytes); + return bytes; + } + + snd_pcm_areas_from_buf(pcm, areas_if, file->rbuf); + snd_pcm_areas_copy(areas, offset, areas_if, 0, pcm->channels, snd_pcm_bytes_to_frames(pcm, bytes), pcm->format); + + return bytes; +} + static void setup_wav_header(snd_pcm_t *pcm, struct wav_fmt *fmt) { fmt->fmt = TO_LE16(0x01); @@ -568,19 +602,19 @@ static snd_pcm_sframes_t snd_pcm_file_readn(snd_pcm_t *pcm, void **bufs, snd_pcm { snd_pcm_file_t *file = pcm->private_data; snd_pcm_channel_area_t areas[pcm->channels]; - snd_pcm_sframes_t n; + snd_pcm_sframes_t frames; - if (file->ifd >= 0) { - SNDERR("DEBUG: Noninterleaved read not yet implemented.\n"); - return 0; /* TODO: Noninterleaved read */ - } + __snd_pcm_lock(pcm); + frames = _snd_pcm_readn(file->gen.slave, bufs, size); + if (frames <= 0) + return frames; - n = _snd_pcm_readn(file->gen.slave, bufs, size); - if (n > 0) { - snd_pcm_areas_from_bufs(pcm, areas, bufs); - snd_pcm_file_add_frames(pcm, areas, 0, n); - } - return n; + snd_pcm_areas_from_bufs(pcm, areas, bufs); + snd_pcm_file_areas_read_infile(pcm, areas, 0, frames); + snd_pcm_file_add_frames(pcm, areas, 0, frames); + + __snd_pcm_unlock(pcm); + return frames; } static snd_pcm_sframes_t snd_pcm_file_mmap_commit(snd_pcm_t *pcm, @@ -609,9 +643,11 @@ static int snd_pcm_file_hw_free(snd_pcm_t *pcm) free(file->wbuf); free(file->wbuf_areas); free(file->final_fname); + free(file->rbuf); file->wbuf = NULL; file->wbuf_areas = NULL; file->final_fname = NULL; + file->rbuf = NULL; return snd_pcm_hw_free(file->gen.slave); } @@ -638,6 +674,15 @@ static int snd_pcm_file_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params) snd_pcm_file_hw_free(pcm); return -ENOMEM; } + assert(!file->rbuf); + file->rbuf_size = slave->buffer_size; + file->rbuf_size_bytes = snd_pcm_frames_to_bytes(slave, file->rbuf_size); + file->rbuf_used_bytes = 0; + file->rbuf = malloc(file->rbuf_size_bytes); + if (file->rbuf == NULL) { + snd_pcm_file_hw_free(pcm); + return -ENOMEM; + } file->appl_ptr = file->file_ptr_bytes = 0; for (channel = 0; channel < slave->channels; ++channel) { snd_pcm_channel_area_t *a = &file->wbuf_areas[channel]; -- 2.7.4

1 0

[PATCH - alsa-lib 4/4] pcm_file: add infile read support for mmap mode
by Miartus, Adam (Arion Recruitment; ADITG/ESM) 20 May '19

20 May '19

From: Adam Miartus <amiartus(a)de.adit-jv.com> mmap_begin callback is used to copy data from input file to mmaped buffer guard for corner use of api (multiple mmap_begin calls by user) is introduced to check if next continuous buffer was already overwritten buffer is overwritten with input file data only in case of stream capture Signed-off-by: Adam Miartus <amiartus(a)de.adit-jv.com> Reviewed-by: Timo Wischer <twischer(a)de.adit-jv.com> diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index c8f4c84..d27586c 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -88,6 +88,7 @@ typedef struct { size_t buffer_bytes; struct wav_fmt wav_header; size_t filelen; + char ifmmap_overwritten; } snd_pcm_file_t; #if __BYTE_ORDER == __LITTLE_ENDIAN @@ -624,6 +625,8 @@ static snd_pcm_sframes_t snd_pcm_file_mmap_commit(snd_pcm_t *pcm, const snd_pcm_channel_area_t *areas; snd_pcm_sframes_t result; + file->ifmmap_overwritten = 0; + result = snd_pcm_mmap_begin(file->gen.slave, &areas, &ofs, &siz); if (result >= 0) { assert(ofs == offset && siz == size); @@ -634,6 +637,32 @@ static snd_pcm_sframes_t snd_pcm_file_mmap_commit(snd_pcm_t *pcm, return result; } +static int snd_pcm_file_mmap_begin(snd_pcm_t *pcm, const snd_pcm_channel_area_t **areas, + snd_pcm_uframes_t *offset, snd_pcm_uframes_t *frames) { + snd_pcm_file_t *file = pcm->private_data; + snd_pcm_channel_area_t areas_if[pcm->channels]; + snd_pcm_uframes_t frames_if; + void *buffer = NULL; + int result; + + result = snd_pcm_mmap_begin(file->gen.slave, areas, offset, frames); + if (result < 0) + return result; + + if (pcm->stream != SND_PCM_STREAM_CAPTURE) + return result; + + /* user may run mmap_begin without mmap_commit multiple times in row */ + if (file->ifmmap_overwritten) + return result; + file->ifmmap_overwritten = 1; + + snd_pcm_file_areas_read_infile(pcm, *areas, *offset, *frames); + + return result; +} + static int snd_pcm_file_hw_free(snd_pcm_t *pcm) { snd_pcm_file_t *file = pcm->private_data; @@ -660,6 +689,7 @@ static int snd_pcm_file_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params) file->wbuf_size = slave->buffer_size * 2; file->wbuf_size_bytes = snd_pcm_frames_to_bytes(slave, file->wbuf_size); file->wbuf_used_bytes = 0; + file->ifmmap_overwritten = 0; assert(!file->wbuf); file->wbuf = malloc(file->wbuf_size_bytes); if (file->wbuf == NULL) { @@ -771,7 +801,7 @@ static const snd_pcm_fast_ops_t snd_pcm_file_fast_ops = { .poll_descriptors = snd_pcm_generic_poll_descriptors, .poll_revents = snd_pcm_generic_poll_revents, .htimestamp = snd_pcm_generic_htimestamp, - .mmap_begin = NULL, + .mmap_begin = snd_pcm_file_mmap_begin, }; /** -- 2.7.4

1 0

[PATCH - alsa-lib 3/4] pcm: add mmap_begin callback to snd_pcm_fast_ops_t api
by Miartus, Adam (Arion Recruitment; ADITG/ESM) 20 May '19

20 May '19

From: Adam Miartus <amiartus(a)de.adit-jv.com> main motivation for adding the callback is to use it to enable operation on mmaped buffer before user access for pcm_file plugin support for MMAP read access with masking by data from input file is not implemented for pcm_file plugin, by adding this callback implementing such feature can be done by rewriting next continuous portion of buffer on each mmap_begin call plugins like softvol use pcm_plugin interface and overwrite the buffer by looping around it in avail_update callback, this patch hopes to simplify the task by adding new api callback, removing the need for rewriting pcm_file (to use pcm_plugin callbacks) and careful checking when looping around whole mmaped buffer Signed-off-by: Adam Miartus <amiartus(a)de.adit-jv.com> Reviewed-by: Timo Wischer <twischer(a)de.adit-jv.com> diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index 3a71d79..323926e 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -7129,7 +7129,13 @@ int __snd_pcm_mmap_begin(snd_pcm_t *pcm, const snd_pcm_channel_area_t **areas, snd_pcm_uframes_t f; snd_pcm_uframes_t avail; const snd_pcm_channel_area_t *xareas; + assert(pcm && areas && offset && frames); + + if (pcm->fast_ops->mmap_begin) + return pcm->fast_ops->mmap_begin(pcm->fast_op_arg, areas, offset, +frames); + + /* fallback for plugins that do not specify new callback */ xareas = snd_pcm_mmap_areas(pcm); if (xareas == NULL) return -EBADFD; diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c index 274726e..96049e0 100644 --- a/src/pcm/pcm_dmix.c +++ b/src/pcm/pcm_dmix.c @@ -990,6 +990,7 @@ static const snd_pcm_fast_ops_t snd_pcm_dmix_fast_ops = { .poll_descriptors = snd_pcm_direct_poll_descriptors, .poll_descriptors_count = NULL, .poll_revents = snd_pcm_dmix_poll_revents, + .mmap_begin = NULL, }; /** diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c index b75809c..328ef83 100644 --- a/src/pcm/pcm_dshare.c +++ b/src/pcm/pcm_dshare.c @@ -667,6 +667,7 @@ static const snd_pcm_fast_ops_t snd_pcm_dshare_fast_ops = { .poll_descriptors = snd_pcm_direct_poll_descriptors, .poll_descriptors_count = NULL, .poll_revents = snd_pcm_direct_poll_revents, + .mmap_begin = NULL, }; /** diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c index 58b1e53..5b9d9f5 100644 --- a/src/pcm/pcm_dsnoop.c +++ b/src/pcm/pcm_dsnoop.c @@ -544,6 +544,7 @@ static const snd_pcm_fast_ops_t snd_pcm_dsnoop_fast_ops = { .poll_descriptors = snd_pcm_direct_poll_descriptors, .poll_descriptors_count = NULL, .poll_revents = snd_pcm_direct_poll_revents, + .mmap_begin = NULL, }; /** diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index 29ab2fb..c8f4c84 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -771,6 +771,7 @@ static const snd_pcm_fast_ops_t snd_pcm_file_fast_ops = { .poll_descriptors = snd_pcm_generic_poll_descriptors, .poll_revents = snd_pcm_generic_poll_revents, .htimestamp = snd_pcm_generic_htimestamp, + .mmap_begin = NULL, }; /** diff --git a/src/pcm/pcm_generic.h b/src/pcm/pcm_generic.h index dfbe21a..683e60b 100644 --- a/src/pcm/pcm_generic.h +++ b/src/pcm/pcm_generic.h @@ -161,4 +161,3 @@ snd_pcm_chmap_query_t **snd_pcm_generic_query_chmaps(snd_pcm_t *pcm); snd_pcm_chmap_t *snd_pcm_generic_get_chmap(snd_pcm_t *pcm); int snd_pcm_generic_set_chmap(snd_pcm_t *pcm, const snd_pcm_chmap_t *map); int snd_pcm_generic_may_wait_for_avail_min(snd_pcm_t *pcm, snd_pcm_uframes_t avail); - diff --git a/src/pcm/pcm_hooks.c b/src/pcm/pcm_hooks.c index 4416d36..14396fa 100644 --- a/src/pcm/pcm_hooks.c +++ b/src/pcm/pcm_hooks.c @@ -200,6 +200,7 @@ static const snd_pcm_fast_ops_t snd_pcm_hooks_fast_ops = { .poll_descriptors = snd_pcm_generic_poll_descriptors, .poll_revents = snd_pcm_generic_poll_revents, .may_wait_for_avail_min = snd_pcm_generic_may_wait_for_avail_min, + .mmap_begin = NULL, }; /** diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c index 91370a8..8ee1d69 100644 --- a/src/pcm/pcm_hw.c +++ b/src/pcm/pcm_hw.c @@ -1481,6 +1481,7 @@ static const snd_pcm_fast_ops_t snd_pcm_hw_fast_ops = { .poll_descriptors = NULL, .poll_descriptors_count = NULL, .poll_revents = NULL, + .mmap_begin = NULL, }; static const snd_pcm_fast_ops_t snd_pcm_hw_fast_ops_timer = { @@ -1512,6 +1513,7 @@ static const snd_pcm_fast_ops_t snd_pcm_hw_fast_ops_timer = { .poll_descriptors = snd_pcm_hw_poll_descriptors, .poll_descriptors_count = snd_pcm_hw_poll_descriptors_count, .poll_revents = snd_pcm_hw_poll_revents, + .mmap_begin = NULL, }; /** diff --git a/src/pcm/pcm_ioplug.c b/src/pcm/pcm_ioplug.c index a437ca3..3e19499 100644 --- a/src/pcm/pcm_ioplug.c +++ b/src/pcm/pcm_ioplug.c @@ -940,6 +940,7 @@ static const snd_pcm_fast_ops_t snd_pcm_ioplug_fast_ops = { .poll_descriptors_count = snd_pcm_ioplug_poll_descriptors_count, .poll_descriptors = snd_pcm_ioplug_poll_descriptors, .poll_revents = snd_pcm_ioplug_poll_revents, + .mmap_begin = NULL, }; #endif /* !DOC_HIDDEN */ diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h index d52229d..d5726eb 100644 --- a/src/pcm/pcm_local.h +++ b/src/pcm/pcm_local.h @@ -184,6 +184,7 @@ typedef struct { int (*poll_descriptors)(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int space); /* locked */ int (*poll_revents)(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int nfds, unsigned short *revents); /* locked */ int (*may_wait_for_avail_min)(snd_pcm_t *pcm, snd_pcm_uframes_t avail); + int (*mmap_begin)(snd_pcm_t *pcm, const snd_pcm_channel_area_t +**areas, snd_pcm_uframes_t *offset, snd_pcm_uframes_t *frames); /* +locked */ } snd_pcm_fast_ops_t; struct _snd_pcm { diff --git a/src/pcm/pcm_meter.c b/src/pcm/pcm_meter.c index 20b4187..28bb578 100644 --- a/src/pcm/pcm_meter.c +++ b/src/pcm/pcm_meter.c @@ -548,6 +548,7 @@ static const snd_pcm_fast_ops_t snd_pcm_meter_fast_ops = { .poll_descriptors = snd_pcm_generic_poll_descriptors, .poll_revents = snd_pcm_generic_poll_revents, .may_wait_for_avail_min = snd_pcm_generic_may_wait_for_avail_min, + .mmap_begin = NULL, }; /** diff --git a/src/pcm/pcm_mmap_emul.c b/src/pcm/pcm_mmap_emul.c index 009cebb..6fa5fe6 100644 --- a/src/pcm/pcm_mmap_emul.c +++ b/src/pcm/pcm_mmap_emul.c @@ -401,6 +401,7 @@ static const snd_pcm_fast_ops_t snd_pcm_mmap_emul_fast_ops = { .poll_descriptors_count = snd_pcm_generic_poll_descriptors_count, .poll_revents = snd_pcm_generic_poll_revents, .may_wait_for_avail_min = snd_pcm_generic_may_wait_for_avail_min, + .mmap_begin = NULL, }; #ifndef DOC_HIDDEN diff --git a/src/pcm/pcm_multi.c b/src/pcm/pcm_multi.c index 53c414d..069d224 100644 --- a/src/pcm/pcm_multi.c +++ b/src/pcm/pcm_multi.c @@ -1042,6 +1042,7 @@ static const snd_pcm_fast_ops_t snd_pcm_multi_fast_ops = { .poll_descriptors = snd_pcm_multi_poll_descriptors, .poll_revents = snd_pcm_multi_poll_revents, .may_wait_for_avail_min = snd_pcm_multi_may_wait_for_avail_min, + .mmap_begin = NULL, }; /** diff --git a/src/pcm/pcm_null.c b/src/pcm/pcm_null.c index 1d81548..e6fa049 100644 --- a/src/pcm/pcm_null.c +++ b/src/pcm/pcm_null.c @@ -361,6 +361,7 @@ static const snd_pcm_fast_ops_t snd_pcm_null_fast_ops = { .avail_update = snd_pcm_null_avail_update, .mmap_commit = snd_pcm_null_mmap_commit, .htimestamp = snd_pcm_generic_real_htimestamp, + .mmap_begin = NULL, }; /** diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c index ea60eb9..0714d2c 100644 --- a/src/pcm/pcm_plugin.c +++ b/src/pcm/pcm_plugin.c @@ -646,6 +646,7 @@ const snd_pcm_fast_ops_t snd_pcm_plugin_fast_ops = { .poll_descriptors = snd_pcm_generic_poll_descriptors, .poll_revents = snd_pcm_generic_poll_revents, .may_wait_for_avail_min = snd_pcm_plugin_may_wait_for_avail_min, + .mmap_begin = NULL, }; #endif diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c index 5dc8a92..f29739b 100644 --- a/src/pcm/pcm_rate.c +++ b/src/pcm/pcm_rate.c @@ -1217,6 +1217,7 @@ static const snd_pcm_fast_ops_t snd_pcm_rate_fast_ops = { .poll_descriptors = snd_pcm_generic_poll_descriptors, .poll_revents = snd_pcm_rate_poll_revents, .may_wait_for_avail_min = snd_pcm_plugin_may_wait_for_avail_min, + .mmap_begin = NULL, }; static const snd_pcm_ops_t snd_pcm_rate_ops = { diff --git a/src/pcm/pcm_share.c b/src/pcm/pcm_share.c index 5a540c4..b803a82 100644 --- a/src/pcm/pcm_share.c +++ b/src/pcm/pcm_share.c @@ -1346,6 +1346,7 @@ static const snd_pcm_fast_ops_t snd_pcm_share_fast_ops = { .avail_update = snd_pcm_share_avail_update, .htimestamp = snd_pcm_share_htimestamp, .mmap_commit = snd_pcm_share_mmap_commit, + .mmap_begin = NULL, }; /** diff --git a/src/pcm/pcm_shm.c b/src/pcm/pcm_shm.c index 26a27a5..a18720f 100644 --- a/src/pcm/pcm_shm.c +++ b/src/pcm/pcm_shm.c @@ -629,6 +629,7 @@ static const snd_pcm_fast_ops_t snd_pcm_shm_fast_ops = { .avail_update = snd_pcm_shm_avail_update, .mmap_commit = snd_pcm_shm_mmap_commit, .htimestamp = snd_pcm_shm_htimestamp, + .mmap_begin = NULL, }; static int make_local_socket(const char *filename) -- 2.7.4

1 0

[PATCH - alsa-lib 2/4] pcm_file: use snd_pcm_file_areas_read_infile for readi
by Miartus, Adam (Arion Recruitment; ADITG/ESM) 20 May '19

20 May '19

From: Adam Miartus <amiartus(a)de.adit-jv.com> use previously introduced helper function, this commit unifies behavior of readi and readn corner case behavior of readi is changed by this commit, previously, in case 0 bytes were red from file (EOF), frames = 0 was returned, signaling api user as if no data was red from slave, after the patch, amount of frames red from slave with data red from slave stored in buffer is returned when EOF is reached Signed-off-by: Adam Miartus <amiartus(a)de.adit-jv.com> Reviewed-by: Timo Wischer <twischer(a)de.adit-jv.com> diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index 7998b64..29ab2fb 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -577,22 +577,21 @@ static snd_pcm_sframes_t snd_pcm_file_readi(snd_pcm_t *pcm, void *buffer, snd_pc { snd_pcm_file_t *file = pcm->private_data; snd_pcm_channel_area_t areas[pcm->channels]; - snd_pcm_sframes_t n; + snd_pcm_sframes_t frames; + + __snd_pcm_lock(pcm); + + frames = _snd_pcm_readi(file->gen.slave, buffer, size); + if (frames <= 0) + return frames; - n = _snd_pcm_readi(file->gen.slave, buffer, size); - if (n <= 0) - return n; - if (file->ifd >= 0) { - __snd_pcm_lock(pcm); - n = read(file->ifd, buffer, n * pcm->frame_bits / 8); - __snd_pcm_unlock(pcm); - if (n < 0) - return n; - n = n * 8 / pcm->frame_bits; - } snd_pcm_areas_from_buf(pcm, areas, buffer); - snd_pcm_file_add_frames(pcm, areas, 0, n); - return n; + snd_pcm_file_areas_read_infile(pcm, areas, 0, frames); + snd_pcm_file_add_frames(pcm, areas, 0, frames); + + __snd_pcm_unlock(pcm); + + return frames; } /* locking */ -- 2.7.4

1 0

FW: [PATCH - alsa-lib 1/4] pcm_file: add support for infile reading in non interleaved mode
by Miartus, Adam (Arion Recruitment; ADITG/ESM) 20 May '19

20 May '19

From: Adam Miartus <amiartus(a)de.adit-jv.com> add helper function to copy input file data to buffer mapped by areas, in case of an error, do not fill the areas, allowing device read buffer to be provided to api caller previously unused rbuf variable is reused for this purpose Signed-off-by: Adam Miartus <amiartus(a)de.adit-jv.com> Reviewed-by: Timo Wischer <twischer(a)de.adit-jv.com> diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index 3a19cef..7998b64 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -77,6 +77,7 @@ typedef struct { snd_pcm_uframes_t appl_ptr; snd_pcm_uframes_t file_ptr_bytes; snd_pcm_uframes_t wbuf_size; + snd_pcm_uframes_t rbuf_size; size_t wbuf_size_bytes; size_t wbuf_used_bytes; char *wbuf; @@ -266,6 +267,37 @@ static int snd_pcm_file_open_output_file(snd_pcm_file_t *file) return 0; } +/* fill areas with data from input file, return bytes red */ static int +snd_pcm_file_areas_read_infile(snd_pcm_t *pcm, const snd_pcm_channel_area_t *areas, + snd_pcm_uframes_t offset, snd_pcm_uframes_t frames) { + snd_pcm_file_t *file = pcm->private_data; + snd_pcm_channel_area_t areas_if[pcm->channels]; + ssize_t bytes; + + if (file->ifd < 0) + return -EBADF; + + if (file->rbuf == NULL) + return -ENOMEM; + + if (file->rbuf_size < frames) { + SYSERR("requested more frames than pcm buffer"); + return -ENOMEM; + } + + bytes = read(file->ifd, file->rbuf, snd_pcm_frames_to_bytes(pcm, frames)); + if (bytes < 0) { + SYSERR("read from file failed, error: %d", bytes); + return bytes; + } + + snd_pcm_areas_from_buf(pcm, areas_if, file->rbuf); + snd_pcm_areas_copy(areas, offset, areas_if, 0, pcm->channels, +snd_pcm_bytes_to_frames(pcm, bytes), pcm->format); + + return bytes; +} + static void setup_wav_header(snd_pcm_t *pcm, struct wav_fmt *fmt) { fmt->fmt = TO_LE16(0x01); @@ -568,19 +600,19 @@ static snd_pcm_sframes_t snd_pcm_file_readn(snd_pcm_t *pcm, void **bufs, snd_pcm { snd_pcm_file_t *file = pcm->private_data; snd_pcm_channel_area_t areas[pcm->channels]; - snd_pcm_sframes_t n; + snd_pcm_sframes_t frames; - if (file->ifd >= 0) { - SNDERR("DEBUG: Noninterleaved read not yet implemented.\n"); - return 0; /* TODO: Noninterleaved read */ - } + __snd_pcm_lock(pcm); + frames = _snd_pcm_readn(file->gen.slave, bufs, size); + if (frames <= 0) + return frames; - n = _snd_pcm_readn(file->gen.slave, bufs, size); - if (n > 0) { - snd_pcm_areas_from_bufs(pcm, areas, bufs); - snd_pcm_file_add_frames(pcm, areas, 0, n); - } - return n; + snd_pcm_areas_from_bufs(pcm, areas, bufs); + snd_pcm_file_areas_read_infile(pcm, areas, 0, frames); + snd_pcm_file_add_frames(pcm, areas, 0, frames); + + __snd_pcm_unlock(pcm); + return frames; } static snd_pcm_sframes_t snd_pcm_file_mmap_commit(snd_pcm_t *pcm, @@ -609,9 +641,11 @@ static int snd_pcm_file_hw_free(snd_pcm_t *pcm) free(file->wbuf); free(file->wbuf_areas); free(file->final_fname); + free(file->rbuf); file->wbuf = NULL; file->wbuf_areas = NULL; file->final_fname = NULL; + file->rbuf = NULL; return snd_pcm_hw_free(file->gen.slave); } @@ -638,6 +672,15 @@ static int snd_pcm_file_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params) snd_pcm_file_hw_free(pcm); return -ENOMEM; } + assert(!file->rbuf); + file->rbuf_size = slave->buffer_size; + file->rbuf_size_bytes = snd_pcm_frames_to_bytes(slave, file->rbuf_size); + file->rbuf_used_bytes = 0; + file->rbuf = malloc(file->rbuf_size_bytes); + if (file->rbuf == NULL) { + snd_pcm_file_hw_free(pcm); + return -ENOMEM; + } file->appl_ptr = file->file_ptr_bytes = 0; for (channel = 0; channel < slave->channels; ++channel) { snd_pcm_channel_area_t *a = &file->wbuf_areas[channel]; -- 2.7.4

1 0

[PATCH v2 0/6]
by vanitha.channaiah＠in.bosch.com 15 May '19

15 May '19

- Updated the patches by incorporating review comments from Takashi Iwai-san [PATCH 1/5] pcm: direct: Add generic hw_ptr_alignment function for dmix, dshare and dsnoop [Takashi Iwai:] > The patch description needs rephrasing. What actually this does is to move the code from pcm_dmix.c to pcm_direct.c > and its header so that the helper code can be re-used by other direct-PCM plugins. - Commit message is rephrased as suggested. - New commit: [PATCH v2 1/6] pcm: direct: Add generic hw_ptr_alignment function for [PATCH 2/5] pcm: dshare: Added "hw_ptr_alignment" option in configuration for alignment of slave pointers [Takashi Iwai:] > Again, this patch description is too ambiguous. > And, if it enables the hw_ptr_alignment option, update the documentation as well. - Commit message is explained in detail for the changes done. - Documentation updated. - New commit: [PATCH v2 2/6] pcm: dshare: Added "hw_ptr_alignment" option in [PATCH 3/5] pcm: dsnoop: Added "hw_ptr_alignment" option in configuration for slave pointer alignment [Takashi Iwai:] > Ditto as patch 2, the description is too ambiguous, and the update of documentation is missing. > It's not good to change the helper function semantics out of sudden, even without any description. - Commit message is explained in detail for the changes done. - Documentation updated. - Divided the patch with commit ("pcm: dsnoop: Add hw_ptr_alignment option in configuration") into additional patch commit ("pcm: direct: Round up of slave_app_ptr pointer if buffer") - Usecase scenario is described for the changes done in helper function. - New commit: [PATCH v2 3/6] pcm: dsnoop: Added "hw_ptr_alignment" option in [PATCH v2 4/6] pcm: direct: Round up of slave_app_ptr pointer if buffer [PATCH 4/5] pcm: restructuring sw params function [Takashi Iwai:] > I see no reason to do that. Please describe. - Commit message is explained in detail why reformating was done. - New commit: [PATCH v2 5/6] pcm: restructuring sw params function [PATCH 5/5] pcm: Update pcm->avail_min with needed_slave_avail_min, after reading unaligned frames [Takashi Iwai:] > This kind of changes in the core code should be avoided as much as possible, especially if it's only relevant with the specific plugins. > Sorry, this isn't convincing enough. If this is a MUST, please clarify better. - Commit message is explained in detail with the generic usecase and specific use case we came across. - New commit: [PATCH v2 6/6] pcm: Update pcm->avail_min with needed_slave_avail_min,

1 6

[PATCH - maemo fixes 1/1] maemo plugin has two crashes I was able to see in a valgrind log from another user:
by stian.skjelstad＠gmail.com 02 May '19

02 May '19

From: Stian Skjelstad <stian.skjelstad(a)gmail.com> * maximum write size was calculated in words (16bit), but checked against byte-size length. This causes memcpy later to overflow the buffer (normally by up to 12KB). * remove a double free (by marking free'd data with NULL) * mmap returns MMAP_FAILED on error, not NULL I suspect that this plugin/driver might have other issues aswell, since I am unable to find any logic for checking DSP buffer status, and no implementation for odelay reporting. Author: Stian Skjelstad <stian.skjelstad(a)gmail.com> Signed-off-by: Stian Skjelstad <stian.skjelstad(a)gmail.com> diff --git a/maemo/alsa-dsp.c b/maemo/alsa-dsp.c index 7e04f6a..3307384 100644 --- a/maemo/alsa-dsp.c +++ b/maemo/alsa-dsp.c @@ -135,18 +135,18 @@ static snd_pcm_sframes_t alsa_dsp_transfer(snd_pcm_ioplug_t * io, snd_pcm_alsa_dsp_t *alsa_dsp = io->private_data; DENTER(); char *buf; - int words; + int bytes, words; ssize_t result; - words = size * alsa_dsp->bytes_per_frame; - words /= 2; - DPRINT("***** Info: words %d size %lu bpf: %d\n", words, size, - alsa_dsp->bytes_per_frame); - if (words > alsa_dsp->dsp_protocol->mmap_buffer_size) { - DERROR("Requested too much data transfer (playing only %d)\n", - alsa_dsp->dsp_protocol->mmap_buffer_size); - words = alsa_dsp->dsp_protocol->mmap_buffer_size; + bytes = size * alsa_dsp->bytes_per_frame; + DPRINT("***** Info: samples %lu * bpf %d => bytes %d\n", + size, alsa_dsp->bytes_per_frame, bytes); + if (bytes > alsa_dsp->dsp_protocol->mmap_buffer_size) { + DERROR("Requested too much data transfer (requested %d, playing only %d)\n", + bytes, alsa_dsp->dsp_protocol->mmap_buffer_size); + bytes = alsa_dsp->dsp_protocol->mmap_buffer_size; } + words = bytes / 2; if (alsa_dsp->dsp_protocol->state != STATE_PLAYING) { DPRINT("I did nothing - No start sent\n"); alsa_dsp_start(io); diff --git a/maemo/dsp-ctl.c b/maemo/dsp-ctl.c index 5bcda36..ac05942 100644 --- a/maemo/dsp-ctl.c +++ b/maemo/dsp-ctl.c @@ -93,6 +93,7 @@ static void dsp_ctl_close(snd_ctl_ext_t * ext) snd_ctl_dsp_t *dsp_ctl = ext->private_data; DENTER(); free(dsp_ctl->controls); + dsp_ctl->controls = NULL; free_control_list(&(dsp_ctl->playback_devices)); free_control_list(&(dsp_ctl->recording_devices)); // free(dsp_ctl); diff --git a/maemo/dsp-protocol.c b/maemo/dsp-protocol.c index af67251..32193d3 100644 --- a/maemo/dsp-protocol.c +++ b/maemo/dsp-protocol.c @@ -194,7 +194,7 @@ int dsp_protocol_open_node(dsp_protocol_t * dsp_protocol, const char *device) mmap((void *)0, dsp_protocol->mmap_buffer_size, PROT_READ | PROT_WRITE, MAP_SHARED, dsp_protocol->fd, 0); - if (dsp_protocol->mmap_buffer == NULL) { + if (dsp_protocol->mmap_buffer == MAP_FAILED) { report_dsp_protocol("Cannot mmap data buffer", dsp_protocol); ret = -ENOMEM; goto unlock; -- 2.17.1

1 0