diff options
| author | Koen Vos <koen.vos@skype.net> | 2011-02-28 16:07:58 -0500 |
|---|---|---|
| committer | Jean-Marc Valin <jean-marc.valin@octasic.com> | 2011-02-28 16:07:58 -0500 |
| commit | 1bf4f9715a93209f681664f2c46cb5a25ee7aaf8 (patch) | |
| tree | a6026a1064d60718898f2054038dbb911e2b351d /src_SigProc_FIX/SKP_Silk_Inlines.h | |
| parent | 6df6db1391c78dbafd75cda7c6872f9c44982e31 (diff) | |
| download | opus-1bf4f9715a93209f681664f2c46cb5a25ee7aaf8.tar.gz | |
Squashed commit of the following:
commit 7721daf733c6986cb2c2511c81e6fc14fea1ec6a
Author: Jean-Marc Valin <jean-marc.valin@octasic.com>
Date: Mon Feb 28 16:00:52 2011 -0500
Makefile.am update
commit 47dcc4edad849f57240b0c364036a378b5d22a9a
Author: Koen Vos <koen.vos@skype.net>
Date: Mon Feb 28 15:46:23 2011 -0500
SILK update (prefill, new LSF quant)
Diffstat (limited to 'src_SigProc_FIX/SKP_Silk_Inlines.h')
| -rw-r--r-- | src_SigProc_FIX/SKP_Silk_Inlines.h | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/src_SigProc_FIX/SKP_Silk_Inlines.h b/src_SigProc_FIX/SKP_Silk_Inlines.h index 88a2046b..43c9d0aa 100644 --- a/src_SigProc_FIX/SKP_Silk_Inlines.h +++ b/src_SigProc_FIX/SKP_Silk_Inlines.h @@ -205,69 +205,6 @@ SKP_INLINE SKP_int32 SKP_INVERSE32_varQ( /* O returns a good approximation }
}
-#define SKP_SIN_APPROX_CONST0 (1073735400)
-#define SKP_SIN_APPROX_CONST1 (-82778932)
-#define SKP_SIN_APPROX_CONST2 (1059577)
-#define SKP_SIN_APPROX_CONST3 (-5013)
-
-/* Sine approximation; an input of 65536 corresponds to 2 * pi */
-/* Uses polynomial expansion of the input to the power 0, 2, 4 and 6 */
-/* The relative error is below 1e-5 */
-SKP_INLINE SKP_int32 SKP_Silk_SIN_APPROX_Q24( /* O returns approximately 2^24 * sin(x * 2 * pi / 65536) */
- SKP_int32 x
-)
-{
- SKP_int y_Q30;
-
- /* Keep only bottom 16 bits (the function repeats itself with period 65536) */
- x &= 65535;
-
- /* Split range in four quadrants */
- if( x <= 32768 ) {
- if( x < 16384 ) {
- /* Return cos(pi/2 - x) */
- x = 16384 - x;
- } else {
- /* Return cos(x - pi/2) */
- x -= 16384;
- }
- if( x < 1100 ) {
- /* Special case: high accuracy */
- return SKP_SMLAWB( 1 << 24, SKP_MUL( x, x ), -5053 );
- }
- x = SKP_SMULWB( SKP_LSHIFT( x, 8 ), x ); /* contains x^2 in Q20 */
- y_Q30 = SKP_SMLAWB( SKP_SIN_APPROX_CONST2, x, SKP_SIN_APPROX_CONST3 );
- y_Q30 = SKP_SMLAWW( SKP_SIN_APPROX_CONST1, x, y_Q30 );
- y_Q30 = SKP_SMLAWW( SKP_SIN_APPROX_CONST0 + 66, x, y_Q30 );
- } else {
- if( x < 49152 ) {
- /* Return -cos(3*pi/2 - x) */
- x = 49152 - x;
- } else {
- /* Return -cos(x - 3*pi/2) */
- x -= 49152;
- }
- if( x < 1100 ) {
- /* Special case: high accuracy */
- return SKP_SMLAWB( -1 << 24, SKP_MUL( x, x ), 5053 );
- }
- x = SKP_SMULWB( SKP_LSHIFT( x, 8 ), x ); /* contains x^2 in Q20 */
- y_Q30 = SKP_SMLAWB( -SKP_SIN_APPROX_CONST2, x, -SKP_SIN_APPROX_CONST3 );
- y_Q30 = SKP_SMLAWW( -SKP_SIN_APPROX_CONST1, x, y_Q30 );
- y_Q30 = SKP_SMLAWW( -SKP_SIN_APPROX_CONST0, x, y_Q30 );
- }
- return SKP_RSHIFT_ROUND( y_Q30, 6 );
-}
-
-/* Cosine approximation; an input of 65536 corresponds to 2 * pi */
-/* The relative error is below 1e-5 */
-SKP_INLINE SKP_int32 SKP_Silk_COS_APPROX_Q24( /* O returns approximately 2^24 * cos(x * 2 * pi / 65536) */
- SKP_int32 x
-)
-{
- return SKP_Silk_SIN_APPROX_Q24( x + 16384 );
-}
-
#ifdef __cplusplus
}
#endif
|