Code for converting back and forth between pulse vectors and the correspondig
VQ index.
This commit is contained in:
parent
7f4701383b
commit
c4541ae786
4 changed files with 302 additions and 55 deletions
|
@ -8,27 +8,13 @@
|
||||||
<primarylanguage>C</primarylanguage>
|
<primarylanguage>C</primarylanguage>
|
||||||
<ignoreparts/>
|
<ignoreparts/>
|
||||||
<projectname>celt</projectname>
|
<projectname>celt</projectname>
|
||||||
<projectdirectory>.</projectdirectory>
|
|
||||||
<absoluteprojectpath>false</absoluteprojectpath>
|
|
||||||
<description/>
|
|
||||||
<defaultencoding/>
|
|
||||||
</general>
|
</general>
|
||||||
<kdevautoproject>
|
<kdevautoproject>
|
||||||
<general>
|
<general>
|
||||||
<useconfiguration>default</useconfiguration>
|
<useconfiguration>default</useconfiguration>
|
||||||
|
<activetarget>libcelt/libcelt.la</activetarget>
|
||||||
</general>
|
</general>
|
||||||
<run>
|
<run/>
|
||||||
<mainprogram/>
|
|
||||||
<programargs/>
|
|
||||||
<globaldebugarguments/>
|
|
||||||
<globalcwd/>
|
|
||||||
<useglobalprogram>true</useglobalprogram>
|
|
||||||
<terminal>false</terminal>
|
|
||||||
<autocompile>false</autocompile>
|
|
||||||
<autoinstall>false</autoinstall>
|
|
||||||
<autokdesu>false</autokdesu>
|
|
||||||
<envvars/>
|
|
||||||
</run>
|
|
||||||
<configurations>
|
<configurations>
|
||||||
<optimized>
|
<optimized>
|
||||||
<builddir>optimized</builddir>
|
<builddir>optimized</builddir>
|
||||||
|
@ -56,20 +42,7 @@
|
||||||
<kdevdebugger>
|
<kdevdebugger>
|
||||||
<general>
|
<general>
|
||||||
<dbgshell>libtool</dbgshell>
|
<dbgshell>libtool</dbgshell>
|
||||||
<gdbpath/>
|
|
||||||
<configGdbScript/>
|
|
||||||
<runShellScript/>
|
|
||||||
<runGdbScript/>
|
|
||||||
<breakonloadinglibs>true</breakonloadinglibs>
|
|
||||||
<separatetty>false</separatetty>
|
|
||||||
<floatingtoolbar>false</floatingtoolbar>
|
|
||||||
<raiseGDBOnStart>false</raiseGDBOnStart>
|
|
||||||
</general>
|
</general>
|
||||||
<display>
|
|
||||||
<staticmembers>false</staticmembers>
|
|
||||||
<demanglenames>true</demanglenames>
|
|
||||||
<outputradix>10</outputradix>
|
|
||||||
</display>
|
|
||||||
</kdevdebugger>
|
</kdevdebugger>
|
||||||
<kdevdoctreeview>
|
<kdevdoctreeview>
|
||||||
<ignoretocs>
|
<ignoretocs>
|
||||||
|
@ -131,12 +104,13 @@
|
||||||
<used>false</used>
|
<used>false</used>
|
||||||
<version>3</version>
|
<version>3</version>
|
||||||
<includestyle>3</includestyle>
|
<includestyle>3</includestyle>
|
||||||
<root></root>
|
<root>/usr/share/qt3</root>
|
||||||
<designerintegration>EmbeddedKDevDesigner</designerintegration>
|
<designerintegration>EmbeddedKDevDesigner</designerintegration>
|
||||||
<qmake></qmake>
|
<qmake>/usr/bin/qmake-qt3</qmake>
|
||||||
<designer></designer>
|
<designer>/usr/bin/designer</designer>
|
||||||
<designerpluginpaths/>
|
<designerpluginpaths/>
|
||||||
</qt>
|
</qt>
|
||||||
|
<references/>
|
||||||
<codecompletion>
|
<codecompletion>
|
||||||
<automaticCodeCompletion>false</automaticCodeCompletion>
|
<automaticCodeCompletion>false</automaticCodeCompletion>
|
||||||
<automaticArgumentsHint>true</automaticArgumentsHint>
|
<automaticArgumentsHint>true</automaticArgumentsHint>
|
||||||
|
@ -160,27 +134,7 @@
|
||||||
<alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
|
<alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
|
||||||
<includePaths>.;</includePaths>
|
<includePaths>.;</includePaths>
|
||||||
</codecompletion>
|
</codecompletion>
|
||||||
<creategettersetter>
|
|
||||||
<prefixGet/>
|
|
||||||
<prefixSet>set</prefixSet>
|
|
||||||
<prefixVariable>m_,_</prefixVariable>
|
|
||||||
<parameterName>theValue</parameterName>
|
|
||||||
<inlineGet>true</inlineGet>
|
|
||||||
<inlineSet>true</inlineSet>
|
|
||||||
</creategettersetter>
|
|
||||||
<splitheadersource>
|
|
||||||
<enabled>false</enabled>
|
|
||||||
<synchronize>true</synchronize>
|
|
||||||
<orientation>Vertical</orientation>
|
|
||||||
</splitheadersource>
|
|
||||||
<references/>
|
|
||||||
</kdevcppsupport>
|
</kdevcppsupport>
|
||||||
<cppsupportpart>
|
|
||||||
<filetemplates>
|
|
||||||
<interfacesuffix>.h</interfacesuffix>
|
|
||||||
<implementationsuffix>.cpp</implementationsuffix>
|
|
||||||
</filetemplates>
|
|
||||||
</cppsupportpart>
|
|
||||||
<kdevfileview>
|
<kdevfileview>
|
||||||
<groups>
|
<groups>
|
||||||
<hidenonprojectfiles>false</hidenonprojectfiles>
|
<hidenonprojectfiles>false</hidenonprojectfiles>
|
||||||
|
|
|
@ -9,14 +9,15 @@
|
||||||
lib_LTLIBRARIES = libcelt.la
|
lib_LTLIBRARIES = libcelt.la
|
||||||
|
|
||||||
# Sources for compilation in the library
|
# Sources for compilation in the library
|
||||||
libcelt_la_SOURCES = bands.c celt.c fftwrap.c mdct.c pitch.c smallft.c vq.c
|
libcelt_la_SOURCES = bands.c celt.c cwrs.c fftwrap.c mdct.c pitch.c smallft.c \
|
||||||
|
vq.c
|
||||||
|
|
||||||
#noinst_HEADERS =
|
#noinst_HEADERS =
|
||||||
|
|
||||||
libcelt_la_LDFLAGS = -version-info @CELT_LT_CURRENT@:@CELT_LT_REVISION@:@CELT_LT_AGE@
|
libcelt_la_LDFLAGS = -version-info @CELT_LT_CURRENT@:@CELT_LT_REVISION@:@CELT_LT_AGE@
|
||||||
|
|
||||||
noinst_HEADERS = arch.h bands.h celt.h fftwrap.h mdct.h os_support.h pitch.h \
|
noinst_HEADERS = arch.h bands.h celt.h cwrs.h fftwrap.h mdct.h os_support.h \
|
||||||
smallft.h vq.h
|
pitch.h smallft.h vq.h
|
||||||
|
|
||||||
noinst_PROGRAMS = testcelt
|
noinst_PROGRAMS = testcelt
|
||||||
testcelt_SOURCES = testcelt.c
|
testcelt_SOURCES = testcelt.c
|
||||||
|
|
246
libcelt/cwrs.c
Normal file
246
libcelt/cwrs.c
Normal file
|
@ -0,0 +1,246 @@
|
||||||
|
/* (C) 2007 Timothy Terriberry
|
||||||
|
*/
|
||||||
|
/*
|
||||||
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
modification, are permitted provided that the following conditions
|
||||||
|
are met:
|
||||||
|
|
||||||
|
- Redistributions of source code must retain the above copyright
|
||||||
|
notice, this list of conditions and the following disclaimer.
|
||||||
|
|
||||||
|
- Redistributions in binary form must reproduce the above copyright
|
||||||
|
notice, this list of conditions and the following disclaimer in the
|
||||||
|
documentation and/or other materials provided with the distribution.
|
||||||
|
|
||||||
|
- Neither the name of the Xiph.org Foundation nor the names of its
|
||||||
|
contributors may be used to endorse or promote products derived from
|
||||||
|
this software without specific prior written permission.
|
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
|
||||||
|
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||||
|
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||||
|
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||||
|
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||||
|
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
/*#include <stdio.h>*/
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#include "cwrs.h"
|
||||||
|
|
||||||
|
/*Returns the numer of ways of choosing _m elements from a set of size _n with
|
||||||
|
replacement when a sign bit is needed for each unique element.*/
|
||||||
|
#if 0
|
||||||
|
static unsigned ncwrs(int _n,int _m){
|
||||||
|
static unsigned c[32][32];
|
||||||
|
if(_n<0||_m<0)return 0;
|
||||||
|
if(!c[_n][_m]){
|
||||||
|
if(_m<=0)c[_n][_m]=1;
|
||||||
|
else if(_n>0)c[_n][_m]=ncwrs(_n-1,_m)+ncwrs(_n,_m-1)+ncwrs(_n-1,_m-1);
|
||||||
|
}
|
||||||
|
return c[_n][_m];
|
||||||
|
}
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
/*Returns the greatest common divisor of _a and _b.*/
|
||||||
|
static unsigned gcd(unsigned _a,unsigned _b){
|
||||||
|
unsigned r;
|
||||||
|
while(_b){
|
||||||
|
r=_a%_b;
|
||||||
|
_a=_b;
|
||||||
|
_b=r;
|
||||||
|
}
|
||||||
|
return _a;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*Returns _a*b/_d, under the assumption that the result is an integer, avoiding
|
||||||
|
overflow.
|
||||||
|
It is assumed, but not required, that _b is smaller than _a.*/
|
||||||
|
static unsigned umuldiv(unsigned _a,unsigned _b,unsigned _d){
|
||||||
|
unsigned d;
|
||||||
|
d=gcd(_b,_d);
|
||||||
|
return (_a/(_d/d))*(_b/d);
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned ncwrs(int _n,int _m){
|
||||||
|
unsigned ret;
|
||||||
|
unsigned f;
|
||||||
|
unsigned d;
|
||||||
|
int i;
|
||||||
|
if(_n<0||_m<0)return 0;
|
||||||
|
if(_m==0)return 1;
|
||||||
|
if(_n==0)return 0;
|
||||||
|
ret=0;
|
||||||
|
f=_n;
|
||||||
|
d=1;
|
||||||
|
for(i=1;i<=_m;i++){
|
||||||
|
ret+=f*d<<i;
|
||||||
|
#if 0
|
||||||
|
f=umuldiv(f,_n-i,i+1);
|
||||||
|
d=umuldiv(d,_m-i,i);
|
||||||
|
#else
|
||||||
|
f=(f*(_n-i))/(i+1);
|
||||||
|
d=(d*(_m-i))/i;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*Returns the _i'th combination of _m elements chosen from a set of size _n
|
||||||
|
with associated sign bits.
|
||||||
|
_x: Returns the combination with elements sorted in ascending order.
|
||||||
|
_s: Returns the associated sign bits.*/
|
||||||
|
void cwrsi(int _n,int _m,unsigned _i,int *_x,int *_s){
|
||||||
|
unsigned pn;
|
||||||
|
int j;
|
||||||
|
int k;
|
||||||
|
pn=ncwrs(_n-1,_m);
|
||||||
|
for(k=j=0;k<_m;k++){
|
||||||
|
unsigned pp;
|
||||||
|
unsigned p;
|
||||||
|
unsigned t;
|
||||||
|
pp=0;
|
||||||
|
p=ncwrs(_n-j,_m-k)-pn;
|
||||||
|
if(k>0){
|
||||||
|
t=p>>1;
|
||||||
|
if(t<=_i||_s[k-1])_i+=t;
|
||||||
|
}
|
||||||
|
pn=ncwrs(_n-j-1,_m-k-1);
|
||||||
|
while(p<=_i){
|
||||||
|
pp=p;
|
||||||
|
j++;
|
||||||
|
p+=pn;
|
||||||
|
pn=ncwrs(_n-j-1,_m-k-1);
|
||||||
|
p+=pn;
|
||||||
|
}
|
||||||
|
t=p-pp>>1;
|
||||||
|
_s[k]=_i-pp>=t;
|
||||||
|
_x[k]=j;
|
||||||
|
_i-=pp;
|
||||||
|
if(_s[k])_i-=t;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*Returns the index of the given combination of _m elements chosen from a set
|
||||||
|
of size _n with associated sign bits.
|
||||||
|
_x: The combination with elements sorted in ascending order.
|
||||||
|
_s: The associated sign bits.*/
|
||||||
|
unsigned icwrs(int _n,int _m,const int *_x,const int *_s){
|
||||||
|
unsigned pn;
|
||||||
|
unsigned i;
|
||||||
|
int j;
|
||||||
|
int k;
|
||||||
|
i=0;
|
||||||
|
pn=ncwrs(_n-1,_m);
|
||||||
|
for(k=j=0;k<_m;k++){
|
||||||
|
unsigned pp;
|
||||||
|
unsigned p;
|
||||||
|
pp=0;
|
||||||
|
p=ncwrs(_n-j,_m-k)-pn;
|
||||||
|
if(k>0)p>>=1;
|
||||||
|
pn=ncwrs(_n-j-1,_m-k-1);
|
||||||
|
while(j<_x[k]){
|
||||||
|
pp=p;
|
||||||
|
j++;
|
||||||
|
p+=pn;
|
||||||
|
pn=ncwrs(_n-j-1,_m-k-1);
|
||||||
|
p+=pn;
|
||||||
|
}
|
||||||
|
i+=pp;
|
||||||
|
if((k==0||_x[k]!=_x[k-1])&&_s[k])i+=p-pp>>1;
|
||||||
|
}
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*Converts a combination _x of _m unit pulses with associated sign bits _s into
|
||||||
|
a pulse vector _y of length _n.
|
||||||
|
_y: Returns the vector of pulses.
|
||||||
|
_x: The combination with elements sorted in ascending order.
|
||||||
|
_s: The associated sign bits.*/
|
||||||
|
void comb2pulse(int _n,int _m,int *_y,const int *_x,const int *_s){
|
||||||
|
int j;
|
||||||
|
int k;
|
||||||
|
int n;
|
||||||
|
for(k=j=0;k<_m;k+=n){
|
||||||
|
for(n=1;k+n<_m&&_x[k+n]==_x[k];n++);
|
||||||
|
while(j<_x[k])_y[j++]=0;
|
||||||
|
_y[j++]=_s[k]?-n:n;
|
||||||
|
}
|
||||||
|
while(j<_n)_y[j++]=0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*Converts a pulse vector vector _y of length _n into a combination of _m unit
|
||||||
|
pulses with associated sign bits _s.
|
||||||
|
_x: Returns the combination with elements sorted in ascending order.
|
||||||
|
_s: Returns the associated sign bits.
|
||||||
|
_y: The vector of pulses, whose sum of absolute values must be _m.*/
|
||||||
|
void pulse2comb(int _n,int _m,int *_x,int *_s,const int *_y){
|
||||||
|
int j;
|
||||||
|
int k;
|
||||||
|
for(k=j=0;j<_n;j++){
|
||||||
|
if(_y[j]){
|
||||||
|
int n;
|
||||||
|
int s;
|
||||||
|
n=abs(_y[j]);
|
||||||
|
s=_y[j]<0;
|
||||||
|
for(;n-->0;k++){
|
||||||
|
_x[k]=j;
|
||||||
|
_s[k]=s;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
#define NMAX (10)
|
||||||
|
#define MMAX (9)
|
||||||
|
|
||||||
|
int main(int _argc,char **_argv){
|
||||||
|
int n;
|
||||||
|
for(n=0;n<=NMAX;n++){
|
||||||
|
int m;
|
||||||
|
for(m=0;m<=MMAX;m++){
|
||||||
|
unsigned nc;
|
||||||
|
unsigned i;
|
||||||
|
nc=ncwrs(n,m);
|
||||||
|
for(i=0;i<nc;i++){
|
||||||
|
int x[MMAX];
|
||||||
|
int s[MMAX];
|
||||||
|
int x2[MMAX];
|
||||||
|
int s2[MMAX];
|
||||||
|
int y[NMAX];
|
||||||
|
int j;
|
||||||
|
int k;
|
||||||
|
cwrsi(n,m,i,x,s);
|
||||||
|
printf("%6u of %u:",i,nc);
|
||||||
|
for(k=0;k<m;k++){
|
||||||
|
printf(" %c%i",k>0&&x[k]==x[k-1]?' ':s[k]?'-':'+',x[k]);
|
||||||
|
}
|
||||||
|
printf(" ->");
|
||||||
|
if(icwrs(n,m,x,s)!=i){
|
||||||
|
fprintf(stderr,"Combination-index mismatch.\n");
|
||||||
|
}
|
||||||
|
comb2pulse(n,m,y,x,s);
|
||||||
|
for(j=0;j<n;j++)printf(" %c%i",y[j]?y[j]<0?'-':'+':' ',abs(y[j]));
|
||||||
|
printf("\n");
|
||||||
|
pulse2comb(n,m,x2,s2,y);
|
||||||
|
for(k=0;k<m;k++)if(x[k]!=x2[k]||s[k]!=s2[k]){
|
||||||
|
fprintf(stderr,"Pulse-combination mismatch.\n");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
printf("\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
*/
|
46
libcelt/cwrs.h
Normal file
46
libcelt/cwrs.h
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
/* (C) 2007 Timothy Terriberry
|
||||||
|
*/
|
||||||
|
/*
|
||||||
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
modification, are permitted provided that the following conditions
|
||||||
|
are met:
|
||||||
|
|
||||||
|
- Redistributions of source code must retain the above copyright
|
||||||
|
notice, this list of conditions and the following disclaimer.
|
||||||
|
|
||||||
|
- Redistributions in binary form must reproduce the above copyright
|
||||||
|
notice, this list of conditions and the following disclaimer in the
|
||||||
|
documentation and/or other materials provided with the distribution.
|
||||||
|
|
||||||
|
- Neither the name of the Xiph.org Foundation nor the names of its
|
||||||
|
contributors may be used to endorse or promote products derived from
|
||||||
|
this software without specific prior written permission.
|
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
|
||||||
|
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||||
|
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||||
|
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||||
|
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||||
|
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef CWRS_H
|
||||||
|
#define CWRS_H
|
||||||
|
|
||||||
|
|
||||||
|
unsigned ncwrs(int _n,int _m);
|
||||||
|
|
||||||
|
void cwrsi(int _n,int _m,unsigned _i,int *_x,int *_s);
|
||||||
|
|
||||||
|
unsigned icwrs(int _n,int _m,const int *_x,const int *_s);
|
||||||
|
|
||||||
|
void comb2pulse(int _n,int _m,int *_y,const int *_x,const int *_s);
|
||||||
|
|
||||||
|
void pulse2comb(int _n,int _m,int *_x,int *_s,const int *_y);
|
||||||
|
|
||||||
|
#endif /* CWRS_H */
|
Loading…
Add table
Add a link
Reference in a new issue