mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: don't limit reads to avail

Browse source 
The ringbuffer can warp around and then there is really more available.
This commit is contained in:
Wim Taymans 2023-10-18 15:44:07 +02:00
parent db5516ccd8
commit c9c98312cb
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
spa/plugins/alsa/alsa-pcm.c
View file

@ -1483,6 +1483,10 @@ spa_alsa_enum_format(struct state *state, int seq, uint32_t start, uint32_t num,
static void recalc_headroom(struct state *state)
{
uint32_t latency;
uint32_t rate = 0;
if (state->position != NULL)
rate = state->position->clock.target_rate.denom;
state->headroom = state->default_headroom;
if (!state->disable_tsched || state->resample) {
@ -1500,8 +1504,8 @@ static void recalc_headroom(struct state *state)
state->headroom = SPA_MIN(state->headroom, state->buffer_frames);
latency = SPA_MAX(state->min_delay, SPA_MIN(state->max_delay, state->headroom));
if (state->position != NULL && state->rate != 0)
latency = SPA_SCALE32_UP(latency, state->position->clock.target_rate.denom, state->rate);
if (rate != 0 && state->rate != 0)
latency = SPA_SCALE32_UP(latency, rate, state->rate);
state->latency[state->port_direction].min_rate =
state->latency[state->port_direction].max_rate = latency;
@ -2744,8 +2748,6 @@ static int alsa_read_frames(struct state *state)
alsa_recover(state, res);
return res;
}
if (avail < frames)
frames = avail;
spa_log_trace_fp(state->log, "%p: begin offs:%ld frames:%ld avail:%ld thres:%d", state,
offset, frames, avail, state->threshold);
} else {