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: set_timeout is only called when tsched is enabled.

Browse source 
We don't need to do an extra check.
This commit is contained in:
Wim Taymans 2023-09-14 17:16:44 +02:00
parent 4ffa7860bc
commit 3c5da11706
1 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1850,10 +1850,6 @@ static int set_swparams(struct state *state)
static int set_timeout(struct state *state, uint64_t time) static int set_timeout(struct state *state, uint64_t time)
{ {
struct itimerspec ts; struct itimerspec ts;
if (state->disable_tsched)
return 0;
ts.it_value.tv_sec = time / SPA_NSEC_PER_SEC; ts.it_value.tv_sec = time / SPA_NSEC_PER_SEC;
ts.it_value.tv_nsec = time % SPA_NSEC_PER_SEC; ts.it_value.tv_nsec = time % SPA_NSEC_PER_SEC;
ts.it_interval.tv_sec = 0; ts.it_interval.tv_sec = 0;
@ -2773,19 +2769,20 @@ static void alsa_wakeup_event(struct spa_source *source)
handle_capture(state, current_time, avail, delay, target); handle_capture(state, current_time, avail, delay, target);
done: done:
if (!state->disable_tsched && if (!state->disable_tsched) {
(state->next_time > current_time + SPA_NSEC_PER_SEC || if (state->next_time > current_time + SPA_NSEC_PER_SEC ||
current_time > state->next_time + SPA_NSEC_PER_SEC)) { current_time > state->next_time + SPA_NSEC_PER_SEC) {
if ((suppressed = spa_ratelimit_test(&state->rate_limit, current_time)) >= 0) { if ((suppressed = spa_ratelimit_test(&state->rate_limit, current_time)) >= 0) {
spa_log_error(state->log, "%s: impossible timeout %lu %lu %lu %" spa_log_error(state->log, "%s: impossible timeout %lu %lu %lu %"
PRIu64" %"PRIu64" %"PRIi64" %d %"PRIi64" (%d suppressed)", PRIu64" %"PRIu64" %"PRIi64" %d %"PRIi64" (%d suppressed)",
state->props.device, avail, delay, target, state->props.device, avail, delay, target,
current_time, state->next_time, state->next_time - current_time, current_time, state->next_time, state->next_time - current_time,
state->threshold, state->sample_count, suppressed); state->threshold, state->sample_count, suppressed);
}
state->next_time = current_time + state->threshold * 1e9 / state->rate;
} }
state->next_time = current_time + state->threshold * 1e9 / state->rate; set_timeout(state, state->next_time);
} }
set_timeout(state, state->next_time);
} }
static void reset_buffers(struct state *this) static void reset_buffers(struct state *this)