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: fix capture again

Browse source
This commit is contained in:
Wim Taymans 2018-11-19 18:03:45 +01:00
parent 7e9b223216
commit afd9a6c95f
1 changed files with 49 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

79
spa/plugins/alsa/alsa-utils.c
View file

@ -460,6 +460,13 @@ static int set_swparams(struct state *state)
CHECK(snd_pcm_sw_params_set_tstamp_mode(hndl, params, SND_PCM_TSTAMP_ENABLE), "sw_params_set_tstamp_mode"); CHECK(snd_pcm_sw_params_set_tstamp_mode(hndl, params, SND_PCM_TSTAMP_ENABLE), "sw_params_set_tstamp_mode");
#if 0
snd_pcm_uframes_t boundary;
CHECK(snd_pcm_sw_params_get_boundary(params, &boundary), "get_boundary");
CHECK(snd_pcm_sw_params_set_stop_threshold(hndl, params, boundary), "set_stop_threshold");
#endif
/* start the transfer */ /* start the transfer */
CHECK(snd_pcm_sw_params_set_start_threshold(hndl, params, LONG_MAX), "set_start_threshold"); CHECK(snd_pcm_sw_params_set_start_threshold(hndl, params, LONG_MAX), "set_start_threshold");
@ -551,30 +558,37 @@ again:
return 0; return 0;
} }
static int update_time(struct state *state, uint64_t nsec, snd_pcm_sframes_t delay, static int update_time(struct state *state, uint64_t nsec, snd_pcm_sframes_t delay, bool slaved)
uint64_t *period, bool slaved)
{ {
uint64_t sample_time, elapsed; uint64_t sample_time, elapsed;
double tw; double tw = 0.0, extra = 0.0;
int64_t sdelay;
sample_time = state->sample_count;
if (!slaved) { if (!slaved) {
sample_time = state->sample_count;
elapsed = sample_time - state->sample_time; elapsed = sample_time - state->sample_time;
state->sample_time = sample_time;
} else { } else {
elapsed = state->threshold; elapsed = state->threshold;
} }
/* if our buffers are too full, pause the dll */ if (state->stream == SND_PCM_STREAM_CAPTURE) {
if (delay >= state->threshold * 2 || elapsed == 0) { elapsed = state->threshold;
elapsed = state->threshold / 2; extra = (double) elapsed / state->rate;
delay = state->threshold / 2; sdelay = (int64_t)(delay - elapsed);
} else {
if (elapsed == 0) {
elapsed = state->threshold / 2;
delay = state->threshold / 2;
}
state->sample_time = sample_time;
sdelay = -delay;
} }
/* we try to match the delay with the number of played samples */
tw = nsec * 1e-9 + (double)delay / state->rate - state->safety; /* we try to match the delay with the number of delayed samples */
tw = nsec * 1e-9 - (double)sdelay / state->rate - state->safety;
tw = dll_update(&state->dll, tw, (double)elapsed / state->rate); tw = dll_update(&state->dll, tw, (double)elapsed / state->rate);
state->next_time = (tw - state->safety) * 1e9; state->next_time = (tw + extra - state->safety) * 1e9;
if (state->dll.bw > DLL_BW_MIN && tw > state->dll.base + DLL_BW_PERIOD) if (state->dll.bw > DLL_BW_MIN && tw > state->dll.base + DLL_BW_PERIOD)
dll_bandwidth(&state->dll, DLL_BW_MIN); dll_bandwidth(&state->dll, DLL_BW_MIN);
@ -583,7 +597,7 @@ static int update_time(struct state *state, uint64_t nsec, snd_pcm_sframes_t del
state->clock->nsec = state->last_time; state->clock->nsec = state->last_time;
state->clock->rate = SPA_FRACTION(1, state->rate); state->clock->rate = SPA_FRACTION(1, state->rate);
state->clock->position = state->sample_count; state->clock->position = state->sample_count;
state->clock->delay = state->stream == SND_PCM_STREAM_CAPTURE ? delay : -delay; state->clock->delay = sdelay;
state->clock->rate_diff = state->dll.dt; state->clock->rate_diff = state->dll.dt;
} }
@ -603,13 +617,11 @@ static int update_time(struct state *state, uint64_t nsec, snd_pcm_sframes_t del
} }
#endif #endif
spa_log_trace(state->log, "%"PRIu64" %f %"PRIi64" %"PRIi64" %"PRIi64" %d %"PRIu64, nsec, spa_log_debug(state->log, "%"PRIu64" %f %"PRIi64" %"PRIi64" %"PRIi64" %d %"PRIu64" %f %f", nsec,
state->old_dt, delay, elapsed, (int64_t)(nsec - state->last_time), state->old_dt, delay, elapsed, (int64_t)(nsec - state->last_time),
state->threshold, state->next_time); state->threshold, state->next_time, tw, extra);
state->last_time = nsec; state->last_time = nsec;
if (period)
*period = elapsed;
return 0; return 0;
} }
@ -634,7 +646,7 @@ int spa_alsa_write(struct state *state, snd_pcm_uframes_t silence, bool start)
if ((res = get_status(state, &delay)) < 0) if ((res = get_status(state, &delay)) < 0)
return res; return res;
if ((res = update_time(state, nsec, delay, NULL, true)) < 0) if ((res = update_time(state, nsec, delay, true)) < 0)
return res; return res;
spa_log_trace(state->log, "slave %f %"PRIi64" %"PRIu64" %d", spa_log_trace(state->log, "slave %f %"PRIi64" %"PRIu64" %d",
@ -796,7 +808,7 @@ static void alsa_on_playback_timeout_event(struct spa_source *source)
int res; int res;
struct state *state = source->data; struct state *state = source->data;
snd_pcm_sframes_t delay; snd_pcm_sframes_t delay;
uint64_t nsec, expire, elapsed; uint64_t nsec, expire;
int64_t jitter; int64_t jitter;
if (state->started && read(state->timerfd, &expire, sizeof(uint64_t)) != sizeof(uint64_t)) if (state->started && read(state->timerfd, &expire, sizeof(uint64_t)) != sizeof(uint64_t))
@ -814,14 +826,15 @@ static void alsa_on_playback_timeout_event(struct spa_source *source)
spa_log_trace(state->log, "timeout %ld %"PRIu64" %"PRIu64" %"PRIi64" %d %ld", delay, spa_log_trace(state->log, "timeout %ld %"PRIu64" %"PRIu64" %"PRIi64" %d %ld", delay,
nsec, state->next_time, jitter, state->threshold, state->sample_count); nsec, state->next_time, jitter, state->threshold, state->sample_count);
if ((res = update_time(state, nsec, delay, &elapsed, false)) < 0)
return;
if (delay >= state->threshold * 2) { if (delay >= state->threshold * 2) {
spa_log_trace(state->log, "early wakeup %ld %d", delay, state->threshold); spa_log_trace(state->log, "early wakeup %ld %d", delay, state->threshold);
state->next_time = nsec + (state->threshold / 2) * SPA_NSEC_PER_SEC / state->rate;
goto next; goto next;
} }
if ((res = update_time(state, nsec, delay, false)) < 0)
return;
if (spa_list_is_empty(&state->ready)) { if (spa_list_is_empty(&state->ready)) {
struct spa_io_buffers *io = state->io; struct spa_io_buffers *io = state->io;
@ -852,6 +865,7 @@ static void alsa_on_capture_timeout_event(struct spa_source *source)
snd_pcm_sframes_t delay; snd_pcm_sframes_t delay;
snd_pcm_uframes_t total_read = 0, to_read; snd_pcm_uframes_t total_read = 0, to_read;
const snd_pcm_channel_area_t *my_areas; const snd_pcm_channel_area_t *my_areas;
int64_t jitter;
if (state->started && read(state->timerfd, &expire, sizeof(uint64_t)) != sizeof(uint64_t)) if (state->started && read(state->timerfd, &expire, sizeof(uint64_t)) != sizeof(uint64_t))
spa_log_warn(state->log, "error reading timerfd: %s", strerror(errno)); spa_log_warn(state->log, "error reading timerfd: %s", strerror(errno));
@ -863,18 +877,22 @@ static void alsa_on_capture_timeout_event(struct spa_source *source)
if ((res = get_status(state, &delay)) < 0) if ((res = get_status(state, &delay)) < 0)
return; return;
spa_log_trace(state->log, "timeout %ld %d %ld", nsec = SPA_TIMESPEC_TO_NSEC(&state->now);
delay, state->threshold, state->sample_count); jitter = nsec - state->next_time;
spa_log_trace(state->log, "timeout %ld %"PRIu64" %"PRIu64" %"PRIi64" %d %ld", delay,
nsec, state->next_time, jitter, state->threshold, state->sample_count);
if (delay < state->threshold) if (delay < state->threshold) {
spa_log_trace(state->log, "early wakeup %ld %d", delay, state->threshold);
state->next_time = nsec + (state->threshold - delay) * SPA_NSEC_PER_SEC / state->rate;
goto next; goto next;
}
if ((res = update_time(state, nsec, delay, false)) < 0)
return;
to_read = SPA_MIN(delay, state->threshold); to_read = SPA_MIN(delay, state->threshold);
nsec = SPA_TIMESPEC_TO_NSEC(&state->now);
if ((res = update_time(state, nsec, delay, NULL, false)) < 0)
return;
while (total_read < to_read) { while (total_read < to_read) {
snd_pcm_uframes_t read, frames, offset; snd_pcm_uframes_t read, frames, offset;
@ -919,6 +937,7 @@ int spa_alsa_start(struct state *state)
} }
dll_init(&state->dll, DLL_BW_MAX); dll_init(&state->dll, DLL_BW_MAX);
state->old_dt = 1.0;
state->safety = 0.0; state->safety = 0.0;
spa_log_debug(state->log, "alsa %p: start %d %d", state, state->threshold, state->slaved); spa_log_debug(state->log, "alsa %p: start %d %d", state, state->threshold, state->slaved);
@ -946,7 +965,7 @@ int spa_alsa_start(struct state *state)
if (state->stream == SND_PCM_STREAM_PLAYBACK) { if (state->stream == SND_PCM_STREAM_PLAYBACK) {
state->alsa_started = false; state->alsa_started = false;
spa_alsa_write(state, state->threshold, false); spa_alsa_write(state, state->threshold * 2, true);
} else { } else {
if ((err = snd_pcm_start(state->hndl)) < 0) { if ((err = snd_pcm_start(state->hndl)) < 0) {
spa_log_error(state->log, "snd_pcm_start: %s", snd_strerror(err)); spa_log_error(state->log, "snd_pcm_start: %s", snd_strerror(err));