thanks Steve for a patch to get the SM1000 image building after the latest clock...

git-svn-id: https://svn.code.sf.net/p/freetel/code@3582 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/codec2-dev/src/codec2.c b/codec2-dev/src/codec2.c
index 5847b2f0e206cad97e212efb1e48f2ee10c34353..ebc26989659e777b2d7c337bc3bad6c8380d9714 100644 (file)
--- a/codec2-dev/src/codec2.c
+++ b/codec2-dev/src/codec2.c
@@ -330,9 +330,9 @@ void codec2_encode(struct CODEC2 *c2, unsigned char *bits, short speech[])
        codec2_encode_700b(c2, bits, speech);
     if (c2->mode == CODEC2_MODE_700C)
        codec2_encode_700c(c2, bits, speech);
-#endif
     if (c2->mode == CODEC2_MODE_WB)
        codec2_encode_wb(c2, bits, speech);
+#endif
 
 }
 
@@ -365,9 +365,9 @@ void codec2_decode_ber(struct CODEC2 *c2, short speech[], const unsigned char *b
        codec2_decode_700b(c2, speech, bits);
     if (c2->mode == CODEC2_MODE_700C)
        codec2_decode_700c(c2, speech, bits);
-#endif
     if (c2->mode == CODEC2_MODE_WB)
        codec2_decode_wb(c2, speech, bits);
+#endif
 }
 
 

diff --git a/codec2-dev/src/kiss_fftr.c b/codec2-dev/src/kiss_fftr.c
index ca5d418150d660877c30cf12617fe0645d74c75a..7cc0286a48f8b894d6e82f65f09b0d42502707cc 100644 (file)
--- a/codec2-dev/src/kiss_fftr.c
+++ b/codec2-dev/src/kiss_fftr.c
@@ -56,8 +56,8 @@ kiss_fftr_cfg kiss_fftr_alloc(int nfft,int inverse_fft,void * mem,size_t * lenme
     kiss_fft_alloc(nfft, inverse_fft, st->substate, &subsize);
 
     for (i = 0; i < nfft/2; ++i) {
-        double phase =
-            -3.14159265358979323846264338327 * ((double) (i+1) / nfft + .5);
+        float phase =
+            -3.14159265358979323846264338327 * ((float) (i+1) / nfft + .5);
         if (inverse_fft)
             phase *= -1;
         kf_cexp (st->super_twiddles+i,phase);