shithub: opus

Download patch

ref: 766257109e7f3d85d85104d5a451403b629e4398
parent: b18ec0b08d1220744a94ac3d99acdf1ab675ecdc
author: Jean-Marc Valin <[email protected]>
date: Fri Apr 11 03:23:53 EDT 2008

fixed a few warnings, no real change

--- a/TODO
+++ b/TODO
@@ -1,4 +1,5 @@
-- Fix channel order in intra prediction and folding
+- Check minimum width of bands
+- Adjust the energy resolution based on the bit-rate
 - Dynamic adjustment of energy quantisation
 - Psychacoustics
   * Error shaping within each band
--- a/libcelt/cwrs.c
+++ b/libcelt/cwrs.c
@@ -138,7 +138,7 @@
   On exit, _u will be initialized to column _m of U(n,m).*/
 celt_uint32_t ncwrs_u32(int _n,int _m,celt_uint32_t *_u){
   int k;
-  memset(_u,0,_n*sizeof(*_u));
+  CELT_MEMSET(_u,0,_n);
   if(_m<=0)return 1;
   if(_n<=0)return 0;
   for(k=1;k<_m;k++)unext32(_u,_n,2);
@@ -147,7 +147,7 @@
 
 celt_uint64_t ncwrs_u64(int _n,int _m,celt_uint64_t *_u){
   int k;
-  memset(_u,0,_n*sizeof(*_u));
+  CELT_MEMSET(_u,0,_n);
   if(_m<=0)return 1;
   if(_n<=0)return 0;
   for(k=1;k<_m;k++)unext64(_u,_n,2);
--- a/libcelt/kiss_fft.c
+++ b/libcelt/kiss_fft.c
@@ -526,8 +526,10 @@
         int m2
         )
 {
+#ifndef RADIX_TWO_ONLY
     int i;
     kiss_fft_cpx * Fout_beg=Fout;
+#endif
     const int p=*factors++; /* the radix  */
     const int m=*factors++; /* stage's fft length/p */
     /*printf ("fft %d %d %d %d %d %d %d\n", p*m, m, p, s2, fstride*in_stride, N, m2);*/
@@ -560,8 +562,10 @@
              int m2
             )
 {
+#ifndef RADIX_TWO_ONLY
    int i;
    kiss_fft_cpx * Fout_beg=Fout;
+#endif
    const int p=*factors++; /* the radix  */
    const int m=*factors++; /* stage's fft length/p */
    /*printf ("fft %d %d %d %d %d %d %d\n", p*m, m, p, s2, fstride*in_stride, N, m2);*/
--- a/tests/cwrs32-test.c
+++ b/tests/cwrs32-test.c
@@ -4,7 +4,7 @@
 
 #include <stdio.h>
 #include "cwrs.h"
-
+#include <string.h>
 #define NMAX (10)
 #define MMAX (9)
 
--- a/tests/cwrs64-test.c
+++ b/tests/cwrs64-test.c
@@ -4,6 +4,8 @@
 
 #include <stdio.h>
 #include "cwrs.h"
+#include <string.h>
+
 #define NMAX (32)
 #define MMAX (16)