summaryrefslogtreecommitdiff
path: root/lib/rbcodec/codecs/libopus/celt/kiss_fft.c
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2013-05-20 22:25:57 +0200
committerNils Wallménius <nils@rockbox.org>2013-08-31 08:30:51 +0200
commit580b307fd791c0997a8831bc800bba87797bfb7e (patch)
tree807846056f06fd944a750ce41217a877910ebd59 /lib/rbcodec/codecs/libopus/celt/kiss_fft.c
parent74761b70acd96cecc0d35450dd56a98ad9ee7d3d (diff)
downloadrockbox-580b307fd791c0997a8831bc800bba87797bfb7e.tar.gz
rockbox-580b307fd791c0997a8831bc800bba87797bfb7e.zip
Sync opus codec to upstream git
Sync opus codec to upstream commit 02fed471a4568852d6618e041c4f2af0d7730ee2 (August 30 2013) This brings in a lot of optimizations but also makes the diff between our codec and the upstream much smaller as most of our optimizations have been upstreamed or supeceded. Speedups across the board for CELT mode files: 64kbps 128kbps H300 9.82MHz 15.48MHz c200 4.86MHz 9.63MHz fuze v1 10.32MHz 15.92MHz For the silk mode test file (16kbps) arm targets get a speedup of about 2MHz while the H300 is 7.8MHz slower, likely because it's now using the pseudostack more rather than the real stack which is in iram. Patches to get around that are upcomming. Change-Id: Ifecf963e461c51ac42e09dac1e91bc4bc3b12fa3
Diffstat (limited to 'lib/rbcodec/codecs/libopus/celt/kiss_fft.c')
-rw-r--r--lib/rbcodec/codecs/libopus/celt/kiss_fft.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/rbcodec/codecs/libopus/celt/kiss_fft.c b/lib/rbcodec/codecs/libopus/celt/kiss_fft.c
index 01049d5344..e2b8f3b3da 100644
--- a/lib/rbcodec/codecs/libopus/celt/kiss_fft.c
+++ b/lib/rbcodec/codecs/libopus/celt/kiss_fft.c
@@ -31,7 +31,7 @@
31 31
32#ifndef SKIP_CONFIG_H 32#ifndef SKIP_CONFIG_H
33# ifdef HAVE_CONFIG_H 33# ifdef HAVE_CONFIG_H
34# include "opus_config.h" 34# include "config.h"
35# endif 35# endif
36#endif 36#endif
37 37
@@ -40,7 +40,6 @@
40#include "os_support.h" 40#include "os_support.h"
41#include "mathops.h" 41#include "mathops.h"
42#include "stack_alloc.h" 42#include "stack_alloc.h"
43#include "os_support.h"
44 43
45/* The guts header contains all the multiplication and addition macros that are defined for 44/* The guts header contains all the multiplication and addition macros that are defined for
46 complex numbers. It also delares the kf_ internal functions. 45 complex numbers. It also delares the kf_ internal functions.
@@ -145,8 +144,6 @@ static void kf_bfly4(
145 C_ADDTO(*Fout, scratch[1]); 144 C_ADDTO(*Fout, scratch[1]);
146 C_ADD( scratch[3] , scratch[0] , scratch[2] ); 145 C_ADD( scratch[3] , scratch[0] , scratch[2] );
147 C_SUB( scratch[4] , scratch[0] , scratch[2] ); 146 C_SUB( scratch[4] , scratch[0] , scratch[2] );
148 Fout[m2].r = PSHR32(Fout[m2].r, 2);
149 Fout[m2].i = PSHR32(Fout[m2].i, 2);
150 C_SUB( Fout[m2], *Fout, scratch[3] ); 147 C_SUB( Fout[m2], *Fout, scratch[3] );
151 tw1 += fstride; 148 tw1 += fstride;
152 tw2 += fstride*2; 149 tw2 += fstride*2;