Fixed a bunch of warnings
This commit is contained in:
parent
25358cd407
commit
472a5f03c6
4 changed files with 8 additions and 9 deletions
|
@ -234,7 +234,7 @@ void quant_bands(const CELTMode *m, float *X, float *P, float *W, int total_bits
|
|||
q = pulses[i];
|
||||
//q = m->nbPulses[i];
|
||||
n = sqrt(B*(eBands[i+1]-eBands[i]));
|
||||
theta = .007*(B*(eBands[i+1]-eBands[i]))/(.1f+abs(q));
|
||||
theta = .007*(B*(eBands[i+1]-eBands[i]))/(.1f+q);
|
||||
|
||||
/* If pitch isn't available, use intra-frame prediction */
|
||||
if (eBands[i] >= m->pitchEnd || q<=0)
|
||||
|
@ -290,7 +290,7 @@ void unquant_bands(const CELTMode *m, float *X, float *P, int total_bits, ec_dec
|
|||
q = pulses[i];
|
||||
//q = m->nbPulses[i];
|
||||
n = sqrt(B*(eBands[i+1]-eBands[i]));
|
||||
theta = .007*(B*(eBands[i+1]-eBands[i]))/(.1f+abs(q));
|
||||
theta = .007*(B*(eBands[i+1]-eBands[i]))/(.1f+q);
|
||||
|
||||
/* If pitch isn't available, use intra-frame prediction */
|
||||
if (eBands[i] >= m->pitchEnd || q<=0)
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
/* Knowing ncwrs() for a fixed number of pulses m and for all vector sizes n,
|
||||
compute ncwrs() for m+1, for all n. Could also be used when m and n are
|
||||
swapped just by changing nc */
|
||||
static celt_uint32_t next_ncwrs32(celt_uint32_t *nc, int len, int nc0)
|
||||
static void next_ncwrs32(celt_uint32_t *nc, int len, int nc0)
|
||||
{
|
||||
int i;
|
||||
celt_uint32_t mem;
|
||||
|
@ -56,7 +56,7 @@ static celt_uint32_t next_ncwrs32(celt_uint32_t *nc, int len, int nc0)
|
|||
/* Knowing ncwrs() for a fixed number of pulses m and for all vector sizes n,
|
||||
compute ncwrs() for m-1, for all n. Could also be used when m and n are
|
||||
swapped just by changing nc */
|
||||
static celt_uint32_t prev_ncwrs32(celt_uint32_t *nc, int len, int nc0)
|
||||
static void prev_ncwrs32(celt_uint32_t *nc, int len, int nc0)
|
||||
{
|
||||
int i;
|
||||
celt_uint32_t mem;
|
||||
|
@ -71,7 +71,7 @@ static celt_uint32_t prev_ncwrs32(celt_uint32_t *nc, int len, int nc0)
|
|||
}
|
||||
}
|
||||
|
||||
static celt_uint64_t next_ncwrs64(celt_uint64_t *nc, int len, int nc0)
|
||||
static void next_ncwrs64(celt_uint64_t *nc, int len, int nc0)
|
||||
{
|
||||
int i;
|
||||
celt_uint64_t mem;
|
||||
|
@ -86,7 +86,7 @@ static celt_uint64_t next_ncwrs64(celt_uint64_t *nc, int len, int nc0)
|
|||
}
|
||||
}
|
||||
|
||||
static celt_uint64_t prev_ncwrs64(celt_uint64_t *nc, int len, int nc0)
|
||||
static void prev_ncwrs64(celt_uint64_t *nc, int len, int nc0)
|
||||
{
|
||||
int i;
|
||||
celt_uint64_t mem;
|
||||
|
@ -106,7 +106,6 @@ static celt_uint64_t prev_ncwrs64(celt_uint64_t *nc, int len, int nc0)
|
|||
celt_uint32_t ncwrs(int _n,int _m)
|
||||
{
|
||||
int i;
|
||||
celt_uint32_t ret;
|
||||
celt_uint32_t nc[_n+1];
|
||||
for (i=0;i<_n+1;i++)
|
||||
nc[i] = 1;
|
||||
|
@ -120,7 +119,6 @@ celt_uint32_t ncwrs(int _n,int _m)
|
|||
celt_uint64_t ncwrs64(int _n,int _m)
|
||||
{
|
||||
int i;
|
||||
celt_uint64_t ret;
|
||||
celt_uint64_t nc[_n+1];
|
||||
for (i=0;i<_n+1;i++)
|
||||
nc[i] = 1;
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
|
||||
#include "celt.h"
|
||||
#include "modes.h"
|
||||
#include "rate.h"
|
||||
#include "os_support.h"
|
||||
|
||||
int celt_mode_info(const CELTMode *mode, int request, celt_int32_t *value)
|
||||
|
|
|
@ -166,7 +166,7 @@ void alg_quant(float *x, float *W, int N, int K, float *p, float alpha, ec_enc *
|
|||
|
||||
if (score>nbest[Lupdate-1]->score)
|
||||
{
|
||||
int k, n;
|
||||
int k;
|
||||
int id = Lupdate-1;
|
||||
struct NBest *tmp_best;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue