remap: Change remapping function argument type from void to int16_t / float as approp...

[pulseaudio] / src / pulsecore / time-smoother.c

diff --git a/src/pulsecore/time-smoother.c b/src/pulsecore/time-smoother.c
index 1371ad562ef51f058cdc27434938ad051c284f91..0bae4def9c838c2233dfdc21d3583440b2318175 100644 (file)
--- a/src/pulsecore/time-smoother.c
+++ b/src/pulsecore/time-smoother.c
@@ -24,6 +24,7 @@
 #endif
 
 #include <stdio.h>
+#include <math.h>
 
 #include <pulse/sample.h>
 #include <pulse/xmalloc.h>
@@ -38,7 +39,7 @@
  * Implementation of a time smoothing algorithm to synchronize remote
  * clocks to a local one. Evens out noise, adjusts to clock skew and
  * allows cheap estimations of the remote time while clock updates may
- * be seldom and recieved in non-equidistant intervals.
+ * be seldom and received in non-equidistant intervals.
  *
  * Basically, we estimate the gradient of received clock samples in a
  * certain history window (of size 'history_time') with linear
@@ -47,13 +48,13 @@
  * towards that point with a 3rd order polynomial interpolation with
  * fitting derivatives. (more or less a b-spline)
  *
- * The larger 'history_time' is chosen the better we will surpress
+ * The larger 'history_time' is chosen the better we will suppress
  * noise -- but we'll adjust to clock skew slower..
  *
  * The larger 'adjust_time' is chosen the smoother our estimation
  * function will be -- but we'll adjust to clock skew slower, too.
  *
- * If 'monotonic' is TRUE the resulting estimation function is
+ * If 'monotonic' is true the resulting estimation function is
  * guaranteed to be monotonic.
  */
 
@@ -78,11 +79,11 @@ struct pa_smoother {
 
     /* Cached parameters for our interpolation polynomial y=ax^3+b^2+cx */
     double a, b, c;
-    pa_bool_t abc_valid:1;
+    bool abc_valid:1;
 
-    pa_bool_t monotonic:1;
-    pa_bool_t paused:1;
-    pa_bool_t smoothing:1; /* If FALSE we skip the polonyomial interpolation step */
+    bool monotonic:1;
+    bool paused:1;
+    bool smoothing:1; /* If false we skip the polynomial interpolation step */
 
     pa_usec_t pause_time;
 
@@ -92,11 +93,11 @@ struct pa_smoother {
 pa_smoother* pa_smoother_new(
         pa_usec_t adjust_time,
         pa_usec_t history_time,
-        pa_bool_t monotonic,
-        pa_bool_t smoothing,
+        bool monotonic,
+        bool smoothing,
         unsigned min_history,
         pa_usec_t time_offset,
-        pa_bool_t paused) {
+        bool paused) {
 
     pa_smoother *s;
 
@@ -126,13 +127,12 @@ void pa_smoother_free(pa_smoother* s) {
 #define REDUCE(x)                               \
     do {                                        \
         x = (x) % HISTORY_MAX;                  \
-    } while(FALSE)
+    } while(false)
 
 #define REDUCE_INC(x)                           \
     do {                                        \
         x = ((x)+1) % HISTORY_MAX;              \
-    } while(FALSE)
-
+    } while(false)
 
 static void drop_old(pa_smoother *s, pa_usec_t x) {
 
@@ -263,7 +263,7 @@ static void calc_abc(pa_smoother *s) {
 
     pa_assert(ex < px);
 
-    /* To increase the dynamic range and symplify calculation, we
+    /* To increase the dynamic range and simplify calculation, we
      * move these values to the origin */
     kx = (int64_t) px - (int64_t) ex;
     ky = (int64_t) py - (int64_t) ey;
@@ -273,7 +273,7 @@ static void calc_abc(pa_smoother *s) {
     s->b = (((double) (3*ky)/ (double) kx - dp - (double) (2*de))) / (double) kx;
     s->a = (dp/(double) kx - 2*s->b - de/(double) kx) / (double) (3*kx);
 
-    s->abc_valid = TRUE;
+    s->abc_valid = true;
 }
 
 static void estimate(pa_smoother *s, pa_usec_t x, pa_usec_t *y, double *deriv) {
@@ -320,10 +320,8 @@ static void estimate(pa_smoother *s, pa_usec_t x, pa_usec_t *y, double *deriv) {
 
         calc_abc(s);
 
-        tx = (double) x;
-
         /* Move to origin */
-        tx -= (double) s->ex;
+        tx = (double) (x - s->ex);
 
         /* Horner scheme */
         ty = (tx * (s->c + tx * (s->b + tx * s->a)));
@@ -349,7 +347,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) {
     pa_usec_t ney;
     double nde;
-    pa_bool_t is_new;
+    bool is_new;
 
     pa_assert(s);
 
@@ -384,10 +382,10 @@ void pa_smoother_put(pa_smoother *s, pa_usec_t x, pa_usec_t y) {
         s->py = s->ry;
     }
 
-    s->abc_valid = FALSE;
+    s->abc_valid = false;
 
 #ifdef DEBUG_DATA
-    pa_log_debug("%p, put(%llu | %llu) = %llu", s, (unsigned long long)  (x + s->time_offset), (unsigned long long) x, (unsigned long long) y);
+    pa_log_debug("%p, put(%llu | %llu) = %llu", s, (unsigned long long) (x + s->time_offset), (unsigned long long) x, (unsigned long long) y);
 #endif
 }
 
@@ -443,14 +441,14 @@ void pa_smoother_pause(pa_smoother *s, pa_usec_t x) {
         return;
 
 #ifdef DEBUG_DATA
-    pa_log_debug("pause(%llu)", (unsigned long long)  x);
+    pa_log_debug("pause(%llu)", (unsigned long long) x);
 #endif
 
-    s->paused = TRUE;
+    s->paused = true;
     s->pause_time = x;
 }
 
-void pa_smoother_resume(pa_smoother *s, pa_usec_t x, pa_bool_t fix_now) {
+void pa_smoother_resume(pa_smoother *s, pa_usec_t x, bool fix_now) {
     pa_assert(s);
 
     if (!s->paused)
@@ -463,7 +461,7 @@ void pa_smoother_resume(pa_smoother *s, pa_usec_t x, pa_bool_t fix_now) {
     pa_log_debug("resume(%llu)", (unsigned long long) x);
 #endif
 
-    s->paused = FALSE;
+    s->paused = false;
     s->time_offset += x - s->pause_time;
 
     if (fix_now)
@@ -503,7 +501,7 @@ pa_usec_t pa_smoother_translate(pa_smoother *s, pa_usec_t x, pa_usec_t y_delay)
     return (pa_usec_t) llrint((double) y_delay / nde);
 }
 
-void pa_smoother_reset(pa_smoother *s, pa_usec_t time_offset, pa_bool_t paused) {
+void pa_smoother_reset(pa_smoother *s, pa_usec_t time_offset, bool paused) {
     pa_assert(s);
 
     s->px = s->py = 0;
@@ -517,7 +515,7 @@ void pa_smoother_reset(pa_smoother *s, pa_usec_t time_offset, pa_bool_t paused)
 
     s->last_y = s->last_x = 0;
 
-    s->abc_valid = FALSE;
+    s->abc_valid = false;
 
     s->paused = paused;
     s->time_offset = s->pause_time = time_offset;