From 8bbdae0ae879eb15999b6b38bc21fc7c9ceff012 Mon Sep 17 00:00:00 2001 From: Peter Meerwald Date: Tue, 4 Nov 2014 15:10:50 +0100 Subject: [PATCH] alsa: Precompute maximum frames per block frames_per_block is the mempool's maximum block size in frames v2 (thanks David Henningson) * rename max_frames to frames_per_block Signed-off-by: Peter Meerwald --- src/modules/alsa/alsa-sink.c | 6 ++++-- src/modules/alsa/alsa-source.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c index 01c3a666d..31863c469 100644 --- a/src/modules/alsa/alsa-sink.c +++ b/src/modules/alsa/alsa-sink.c @@ -127,6 +127,8 @@ struct userdata { watermark_dec_threshold, rewind_safeguard; + snd_pcm_uframes_t frames_per_block; + pa_usec_t watermark_dec_not_before; pa_usec_t min_latency_ref; pa_usec_t tsched_watermark_usec; @@ -619,8 +621,7 @@ static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, bool polled, bo } /* Make sure that if these memblocks need to be copied they will fit into one slot */ - if (frames > pa_mempool_block_size_max(u->core->mempool)/u->frame_size) - frames = pa_mempool_block_size_max(u->core->mempool)/u->frame_size; + frames = PA_MIN(frames, u->frames_per_block); if (!after_avail && frames == 0) break; @@ -2328,6 +2329,7 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca pa_sink_set_rtpoll(u->sink, u->rtpoll); u->frame_size = frame_size; + u->frames_per_block = pa_mempool_block_size_max(m->core->mempool) / frame_size; u->fragment_size = frag_size = (size_t) (period_frames * frame_size); u->hwbuf_size = buffer_size = (size_t) (buffer_frames * frame_size); pa_cvolume_mute(&u->hardware_volume, u->sink->sample_spec.channels); diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c index aa47c3fa8..8fb74df3f 100644 --- a/src/modules/alsa/alsa-source.c +++ b/src/modules/alsa/alsa-source.c @@ -116,6 +116,8 @@ struct userdata { watermark_inc_threshold, watermark_dec_threshold; + snd_pcm_uframes_t frames_per_block; + pa_usec_t watermark_dec_not_before; pa_usec_t min_latency_ref; pa_usec_t tsched_watermark_usec; @@ -576,8 +578,7 @@ static int mmap_read(struct userdata *u, pa_usec_t *sleep_usec, bool polled, boo } /* Make sure that if these memblocks need to be copied they will fit into one slot */ - if (frames > pa_mempool_block_size_max(u->core->mempool)/u->frame_size) - frames = pa_mempool_block_size_max(u->core->mempool)/u->frame_size; + frames = PA_MIN(frames, u->frames_per_block); if (!after_avail && frames == 0) break; @@ -2033,6 +2034,7 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p pa_source_set_rtpoll(u->source, u->rtpoll); u->frame_size = frame_size; + u->frames_per_block = pa_mempool_block_size_max(m->core->mempool) / frame_size; u->fragment_size = frag_size = (size_t) (period_frames * frame_size); u->hwbuf_size = buffer_size = (size_t) (buffer_frames * frame_size); pa_cvolume_mute(&u->hardware_volume, u->source->sample_spec.channels);