eden-emu/opus
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SMALL_FOOTPRINT preserves the special n=1 cwrs case

Browse source
This commit is contained in:
Jean-Marc Valin 2009-10-24 14:29:15 -04:00
parent c2f7dff55a
commit 630ee44aaa
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libcelt/cwrs.c
View file

@ -809,13 +809,13 @@ void get_required_bits(celt_int16 *_bits,int _n,int _maxk,int _frac){
static inline void encode_pulses32(int _n,int _k,const int *_y,ec_enc *_enc){ static inline void encode_pulses32(int _n,int _k,const int *_y,ec_enc *_enc){
celt_uint32 i; celt_uint32 i;
#ifndef SMALL_FOOTPRINT
switch(_n){ switch(_n){
case 1:{ case 1:{
i=icwrs1(_y,&_k); i=icwrs1(_y,&_k);
celt_assert(ncwrs1(_k)==2); celt_assert(ncwrs1(_k)==2);
ec_enc_bits(_enc,i,1); ec_enc_bits(_enc,i,1);
}break; }break;
#ifndef SMALL_FOOTPRINT
case 2:{ case 2:{
i=icwrs2(_y,&_k); i=icwrs2(_y,&_k);
ec_enc_uint(_enc,i,ncwrs2(_k)); ec_enc_uint(_enc,i,ncwrs2(_k));
@ -832,10 +832,8 @@ static inline void encode_pulses32(int _n,int _k,const int *_y,ec_enc *_enc){
i=icwrs5(_y,&_k); i=icwrs5(_y,&_k);
ec_enc_uint(_enc,i,ncwrs5(_k)); ec_enc_uint(_enc,i,ncwrs5(_k));
}break; }break;
default:
#else
{
#endif #endif
default:
{ {
VARDECL(celt_uint32,u); VARDECL(celt_uint32,u);
celt_uint32 nc; celt_uint32 nc;
@ -868,20 +866,18 @@ void encode_pulses(int *_y, int N, int K, ec_enc *enc)
} }
static inline void decode_pulses32(int _n,int _k,int *_y,ec_dec *_dec){ static inline void decode_pulses32(int _n,int _k,int *_y,ec_dec *_dec){
#ifndef SMALL_FOOTPRINT
switch(_n){ switch(_n){
case 1:{ case 1:{
celt_assert(ncwrs1(_k)==2); celt_assert(ncwrs1(_k)==2);
cwrsi1(_k,ec_dec_bits(_dec,1),_y); cwrsi1(_k,ec_dec_bits(_dec,1),_y);
}break; }break;
#ifndef SMALL_FOOTPRINT
case 2:cwrsi2(_k,ec_dec_uint(_dec,ncwrs2(_k)),_y);break; case 2:cwrsi2(_k,ec_dec_uint(_dec,ncwrs2(_k)),_y);break;
case 3:cwrsi3(_k,ec_dec_uint(_dec,ncwrs3(_k)),_y);break; case 3:cwrsi3(_k,ec_dec_uint(_dec,ncwrs3(_k)),_y);break;
case 4:cwrsi4(_k,ec_dec_uint(_dec,ncwrs4(_k)),_y);break; case 4:cwrsi4(_k,ec_dec_uint(_dec,ncwrs4(_k)),_y);break;
case 5:cwrsi5(_k,ec_dec_uint(_dec,ncwrs5(_k)),_y);break; case 5:cwrsi5(_k,ec_dec_uint(_dec,ncwrs5(_k)),_y);break;
default:
#else
{
#endif #endif
default:
{ {
VARDECL(celt_uint32,u); VARDECL(celt_uint32,u);
SAVE_STACK; SAVE_STACK;