summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2013-04-16 17:47:58 -0400
committerMichael Sevakis <jethead71@rockbox.org>2013-04-26 00:11:04 +0200
commit95e23defb085ee1a846ec2d379368485921d5aee (patch)
tree0bdb31f562fef8c7ff5f3f7dba9c54f9c1e84a76 /lib
parent8829e909b4e756bfb2ad9210eec61d0dc55e1731 (diff)
downloadrockbox-95e23defb085ee1a846ec2d379368485921d5aee.tar.gz
rockbox-95e23defb085ee1a846ec2d379368485921d5aee.tar.bz2
rockbox-95e23defb085ee1a846ec2d379368485921d5aee.zip
Make fixepoint.c as a shared library (libfixedpoint.a).
Change-Id: Icc10d6e85f890c432f191233a4d64e09f00be43d Reviewed-on: http://gerrit.rockbox.org/456 Reviewed-by: Michael Sevakis <jethead71@rockbox.org> Tested-by: Michael Sevakis <jethead71@rockbox.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/fixedpoint/fixedpoint.c457
-rw-r--r--lib/fixedpoint/fixedpoint.h125
-rw-r--r--lib/fixedpoint/fixedpoint.make36
-rw-r--r--lib/rbcodec/codecs/adx.c2
-rw-r--r--lib/rbcodec/codecs/codecs.make2
-rw-r--r--lib/rbcodec/codecs/lib/SOURCES1
-rw-r--r--lib/rbcodec/codecs/lib/fixedpoint.c1
-rw-r--r--lib/rbcodec/codecs/lib/fixedpoint.h26
-rw-r--r--lib/rbcodec/rbcodec.make4
-rw-r--r--lib/rbcodec/test/SOURCES1
10 files changed, 623 insertions, 32 deletions
diff --git a/lib/fixedpoint/fixedpoint.c b/lib/fixedpoint/fixedpoint.c
new file mode 100644
index 0000000000..b5bbe68a95
--- /dev/null
+++ b/lib/fixedpoint/fixedpoint.c
@@ -0,0 +1,457 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2006 Jens Arnold
+ *
+ * Fixed point library for plugins
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include "fixedpoint.h"
+#include <stdlib.h>
+#include <stdbool.h>
+#include <inttypes.h>
+
+#ifndef BIT_N
+#define BIT_N(n) (1U << (n))
+#endif
+
+/** TAKEN FROM ORIGINAL fixedpoint.h */
+/* Inverse gain of circular cordic rotation in s0.31 format. */
+static const long cordic_circular_gain = 0xb2458939; /* 0.607252929 */
+
+/* Table of values of atan(2^-i) in 0.32 format fractions of pi where pi = 0xffffffff / 2 */
+static const unsigned long atan_table[] = {
+ 0x1fffffff, /* +0.785398163 (or pi/4) */
+ 0x12e4051d, /* +0.463647609 */
+ 0x09fb385b, /* +0.244978663 */
+ 0x051111d4, /* +0.124354995 */
+ 0x028b0d43, /* +0.062418810 */
+ 0x0145d7e1, /* +0.031239833 */
+ 0x00a2f61e, /* +0.015623729 */
+ 0x00517c55, /* +0.007812341 */
+ 0x0028be53, /* +0.003906230 */
+ 0x00145f2e, /* +0.001953123 */
+ 0x000a2f98, /* +0.000976562 */
+ 0x000517cc, /* +0.000488281 */
+ 0x00028be6, /* +0.000244141 */
+ 0x000145f3, /* +0.000122070 */
+ 0x0000a2f9, /* +0.000061035 */
+ 0x0000517c, /* +0.000030518 */
+ 0x000028be, /* +0.000015259 */
+ 0x0000145f, /* +0.000007629 */
+ 0x00000a2f, /* +0.000003815 */
+ 0x00000517, /* +0.000001907 */
+ 0x0000028b, /* +0.000000954 */
+ 0x00000145, /* +0.000000477 */
+ 0x000000a2, /* +0.000000238 */
+ 0x00000051, /* +0.000000119 */
+ 0x00000028, /* +0.000000060 */
+ 0x00000014, /* +0.000000030 */
+ 0x0000000a, /* +0.000000015 */
+ 0x00000005, /* +0.000000007 */
+ 0x00000002, /* +0.000000004 */
+ 0x00000001, /* +0.000000002 */
+ 0x00000000, /* +0.000000001 */
+ 0x00000000, /* +0.000000000 */
+};
+
+/* Precalculated sine and cosine * 16384 (2^14) (fixed point 18.14) */
+static const short sin_table[91] =
+{
+ 0, 285, 571, 857, 1142, 1427, 1712, 1996, 2280, 2563,
+ 2845, 3126, 3406, 3685, 3963, 4240, 4516, 4790, 5062, 5334,
+ 5603, 5871, 6137, 6401, 6663, 6924, 7182, 7438, 7691, 7943,
+ 8191, 8438, 8682, 8923, 9161, 9397, 9630, 9860, 10086, 10310,
+ 10531, 10748, 10963, 11173, 11381, 11585, 11785, 11982, 12175, 12365,
+ 12550, 12732, 12910, 13084, 13254, 13420, 13582, 13740, 13894, 14043,
+ 14188, 14329, 14466, 14598, 14725, 14848, 14967, 15081, 15190, 15295,
+ 15395, 15491, 15582, 15668, 15749, 15825, 15897, 15964, 16025, 16082,
+ 16135, 16182, 16224, 16261, 16294, 16321, 16344, 16361, 16374, 16381,
+ 16384
+};
+
+/**
+ * Implements sin and cos using CORDIC rotation.
+ *
+ * @param phase has range from 0 to 0xffffffff, representing 0 and
+ * 2*pi respectively.
+ * @param cos return address for cos
+ * @return sin of phase, value is a signed value from LONG_MIN to LONG_MAX,
+ * representing -1 and 1 respectively.
+ */
+long fp_sincos(unsigned long phase, long *cos)
+{
+ int32_t x, x1, y, y1;
+ unsigned long z, z1;
+ int i;
+
+ /* Setup initial vector */
+ x = cordic_circular_gain;
+ y = 0;
+ z = phase;
+
+ /* The phase has to be somewhere between 0..pi for this to work right */
+ if (z < 0xffffffff / 4) {
+ /* z in first quadrant, z += pi/2 to correct */
+ x = -x;
+ z += 0xffffffff / 4;
+ } else if (z < 3 * (0xffffffff / 4)) {
+ /* z in third quadrant, z -= pi/2 to correct */
+ z -= 0xffffffff / 4;
+ } else {
+ /* z in fourth quadrant, z -= 3pi/2 to correct */
+ x = -x;
+ z -= 3 * (0xffffffff / 4);
+ }
+
+ /* Each iteration adds roughly 1-bit of extra precision */
+ for (i = 0; i < 31; i++) {
+ x1 = x >> i;
+ y1 = y >> i;
+ z1 = atan_table[i];
+
+ /* Decided which direction to rotate vector. Pivot point is pi/2 */
+ if (z >= 0xffffffff / 4) {
+ x -= y1;
+ y += x1;
+ z -= z1;
+ } else {
+ x += y1;
+ y -= x1;
+ z += z1;
+ }
+ }
+
+ if (cos)
+ *cos = x;
+
+ return y;
+}
+
+/**
+ * Fixed point square root via Newton-Raphson.
+ * @param x square root argument.
+ * @param fracbits specifies number of fractional bits in argument.
+ * @return Square root of argument in same fixed point format as input.
+ *
+ * This routine has been modified to run longer for greater precision,
+ * but cuts calculation short if the answer is reached sooner.
+ */
+long fp_sqrt(long x, unsigned int fracbits)
+{
+ unsigned long xfp, b;
+ int n = 8; /* iteration limit (should terminate earlier) */
+
+ if (x <= 0)
+ return 0; /* no sqrt(neg), or just sqrt(0) = 0 */
+
+ /* Increase working precision by one bit */
+ xfp = x << 1;
+ fracbits++;
+
+ /* Get the midpoint between fracbits index and the highest bit index */
+ b = ((sizeof(xfp)*8-1) - __builtin_clzl(xfp) + fracbits) >> 1;
+ b = BIT_N(b);
+
+ do
+ {
+ unsigned long c = b;
+ b = (fp_div(xfp, b, fracbits) + b) >> 1;
+ if (c == b) break;
+ }
+ while (n-- > 0);
+
+ return b >> 1;
+}
+
+/* Accurate int sqrt with only elementary operations.
+ * Snagged from:
+ * http://www.devmaster.net/articles/fixed-point-optimizations/ */
+unsigned long isqrt(unsigned long x)
+{
+ /* Adding CLZ could optimize this further */
+ unsigned long g = 0;
+ int bshift = 15;
+ unsigned long b = 1ul << bshift;
+
+ do
+ {
+ unsigned long temp = (g + g + b) << bshift;
+
+ if (x > temp)
+ {
+ g += b;
+ x -= temp;
+ }
+
+ b >>= 1;
+ }
+ while (bshift--);
+
+ return g;
+}
+
+/**
+ * Fixed point sinus using a lookup table
+ * don't forget to divide the result by 16384 to get the actual sinus value
+ * @param val sinus argument in degree
+ * @return sin(val)*16384
+ */
+long fp14_sin(int val)
+{
+ val = (val+360)%360;
+ if (val < 181)
+ {
+ if (val < 91)/* phase 0-90 degree */
+ return (long)sin_table[val];
+ else/* phase 91-180 degree */
+ return (long)sin_table[180-val];
+ }
+ else
+ {
+ if (val < 271)/* phase 181-270 degree */
+ return -(long)sin_table[val-180];
+ else/* phase 270-359 degree */
+ return -(long)sin_table[360-val];
+ }
+ return 0;
+}
+
+/**
+ * Fixed point cosinus using a lookup table
+ * don't forget to divide the result by 16384 to get the actual cosinus value
+ * @param val sinus argument in degree
+ * @return cos(val)*16384
+ */
+long fp14_cos(int val)
+{
+ val = (val+360)%360;
+ if (val < 181)
+ {
+ if (val < 91)/* phase 0-90 degree */
+ return (long)sin_table[90-val];
+ else/* phase 91-180 degree */
+ return -(long)sin_table[val-90];
+ }
+ else
+ {
+ if (val < 271)/* phase 181-270 degree */
+ return -(long)sin_table[270-val];
+ else/* phase 270-359 degree */
+ return (long)sin_table[val-270];
+ }
+ return 0;
+}
+
+/**
+ * Fixed-point natural log
+ * taken from http://www.quinapalus.com/efunc.html
+ * "The code assumes integers are at least 32 bits long. The (positive)
+ * argument and the result of the function are both expressed as fixed-point
+ * values with 16 fractional bits, although intermediates are kept with 28
+ * bits of precision to avoid loss of accuracy during shifts."
+ */
+long fp16_log(int x)
+{
+ int t;
+ int y = 0xa65af;
+
+ if (x < 0x00008000) x <<=16, y -= 0xb1721;
+ if (x < 0x00800000) x <<= 8, y -= 0x58b91;
+ if (x < 0x08000000) x <<= 4, y -= 0x2c5c8;
+ if (x < 0x20000000) x <<= 2, y -= 0x162e4;
+ if (x < 0x40000000) x <<= 1, y -= 0x0b172;
+ t = x + (x >> 1); if ((t & 0x80000000) == 0) x = t, y -= 0x067cd;
+ t = x + (x >> 2); if ((t & 0x80000000) == 0) x = t, y -= 0x03920;
+ t = x + (x >> 3); if ((t & 0x80000000) == 0) x = t, y -= 0x01e27;
+ t = x + (x >> 4); if ((t & 0x80000000) == 0) x = t, y -= 0x00f85;
+ t = x + (x >> 5); if ((t & 0x80000000) == 0) x = t, y -= 0x007e1;
+ t = x + (x >> 6); if ((t & 0x80000000) == 0) x = t, y -= 0x003f8;
+ t = x + (x >> 7); if ((t & 0x80000000) == 0) x = t, y -= 0x001fe;
+ x = 0x80000000 - x;
+ y -= x >> 15;
+
+ return y;
+}
+
+/**
+ * Fixed-point exponential
+ * taken from http://www.quinapalus.com/efunc.html
+ * "The code assumes integers are at least 32 bits long. The (non-negative)
+ * argument and the result of the function are both expressed as fixed-point
+ * values with 16 fractional bits. Notice that after 11 steps of the
+ * algorithm the constants involved become such that the code is simply
+ * doing a multiplication: this is explained in the note below.
+ * The extension to negative arguments is left as an exercise."
+ */
+long fp16_exp(int x)
+{
+ int t;
+ int y = 0x00010000;
+
+ if (x < 0) x += 0xb1721, y >>= 16;
+ t = x - 0x58b91; if (t >= 0) x = t, y <<= 8;
+ t = x - 0x2c5c8; if (t >= 0) x = t, y <<= 4;
+ t = x - 0x162e4; if (t >= 0) x = t, y <<= 2;
+ t = x - 0x0b172; if (t >= 0) x = t, y <<= 1;
+ t = x - 0x067cd; if (t >= 0) x = t, y += y >> 1;
+ t = x - 0x03920; if (t >= 0) x = t, y += y >> 2;
+ t = x - 0x01e27; if (t >= 0) x = t, y += y >> 3;
+ t = x - 0x00f85; if (t >= 0) x = t, y += y >> 4;
+ t = x - 0x007e1; if (t >= 0) x = t, y += y >> 5;
+ t = x - 0x003f8; if (t >= 0) x = t, y += y >> 6;
+ t = x - 0x001fe; if (t >= 0) x = t, y += y >> 7;
+ y += ((y >> 8) * x) >> 8;
+
+ return y;
+}
+
+/** MODIFIED FROM replaygain.c */
+
+#define FP_MUL_FRAC(x, y) fp_mul(x, y, fracbits)
+#define FP_DIV_FRAC(x, y) fp_div(x, y, fracbits)
+
+/* constants in fixed point format, 28 fractional bits */
+#define FP28_LN2 (186065279L) /* ln(2) */
+#define FP28_LN2_INV (387270501L) /* 1/ln(2) */
+#define FP28_EXP_ZERO (44739243L) /* 1/6 */
+#define FP28_EXP_ONE (-745654L) /* -1/360 */
+#define FP28_EXP_TWO (12428L) /* 1/21600 */
+#define FP28_LN10 (618095479L) /* ln(10) */
+#define FP28_LOG10OF2 (80807124L) /* log10(2) */
+
+#define TOL_BITS 2 /* log calculation tolerance */
+
+
+/* The fpexp10 fixed point math routine is based
+ * on oMathFP by Dan Carter (http://orbisstudios.com).
+ */
+
+/** FIXED POINT EXP10
+ * Return 10^x as FP integer. Argument is FP integer.
+ */
+long fp_exp10(long x, unsigned int fracbits)
+{
+ long k;
+ long z;
+ long R;
+ long xp;
+
+ /* scale constants */
+ const long fp_one = (1 << fracbits);
+ const long fp_half = (1 << (fracbits - 1));
+ const long fp_two = (2 << fracbits);
+ const long fp_mask = (fp_one - 1);
+ const long fp_ln2_inv = (FP28_LN2_INV >> (28 - fracbits));
+ const long fp_ln2 = (FP28_LN2 >> (28 - fracbits));
+ const long fp_ln10 = (FP28_LN10 >> (28 - fracbits));
+ const long fp_exp_zero = (FP28_EXP_ZERO >> (28 - fracbits));
+ const long fp_exp_one = (FP28_EXP_ONE >> (28 - fracbits));
+ const long fp_exp_two = (FP28_EXP_TWO >> (28 - fracbits));
+
+ /* exp(0) = 1 */
+ if (x == 0)
+ {
+ return fp_one;
+ }
+
+ /* convert from base 10 to base e */
+ x = FP_MUL_FRAC(x, fp_ln10);
+
+ /* calculate exp(x) */
+ k = (FP_MUL_FRAC(abs(x), fp_ln2_inv) + fp_half) & ~fp_mask;
+
+ if (x < 0)
+ {
+ k = -k;
+ }
+
+ x -= FP_MUL_FRAC(k, fp_ln2);
+ z = FP_MUL_FRAC(x, x);
+ R = fp_two + FP_MUL_FRAC(z, fp_exp_zero + FP_MUL_FRAC(z, fp_exp_one
+ + FP_MUL_FRAC(z, fp_exp_two)));
+ xp = fp_one + FP_DIV_FRAC(FP_MUL_FRAC(fp_two, x), R - x);
+
+ if (k < 0)
+ {
+ k = fp_one >> (-k >> fracbits);
+ }
+ else
+ {
+ k = fp_one << (k >> fracbits);
+ }
+
+ return FP_MUL_FRAC(k, xp);
+}
+
+/** FIXED POINT LOG10
+ * Return log10(x) as FP integer. Argument is FP integer.
+ */
+long fp_log10(long n, unsigned int fracbits)
+{
+ /* Calculate log2 of argument */
+
+ long log2, frac;
+ const long fp_one = (1 << fracbits);
+ const long fp_two = (2 << fracbits);
+ const long tolerance = (1 << ((fracbits / 2) + 2));
+
+ if (n <=0) return FP_NEGINF;
+ log2 = 0;
+
+ /* integer part */
+ while (n < fp_one)
+ {
+ log2 -= fp_one;
+ n <<= 1;
+ }
+ while (n >= fp_two)
+ {
+ log2 += fp_one;
+ n >>= 1;
+ }
+
+ /* fractional part */
+ frac = fp_one;
+ while (frac > tolerance)
+ {
+ frac >>= 1;
+ n = FP_MUL_FRAC(n, n);
+ if (n >= fp_two)
+ {
+ n >>= 1;
+ log2 += frac;
+ }
+ }
+
+ /* convert log2 to log10 */
+ return FP_MUL_FRAC(log2, (FP28_LOG10OF2 >> (28 - fracbits)));
+}
+
+/** CONVERT FACTOR TO DECIBELS */
+long fp_decibels(unsigned long factor, unsigned int fracbits)
+{
+ /* decibels = 20 * log10(factor) */
+ return FP_MUL_FRAC((20L << fracbits), fp_log10(factor, fracbits));
+}
+
+/** CONVERT DECIBELS TO FACTOR */
+long fp_factor(long decibels, unsigned int fracbits)
+{
+ /* factor = 10 ^ (decibels / 20) */
+ return fp_exp10(FP_DIV_FRAC(decibels, (20L << fracbits)), fracbits);
+}
diff --git a/lib/fixedpoint/fixedpoint.h b/lib/fixedpoint/fixedpoint.h
new file mode 100644
index 0000000000..31d60eca4b
--- /dev/null
+++ b/lib/fixedpoint/fixedpoint.h
@@ -0,0 +1,125 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2006 Jens Arnold
+ *
+ * Fixed point library for plugins
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+/** FIXED POINT MATH ROUTINES - USAGE
+ *
+ * - x and y arguments are fixed point integers
+ * - fracbits is the number of fractional bits in the argument(s)
+ * - functions return long fixed point integers with the specified number
+ * of fractional bits unless otherwise specified
+ *
+ * Multiply two fixed point numbers:
+ * fp_mul(x, y, fracbits)
+ *
+ * Divide two fixed point numbers:
+ * fp_div(x, y, fracbits)
+ *
+ * Calculate sin and cos of an angle:
+ * fp_sincos(phase, *cos)
+ * where phase is a 32 bit unsigned integer with 0 representing 0
+ * and 0xFFFFFFFF representing 2*pi, and *cos is the address to
+ * a long signed integer. Value returned is a long signed integer
+ * from -0x80000000 to 0x7fffffff, representing -1 to 1 respectively.
+ * That is, value is a fixed point integer with 31 fractional bits.
+ *
+ * Take square root of a fixed point number:
+ * fp_sqrt(x, fracbits)
+ *
+ * Take the square root of an integer:
+ * isqrt(x)
+ *
+ * Calculate sin or cos of an angle (very fast, from a table):
+ * fp14_sin(angle)
+ * fp14_cos(angle)
+ * where angle is a non-fixed point integer in degrees. Value
+ * returned is a fixed point integer with 14 fractional bits.
+ *
+ * Calculate the exponential of a fixed point integer
+ * fp16_exp(x)
+ * where x and the value returned are fixed point integers
+ * with 16 fractional bits.
+ *
+ * Calculate the natural log of a positive fixed point integer
+ * fp16_log(x)
+ * where x and the value returned are fixed point integers
+ * with 16 fractional bits.
+ *
+ * Calculate decibel equivalent of a gain factor:
+ * fp_decibels(factor, fracbits)
+ * where fracbits is in the range 12 to 22 (higher is better),
+ * and factor is a positive fixed point integer.
+ *
+ * Calculate factor equivalent of a decibel value:
+ * fp_factor(decibels, fracbits)
+ * where fracbits is in the range 12 to 22 (lower is better),
+ * and decibels is a fixed point integer.
+ */
+
+#ifndef FIXEDPOINT_H
+#define FIXEDPOINT_H
+
+#define fp_mul(x, y, z) (long)((((long long)(x)) * ((long long)(y))) >> (z))
+#define fp_div(x, y, z) (long)((((long long)(x)) << (z)) / ((long long)(y)))
+
+long fp_sincos(unsigned long phase, long *cos);
+long fp_sqrt(long a, unsigned int fracbits);
+long fp14_cos(int val);
+long fp14_sin(int val);
+long fp16_log(int x);
+long fp16_exp(int x);
+
+unsigned long isqrt(unsigned long x);
+
+/* fast unsigned multiplication (16x16bit->32bit or 32x32bit->32bit,
+ * whichever is faster for the architecture) */
+#ifdef CPU_ARM
+#define FMULU(a, b) ((uint32_t) (((uint32_t) (a)) * ((uint32_t) (b))))
+#else /* SH1, coldfire */
+#define FMULU(a, b) ((uint32_t) (((uint16_t) (a)) * ((uint16_t) (b))))
+#endif
+
+/** MODIFIED FROM replaygain.c */
+#define FP_INF (0x7fffffff)
+#define FP_NEGINF -(0x7fffffff)
+
+/** FIXED POINT EXP10
+ * Return 10^x as FP integer. Argument is FP integer.
+ */
+long fp_exp10(long x, unsigned int fracbits);
+
+/** FIXED POINT LOG10
+ * Return log10(x) as FP integer. Argument is FP integer.
+ */
+long fp_log10(long n, unsigned int fracbits);
+
+/* fracbits in range 12 - 22 work well. Higher is better for
+ * calculating dB, lower is better for calculating factor.
+ */
+
+/** CONVERT FACTOR TO DECIBELS */
+long fp_decibels(unsigned long factor, unsigned int fracbits);
+
+/** CONVERT DECIBELS TO FACTOR */
+long fp_factor(long decibels, unsigned int fracbits);
+
+#endif /* FIXEDPOINT_H */
diff --git a/lib/fixedpoint/fixedpoint.make b/lib/fixedpoint/fixedpoint.make
new file mode 100644
index 0000000000..9ee0e1f0c7
--- /dev/null
+++ b/lib/fixedpoint/fixedpoint.make
@@ -0,0 +1,36 @@
+# __________ __ ___.
+# Open \______ \ ____ ____ | | _\_ |__ _______ ___
+# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+# \/ \/ \/ \/ \/
+
+FIXEDPOINTLIB := $(BUILDDIR)/lib/libfixedpoint.a
+FIXEDPOINTLIB_DIR := $(ROOTDIR)/lib/fixedpoint
+FIXEDPOINTLIB_SRC := $(FIXEDPOINTLIB_DIR)/fixedpoint.c
+FIXEDPOINTLIB_OBJ := $(call c2obj, $(FIXEDPOINTLIB_SRC))
+
+INCLUDES += -I$(FIXEDPOINTLIB_DIR)
+OTHER_SRC += $(FIXEDPOINTLIB_SRC)
+
+# If not SOFTWARECODECS, then only plugins depend upon us
+ifdef SOFTWARECODECS
+CORE_LIBS += $(FIXEDPOINTLIB)
+CORE_GCSECTIONS := yes
+endif
+
+FIXEDPOINTLIB_FLAGS := $(CFLAGS)
+
+# Do not use '-ffunction-sections' and '-fdata-sections' when compiling sdl-sim
+ifneq ($(findstring sdl-sim, $(APP_TYPE)), sdl-sim)
+ FIXEDPOINTLIB_FLAGS += -ffunction-sections -fdata-sections
+endif
+
+$(FIXEDPOINTLIB_OBJ): $(FIXEDPOINTLIB_SRC)
+ $(SILENT)mkdir -p $(dir $@)
+ $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \
+ $(FIXEDPOINTLIB_FLAGS) -c $< -o $@
+
+$(FIXEDPOINTLIB): $(FIXEDPOINTLIB_OBJ)
+ $(SILENT)$(shell rm -f $@)
+ $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
diff --git a/lib/rbcodec/codecs/adx.c b/lib/rbcodec/codecs/adx.c
index 0c67fc8d6e..83ced5add0 100644
--- a/lib/rbcodec/codecs/adx.c
+++ b/lib/rbcodec/codecs/adx.c
@@ -23,7 +23,7 @@
#include "codeclib.h"
#include "inttypes.h"
#include "math.h"
-#include "lib/fixedpoint.h"
+#include "fixedpoint.h"
CODEC_HEADER
diff --git a/lib/rbcodec/codecs/codecs.make b/lib/rbcodec/codecs/codecs.make
index eea8950d0d..21bb9332b3 100644
--- a/lib/rbcodec/codecs/codecs.make
+++ b/lib/rbcodec/codecs/codecs.make
@@ -19,7 +19,7 @@ include $(RBCODECLIB_DIR)/codecs/lib/libcodec.make
OTHER_INC += -I$(RBCODECLIB_DIR)/codecs/lib
# extra libraries
-CODEC_LIBS := $(CODECLIB)
+CODEC_LIBS := $(CODECLIB) $(FIXEDPOINTLIB)
# the codec libraries
include $(RBCODECLIB_DIR)/codecs/demac/libdemac.make
diff --git a/lib/rbcodec/codecs/lib/SOURCES b/lib/rbcodec/codecs/lib/SOURCES
index 257dcb5838..f4b951a5eb 100644
--- a/lib/rbcodec/codecs/lib/SOURCES
+++ b/lib/rbcodec/codecs/lib/SOURCES
@@ -1,6 +1,5 @@
#if CONFIG_CODEC == SWCODEC /* software codec platforms */
codeclib.c
-fixedpoint.c
ffmpeg_bitstream.c
mdct_lookup.c
diff --git a/lib/rbcodec/codecs/lib/fixedpoint.c b/lib/rbcodec/codecs/lib/fixedpoint.c
deleted file mode 100644
index a66dcb1270..0000000000
--- a/lib/rbcodec/codecs/lib/fixedpoint.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../apps/fixedpoint.c"
diff --git a/lib/rbcodec/codecs/lib/fixedpoint.h b/lib/rbcodec/codecs/lib/fixedpoint.h
deleted file mode 100644
index 3d8e77cd89..0000000000
--- a/lib/rbcodec/codecs/lib/fixedpoint.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************
- * __________ __ ___.
- * Open \______ \ ____ ____ | | _\_ |__ _______ ___
- * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
- * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
- * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
- * \/ \/ \/ \/ \/
- * $Id$
- *
- * Copyright (C) 2006 Jens Arnold
- *
- * Fixed point library for codecs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-#ifndef _FIXEDPOINT_H_CODECS
-#define _FIXEDPOINT_H_CODECS
-#include "../../../../firmware/include/fixedpoint.h"
-#endif /* _FIXEDPOINT_H_CODECS */
diff --git a/lib/rbcodec/rbcodec.make b/lib/rbcodec/rbcodec.make
index 7aac57b87d..bc4e54fddf 100644
--- a/lib/rbcodec/rbcodec.make
+++ b/lib/rbcodec/rbcodec.make
@@ -15,7 +15,9 @@ RBCODECLIB := $(BUILDDIR)/lib/librbcodec.a
INCLUDES += -I$(RBCODECLIB_DIR) -I$(RBCODECLIB_DIR)/codecs \
-I$(RBCODECLIB_DIR)/dsp -I$(RBCODECLIB_DIR)/metadata
OTHER_SRC += $(RBCODECLIB_SRC)
-CORE_LIBS += $(RBCODECLIB)
+
+# libfixedpoint must go after in lib list but be made first
+CORE_LIBS := $(RBCODECLIB) $(CORE_LIBS)
$(RBCODECLIB): $(RBCODECLIB_OBJ)
$(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
diff --git a/lib/rbcodec/test/SOURCES b/lib/rbcodec/test/SOURCES
index a89af238ca..d1413c758a 100644
--- a/lib/rbcodec/test/SOURCES
+++ b/lib/rbcodec/test/SOURCES
@@ -2,5 +2,4 @@ warble.c
../../../firmware/common/strlcpy.c
../../../firmware/common/unicode.c
../../../firmware/common/structec.c
-../../../apps/fixedpoint.c
../../../uisimulator/common/io.c