gerrit.automotivelinux Code Review - AGL/meta-agl-devel.git/blob

   1 From 0c232229f3dc6b0cdf02ef44ae212b256c1828a3 Mon Sep 17 00:00:00 2001
   2 From: George Kiagiadakis <george.kiagiadakis@collabora.com>
   3 Date: Tue, 9 Jul 2019 18:06:18 +0300
   4 Subject: [PATCH] alsa: make corrections on the timeout based on how fast ALSA
   5  consumes samples
   6
   7 This feels a bit hacky, but it actually makes huge difference when pipewire is
   8 running in qemu.
   9
  10 The idea is that it keeps track of how much samples are in the device
  11 (fill level) and calculates how many are consumed when a timeout occurs.
  12 Then it converts that into a time based on the sample rate and compares it to
  13 the system clock time that elapsed since the last write to the device.
  14 The division between the two gives a rate (drift) that can be used to shorten
  15 the timeout window.
  16
  17 So for instance, if the timeout window was 21.3 ms, but the device actually
  18 consumed an equivalent of 28 ms in samples, the drift will be 21.3/28 = 0.76
  19 and the next timeout window will be approximately 21.3 * 0.76 = 16.1 ms
  20
  21 To avoid making things worse, the drift is clamped between 0.6 and 1.0.
  22 Min 0.6 was arbitrarily chosen, but sometimes alsa does report strange numbers,
  23 causing the drift to be very low, which in turn causes an early wakeup.
  24 Max 1.0 basically means that we don't care if the device is consuming samples
  25 slower. In that case, the early wakeup mechanism will throttle pipewire.
  26
  27 Fixes #163
  28
  29 Upstream-Status: Submitted [https://github.com/PipeWire/pipewire/pull/166]
  30 ---
  31  spa/plugins/alsa/alsa-utils.c | 29 +++++++++++++++++++++++++----
  32  spa/plugins/alsa/alsa-utils.h |  2 ++
  33  2 files changed, 27 insertions(+), 4 deletions(-)
  34
  35 diff --git a/spa/plugins/alsa/alsa-utils.c b/spa/plugins/alsa/alsa-utils.c
  36 index 7cf1d0d2..e8548345 100644
  37 --- a/spa/plugins/alsa/alsa-utils.c
  38 +++ b/spa/plugins/alsa/alsa-utils.c
  39 @@ -624,7 +624,21 @@ static int get_status(struct state *state, snd_pcm_uframes_t *delay, snd_pcm_ufr
  40  static int update_time(struct state *state, uint64_t nsec, snd_pcm_sframes_t delay,
  41                 snd_pcm_sframes_t target, bool slave)
  42  {
  43 -       double err, corr;
  44 +       double err, corr, drift;
  45 +       snd_pcm_sframes_t consumed;
  46 +
  47 +       consumed = state->fill_level - delay;
  48 +       if (state->alsa_started && consumed > 0) {
  49 +               double sysclk_diff = nsec - state->last_time;
  50 +               double devclk_diff = ((double) consumed) * 1e9 / state->rate;
  51 +               drift = sysclk_diff / devclk_diff;
  52 +               drift = SPA_CLAMP(drift, 0.6, 1.0);
  53 +
  54 +               spa_log_trace_fp(state->log, "cons:%ld sclk:%f dclk:%f drift:%f",
  55 +                       consumed, sysclk_diff, devclk_diff, drift);
  56 +       } else {
  57 +               drift = 1.0;
  58 +       }
  59
  60         if (state->stream == SND_PCM_STREAM_PLAYBACK)
  61                 err = delay - target;
  62 @@ -677,11 +691,11 @@ static int update_time(struct state *state, uint64_t nsec, snd_pcm_sframes_t del
  63                 state->clock->next_nsec = state->next_time;
  64         }
  65
  66 -       spa_log_trace_fp(state->log, "slave:%d %"PRIu64" %f %ld %f %f %d", slave, nsec,
  67 -                       corr, delay, err, state->threshold * corr,
  68 +       spa_log_trace_fp(state->log, "slave:%d %"PRIu64" %f %ld %f %f %f %d", slave, nsec,
  69 +                       corr, delay, err, state->threshold * corr, drift,
  70                         state->threshold);
  71
  72 -       state->next_time += state->threshold / corr * 1e9 / state->rate;
  73 +       state->next_time += state->threshold / corr * drift * 1e9 / state->rate;
  74         state->last_threshold = state->threshold;
  75
  76         return 0;
  77 @@ -812,6 +826,10 @@ again:
  78                 goto again;
  79
  80         state->sample_count += total_written;
  81 +       state->fill_level += total_written;
  82 +
  83 +       clock_gettime(CLOCK_MONOTONIC, &state->now);
  84 +       state->last_time = SPA_TIMESPEC_TO_NSEC (&state->now);
  85
  86         if (!state->alsa_started && total_written > 0) {
  87                 spa_log_trace(state->log, "snd_pcm_start %lu", written);
  88 @@ -981,6 +999,8 @@ static int handle_play(struct state *state, uint64_t nsec,
  89         if ((res = update_time(state, nsec, delay, target, false)) < 0)
  90                 return res;
  91
  92 +       state->fill_level = delay;
  93 +
  94         if (spa_list_is_empty(&state->ready)) {
  95                 struct spa_io_buffers *io = state->io;
  96
  97 @@ -1120,6 +1140,7 @@ int spa_alsa_start(struct state *state)
  98
  99         state->threshold = (state->duration * state->rate + state->rate_denom-1) / state->rate_denom;
 100         state->last_threshold = state->threshold;
 101 +       state->fill_level = 0;
 102
 103         init_loop(state);
 104         state->safety = 0.0;
 105 diff --git a/spa/plugins/alsa/alsa-utils.h b/spa/plugins/alsa/alsa-utils.h
 106 index 110d4204..bab0f67b 100644
 107 --- a/spa/plugins/alsa/alsa-utils.h
 108 +++ b/spa/plugins/alsa/alsa-utils.h
 109 @@ -141,7 +141,9 @@ struct state {
 110         int64_t sample_time;
 111         uint64_t next_time;
 112         uint64_t base_time;
 113 +       uint64_t last_time;
 114
 115 +       snd_pcm_uframes_t fill_level;
 116         uint64_t underrun;
 117         double safety;
 118
 119 --
 120 2.23.0
 121