Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions mpegsound/filter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ void Mpegtoraw::computebuffer(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])

// compute new values via a fast cosine transform:
{
register REAL *x=fraction;
REAL *x=fraction;

p0=x[ 0]+x[31];p1=x[ 1]+x[30];p2=x[ 2]+x[29];p3=x[ 3]+x[28];
p4=x[ 4]+x[27];p5=x[ 5]+x[26];p6=x[ 6]+x[25];p7=x[ 7]+x[24];
Expand Down Expand Up @@ -59,7 +59,7 @@ void Mpegtoraw::computebuffer(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
pc=qc+qd;pd=hcos_4*(qc-qd);pe=qe+qf;pf=hcos_4*(qe-qf);

{
register REAL tmp;
REAL tmp;

tmp=p6+p7;
OUT2(36)=-(p5+tmp);
Expand All @@ -84,7 +84,7 @@ void Mpegtoraw::computebuffer(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
}

{
register REAL *x=fraction;
REAL *x=fraction;

p0=hcos_64[ 0]*(x[ 0]-x[31]);p1=hcos_64[ 1]*(x[ 1]-x[30]);
p2=hcos_64[ 2]*(x[ 2]-x[29]);p3=hcos_64[ 3]*(x[ 3]-x[28]);
Expand Down Expand Up @@ -165,8 +165,8 @@ void Mpegtoraw::computebuffer(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
inline void Mpegtoraw::generatesingle(void)
{
int i;
register REAL r, *vp;
register const REAL *dp;
REAL r, *vp;
const REAL *dp;
int raw;

i=32;
Expand Down Expand Up @@ -251,8 +251,8 @@ inline void Mpegtoraw::generate(void)
{
int i;
REAL r1,r2;
register REAL *vp1,*vp2;
register const REAL *dp;
REAL *vp1,*vp2;
const REAL *dp;
int raw;

dp=filter;
Expand Down
16 changes: 8 additions & 8 deletions mpegsound/filter_2.cc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ void Mpegtoraw::computebuffer_2(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])

// compute new values via a fast cosine transform:
/* {
register REAL *x=fraction;
REAL *x=fraction;

p0=x[ 0]+x[31];p1=x[ 1]+x[30];p2=x[ 2]+x[29];p3=x[ 3]+x[28];
p4=x[ 4]+x[27];p5=x[ 5]+x[26];p6=x[ 6]+x[25];p7=x[ 7]+x[24];
Expand All @@ -41,7 +41,7 @@ void Mpegtoraw::computebuffer_2(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
qe=hcos_32[6]*(p6-p9);qf=hcos_32[7]*(p7-p8); */

{
register REAL *x=fraction;
REAL *x=fraction;

q0=x[ 0]+x[15];q1=x[ 1]+x[14];q2=x[ 2]+x[13];q3=x[ 3]+x[12];
q4=x[ 4]+x[11];q5=x[ 5]+x[10];q6=x[ 6]+x[ 9];q7=x[ 7]+x[ 8];
Expand Down Expand Up @@ -70,7 +70,7 @@ void Mpegtoraw::computebuffer_2(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
pc=qc+qd;pd=hcos_4*(qc-qd);pe=qe+qf;pf=hcos_4*(qe-qf);

{
register REAL tmp;
REAL tmp;

tmp=p6+p7;
OUT2(36)=-(p5+tmp);
Expand All @@ -95,7 +95,7 @@ void Mpegtoraw::computebuffer_2(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
}

{
register REAL *x=fraction;
REAL *x=fraction;

/* p0=hcos_64[ 0]*(x[ 0]-x[31]);p1=hcos_64[ 1]*(x[ 1]-x[30]);
p2=hcos_64[ 2]*(x[ 2]-x[29]);p3=hcos_64[ 3]*(x[ 3]-x[28]);
Expand Down Expand Up @@ -186,8 +186,8 @@ void Mpegtoraw::computebuffer_2(REAL *fraction,REAL buffer[2][CALCBUFFERSIZE])
inline void Mpegtoraw::generatesingle_2(void)
{
int i;
register REAL r, *vp;
register const REAL *dp;
REAL r, *vp;
const REAL *dp;
int raw;

i=32/2;
Expand Down Expand Up @@ -273,8 +273,8 @@ inline void Mpegtoraw::generate_2(void)
{
int i;
REAL r1,r2;
register REAL *vp1,*vp2;
register const REAL *dp;
REAL *vp1,*vp2;
const REAL *dp;
int raw;

dp=filter;
Expand Down
2 changes: 1 addition & 1 deletion mpegsound/mpeglayer1.cc
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void Mpegtoraw::extractlayer1(void)
int bitalloc[MAXCHANNEL][MAXSUBBAND],
sample[MAXCHANNEL][MAXSUBBAND];

register int i,j;
int i,j;
int s=stereobound,l;


Expand Down
22 changes: 11 additions & 11 deletions mpegsound/mpeglayer2.cc
Original file line number Diff line number Diff line change
Expand Up @@ -429,8 +429,8 @@ void Mpegtoraw::extractlayer2(void)

// Bitalloc
{
register int i;
register const int *t=bitalloclengthtable[tableindex];
int i;
const int *t=bitalloclengthtable[tableindex];

for(i=0;i<s;i++,t++)
{
Expand All @@ -444,18 +444,18 @@ void Mpegtoraw::extractlayer2(void)

// Scale selector
if(inputstereo)
for(register int i=0;i<n;i++)
for(int i=0;i<n;i++)
{
if(bitalloc[LS][i])scaleselector[LS][i]=getbits(2);
if(bitalloc[RS][i])scaleselector[RS][i]=getbits(2);
}
else
for(register int i=0;i<n;i++)
for(int i=0;i<n;i++)
if(bitalloc[LS][i])scaleselector[LS][i]=getbits(2);

// Scale index
{
register int i,j;
int i,j;

for(i=0;i<n;i++)
{
Expand Down Expand Up @@ -600,7 +600,7 @@ void Mpegtoraw::extractlayer2(void)

// Read Sample
{
register int i;
int i;

for(int l=0;l<SCALEBLOCK;l++)
{
Expand All @@ -611,7 +611,7 @@ void Mpegtoraw::extractlayer2(void)
{
if(group[LS][i])
{
register const REAL *s;
const REAL *s;
int code=getbits(codelength[LS][i]);

code+=code<<1;
Expand Down Expand Up @@ -666,7 +666,7 @@ void Mpegtoraw::extractlayer2(void)
{
if(group[LS][i])
{
register const REAL *s;
const REAL *s;
int code=getbits(codelength[LS][i]);

code+=code<<1;
Expand Down Expand Up @@ -705,7 +705,7 @@ void Mpegtoraw::extractlayer2(void)
fraction[LS][2][i]=(fraction[LS][2][i]+d[LS][i])*c[LS][i];
}

register REAL t=scalefactor[LS][l>>2][i];
REAL t=scalefactor[LS][l>>2][i];
fraction[LS][0][i]*=t;
fraction[LS][1][i]*=t;
fraction[LS][2][i]*=t;
Expand All @@ -720,7 +720,7 @@ void Mpegtoraw::extractlayer2(void)
fraction[RS][2][i]=(fraction[RS][2][i]+d[RS][i])*c[LS][i];
}

register REAL t=scalefactor[RS][l>>2][i];
REAL t=scalefactor[RS][l>>2][i];
fraction[RS][0][i]*=t;
fraction[RS][1][i]*=t;
fraction[RS][2][i]*=t;
Expand All @@ -737,7 +737,7 @@ void Mpegtoraw::extractlayer2(void)
fraction[LS][2][i]=(fraction[LS][2][i]+d[LS][i])*c[LS][i];
}

register REAL t=scalefactor[LS][l>>2][i];
REAL t=scalefactor[LS][l>>2][i];
fraction[LS][0][i]*=t;
fraction[LS][1][i]*=t;
fraction[LS][2][i]*=t;
Expand Down
Loading