mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

make sure the smoother code can deal with incoming data that is out-of-order; start smoothing only when we have at least a configurable number of entries in our history

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2390 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-05-09 22:27:44 +00:00
parent e97a347325
commit 0ea0e0694e
2 changed files with 86 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

131
src/pulsecore/time-smoother.c
View file

@ -69,13 +69,14 @@ struct pa_smoother {
pa_usec_t ex, ey; /* Point e, which we estimated before and need to smooth to */ pa_usec_t ex, ey; /* Point e, which we estimated before and need to smooth to */
double de; /* Gradient we estimated for point e */ double de; /* Gradient we estimated for point e */
pa_usec_t ry; /* The original y value for ex */
/* History of last measurements */ /* History of last measurements */
pa_usec_t history_x[HISTORY_MAX], history_y[HISTORY_MAX]; pa_usec_t history_x[HISTORY_MAX], history_y[HISTORY_MAX];
unsigned history_idx, n_history; unsigned history_idx, n_history;
/* To even out for monotonicity */ /* To even out for monotonicity */
pa_usec_t last_y; pa_usec_t last_y, last_x;
/* Cached parameters for our interpolation polynomial y=ax^3+b^2+cx */ /* Cached parameters for our interpolation polynomial y=ax^3+b^2+cx */
double a, b, c; double a, b, c;
@ -85,13 +86,17 @@ struct pa_smoother {
pa_bool_t paused:1; pa_bool_t paused:1;
pa_usec_t pause_time; pa_usec_t pause_time;
unsigned min_history;
}; };
pa_smoother* pa_smoother_new(pa_usec_t adjust_time, pa_usec_t history_time, pa_bool_t monotonic) { pa_smoother* pa_smoother_new(pa_usec_t adjust_time, pa_usec_t history_time, pa_bool_t monotonic, unsigned min_history) {
pa_smoother *s; pa_smoother *s;
pa_assert(adjust_time > 0); pa_assert(adjust_time > 0);
pa_assert(history_time > 0); pa_assert(history_time > 0);
pa_assert(min_history >= 2);
pa_assert(min_history <= HISTORY_MAX);
s = pa_xnew(pa_smoother, 1); s = pa_xnew(pa_smoother, 1);
s->adjust_time = adjust_time; s->adjust_time = adjust_time;
@ -102,18 +107,20 @@ pa_smoother* pa_smoother_new(pa_usec_t adjust_time, pa_usec_t history_time, pa_b
s->px = s->py = 0; s->px = s->py = 0;
s->dp = 1; s->dp = 1;
s->ex = s->ey = 0; s->ex = s->ey = s->ry = 0;
s->de = 1; s->de = 1;
s->history_idx = 0; s->history_idx = 0;
s->n_history = 0; s->n_history = 0;
s->last_y = 0; s->last_y = s->last_x = 0;
s->abc_valid = FALSE; s->abc_valid = FALSE;
s->paused = FALSE; s->paused = FALSE;
s->min_history = min_history;
return s; return s;
} }
@ -137,9 +144,9 @@ void pa_smoother_free(pa_smoother* s) {
static void drop_old(pa_smoother *s, pa_usec_t x) { static void drop_old(pa_smoother *s, pa_usec_t x) {
/* Drop items from history which are too old, but make sure to /* Drop items from history which are too old, but make sure to
* always keep two entries in the history */ * always keep min_history in the history */
while (s->n_history > 2) { while (s->n_history > s->min_history) {
if (s->history_x[s->history_idx] + s->history_time >= x) if (s->history_x[s->history_idx] + s->history_time >= x)
/* This item is still valid, and thus all following ones /* This item is still valid, and thus all following ones
@ -184,7 +191,7 @@ static void add_to_history(pa_smoother *s, pa_usec_t x, pa_usec_t y) {
s->n_history ++; s->n_history ++;
/* And make sure we don't store more entries than fit in */ /* And make sure we don't store more entries than fit in */
if (s->n_history >= HISTORY_MAX) { if (s->n_history > HISTORY_MAX) {
s->history_idx += s->n_history - HISTORY_MAX; s->history_idx += s->n_history - HISTORY_MAX;
REDUCE(s->history_idx); REDUCE(s->history_idx);
s->n_history = HISTORY_MAX; s->n_history = HISTORY_MAX;
@ -196,7 +203,9 @@ static double avg_gradient(pa_smoother *s, pa_usec_t x) {
int64_t ax = 0, ay = 0, k, t; int64_t ax = 0, ay = 0, k, t;
double r; double r;
drop_old(s, x); /* Too few measurements, assume gradient of 1 */
if (s->n_history < s->min_history)
return 1;
/* First, calculate average of all measurements */ /* First, calculate average of all measurements */
i = s->history_idx; i = s->history_idx;
@ -209,10 +218,7 @@ static double avg_gradient(pa_smoother *s, pa_usec_t x) {
REDUCE_INC(i); REDUCE_INC(i);
} }
/* Too few measurements, assume gradient of 1 */ pa_assert(c >= s->min_history);
if (c < 2)
return 1;
ax /= c; ax /= c;
ay /= c; ay /= c;
@ -237,6 +243,39 @@ static double avg_gradient(pa_smoother *s, pa_usec_t x) {
return (s->monotonic && r < 0) ? 0 : r; return (s->monotonic && r < 0) ? 0 : r;
} }
static void calc_abc(pa_smoother *s) {
pa_usec_t ex, ey, px, py;
int64_t kx, ky;
double de, dp;
pa_assert(s);
if (s->abc_valid)
return;
/* We have two points: (ex|ey) and (px|py) with two gradients at
* these points de and dp. We do a polynomial
* interpolation of degree 3 with these 6 values */
ex = s->ex; ey = s->ey;
px = s->px; py = s->py;
de = s->de; dp = s->dp;
pa_assert(ex < px);
/* To increase the dynamic range and symplify calculation, we
* move these values to the origin */
kx = (int64_t) px - (int64_t) ex;
ky = (int64_t) py - (int64_t) ey;
/* Calculate a, b, c for y=ax^3+bx^2+cx */
s->c = de;
s->b = (((double) (3*ky)/kx - dp - 2*de)) / kx;
s->a = (dp/kx - 2*s->b - de/kx) / (3*kx);
s->abc_valid = TRUE;
}
static void estimate(pa_smoother *s, pa_usec_t x, pa_usec_t *y, double *deriv) { static void estimate(pa_smoother *s, pa_usec_t x, pa_usec_t *y, double *deriv) {
pa_assert(s); pa_assert(s);
pa_assert(y); pa_assert(y);
@ -259,36 +298,10 @@ static void estimate(pa_smoother *s, pa_usec_t x, pa_usec_t *y, double *deriv) {
} else { } else {
if (!s->abc_valid) {
pa_usec_t ex, ey, px, py;
int64_t kx, ky;
double de, dp;
/* Ok, we're not yet on track, thus let's interpolate, and /* Ok, we're not yet on track, thus let's interpolate, and
* make sure that the first derivative is smooth */ * make sure that the first derivative is smooth */
/* We have two points: (ex|ey) and (px|py) with two gradients calc_abc(s);
* at these points de and dp. We do a polynomial interpolation
* of degree 3 with these 6 values */
ex = s->ex; ey = s->ey;
px = s->px; py = s->py;
de = s->de; dp = s->dp;
pa_assert(ex < px);
/* To increase the dynamic range and symplify calculation, we
* move these values to the origin */
kx = (int64_t) px - (int64_t) ex;
ky = (int64_t) py - (int64_t) ey;
/* Calculate a, b, c for y=ax^3+b^2+cx */
s->c = de;
s->b = (((double) (3*ky)/kx - dp - 2*de)) / kx;
s->a = (dp/kx - 2*s->b - de/kx) / (3*kx);
s->abc_valid = TRUE;
}
/* Move to origin */ /* Move to origin */
x -= s->ex; x -= s->ex;
@ -307,11 +320,6 @@ static void estimate(pa_smoother *s, pa_usec_t x, pa_usec_t *y, double *deriv) {
/* Guarantee monotonicity */ /* Guarantee monotonicity */
if (s->monotonic) { if (s->monotonic) {
if (*y < s->last_y)
*y = s->last_y;
else
s->last_y = *y;
if (deriv && *deriv < 0) if (deriv && *deriv < 0)
*deriv = 0; *deriv = 0;
} }
@ -320,6 +328,7 @@ static void estimate(pa_smoother *s, pa_usec_t x, pa_usec_t *y, double *deriv) {
void pa_smoother_put(pa_smoother *s, pa_usec_t x, pa_usec_t y) { void pa_smoother_put(pa_smoother *s, pa_usec_t x, pa_usec_t y) {
pa_usec_t ney; pa_usec_t ney;
double nde; double nde;
pa_bool_t is_new;
pa_assert(s); pa_assert(s);
@ -329,13 +338,17 @@ void pa_smoother_put(pa_smoother *s, pa_usec_t x, pa_usec_t y) {
x = PA_LIKELY(x >= s->time_offset) ? x - s->time_offset : 0; x = PA_LIKELY(x >= s->time_offset) ? x - s->time_offset : 0;
pa_assert(x >= s->ex); is_new = x >= s->ex;
if (is_new) {
/* First, we calculate the position we'd estimate for x, so that /* First, we calculate the position we'd estimate for x, so that
* we can adjust our position smoothly from this one */ * we can adjust our position smoothly from this one */
estimate(s, x, &ney, &nde); estimate(s, x, &ney, &nde);
s->ex = x; s->ey = ney; s->de = nde; s->ex = x; s->ey = ney; s->de = nde;
s->ry = y;
}
/* Then, we add the new measurement to our history */ /* Then, we add the new measurement to our history */
add_to_history(s, x, y); add_to_history(s, x, y);
@ -343,8 +356,8 @@ void pa_smoother_put(pa_smoother *s, pa_usec_t x, pa_usec_t y) {
s->dp = avg_gradient(s, x); s->dp = avg_gradient(s, x);
/* And calculate when we want to be on track again */ /* And calculate when we want to be on track again */
s->px = x + s->adjust_time; s->px = s->ex + s->adjust_time;
s->py = y + s->dp *s->adjust_time; s->py = s->ry + s->dp *s->adjust_time;
s->abc_valid = FALSE; s->abc_valid = FALSE;
@ -361,10 +374,21 @@ pa_usec_t pa_smoother_get(pa_smoother *s, pa_usec_t x) {
x = s->pause_time; x = s->pause_time;
x = PA_LIKELY(x >= s->time_offset) ? x - s->time_offset : 0; x = PA_LIKELY(x >= s->time_offset) ? x - s->time_offset : 0;
pa_assert(x >= s->ex);
estimate(s, x, &y, NULL); estimate(s, x, &y, NULL);
if (s->monotonic) {
/* Make sure the querier doesn't jump forth and back. */
pa_assert(x >= s->last_x);
s->last_x = x;
if (y < s->last_y)
y = s->last_y;
else
s->last_y = y;
}
/* pa_log_debug("get(%llu | %llu) = %llu", (unsigned long long) (x + s->time_offset), (unsigned long long) x, (unsigned long long) y); */ /* pa_log_debug("get(%llu | %llu) = %llu", (unsigned long long) (x + s->time_offset), (unsigned long long) x, (unsigned long long) y); */
return y; return y;
@ -416,11 +440,14 @@ pa_usec_t pa_smoother_translate(pa_smoother *s, pa_usec_t x, pa_usec_t y_delay)
x = PA_LIKELY(x >= s->time_offset) ? x - s->time_offset : 0; x = PA_LIKELY(x >= s->time_offset) ? x - s->time_offset : 0;
pa_assert(x >= s->ex);
estimate(s, x, &ney, &nde); estimate(s, x, &ney, &nde);
/* pa_log_debug("translate(%llu) = %llu (%0.2f)", (unsigned long long) y_delay, (unsigned long long) ((double) y_delay / s->dp), s->dp); */ /* Play safe and take the larger gradient, so that we wakeup
* earlier when this is used for sleeping */
if (s->dp > nde)
nde = s->dp;
return (pa_usec_t) ((double) y_delay / s->dp); /* pa_log_debug("translate(%llu) = %llu (%0.2f)", (unsigned long long) y_delay, (unsigned long long) ((double) y_delay / nde), nde); */
return (pa_usec_t) ((double) y_delay / nde);
} }

2
src/pulsecore/time-smoother.h
View file

@ -29,7 +29,7 @@
typedef struct pa_smoother pa_smoother; typedef struct pa_smoother pa_smoother;
pa_smoother* pa_smoother_new(pa_usec_t x_adjust_time, pa_usec_t x_history_time, pa_bool_t monotonic); pa_smoother* pa_smoother_new(pa_usec_t x_adjust_time, pa_usec_t x_history_time, pa_bool_t monotonic, unsigned min_history);
void pa_smoother_free(pa_smoother* s); void pa_smoother_free(pa_smoother* s);
/* Adds a new value to our dataset. x = local/system time, y = remote time */ /* Adds a new value to our dataset. x = local/system time, y = remote time */