From 6db8697910438fd063598f66a73b68d2dcd70a36 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 30 Jan 2020 20:17:37 +0900 Subject: Removed explicit usage of the 'register' keyword. Signed-off-by: Michele Calgaro --- mpeglib/lib/splay/dct36_12.cpp | 8 ++++---- mpeglib/lib/splay/dct64.cpp | 6 +++--- mpeglib/lib/splay/dct64_down.cpp | 8 ++++---- mpeglib/lib/splay/huffmanlookup.cpp | 2 +- mpeglib/lib/splay/mpegAudioBitWindow.cpp | 2 +- mpeglib/lib/splay/mpegAudioBitWindow.h | 8 ++++---- mpeglib/lib/splay/mpegAudioStream.h | 6 +++--- mpeglib/lib/splay/mpeglayer1.cpp | 2 +- mpeglib/lib/splay/mpeglayer2.cpp | 22 +++++++++++----------- mpeglib/lib/splay/mpeglayer3.cpp | 30 +++++++++++++++--------------- mpeglib/lib/splay/synth_Down.cpp | 8 ++++---- mpeglib/lib/splay/synth_Std.cpp | 14 +++++++------- 12 files changed, 58 insertions(+), 58 deletions(-) (limited to 'mpeglib/lib/splay') diff --git a/mpeglib/lib/splay/dct36_12.cpp b/mpeglib/lib/splay/dct36_12.cpp index b9978d7d..7c82eb3a 100644 --- a/mpeglib/lib/splay/dct36_12.cpp +++ b/mpeglib/lib/splay/dct36_12.cpp @@ -185,7 +185,7 @@ inline void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out) { { REAL in0,in1,in2,in3,in4,in5; - register REAL *pb1=prevblk1; + REAL *pb1=prevblk1; out[SBLIMIT*0]=pb1[0];out[SBLIMIT*1]=pb1[1];out[SBLIMIT*2]=pb1[2]; out[SBLIMIT*3]=pb1[3];out[SBLIMIT*4]=pb1[4];out[SBLIMIT*5]=pb1[5]; @@ -194,7 +194,7 @@ inline void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out) { { REAL tmp0,tmp1=(in0-in4); { - register REAL tmp2=(in1-in5)*hsec_12[1]; + REAL tmp2=(in1-in5)*hsec_12[1]; tmp0=tmp1+tmp2; tmp1-=tmp2; } @@ -219,7 +219,7 @@ inline void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out) { in++; { REAL in0,in1,in2,in3,in4,in5; - register REAL *pb2 = prevblk2; + REAL *pb2 = prevblk2; DCT12_PART1; @@ -252,7 +252,7 @@ inline void dct12(REAL *in,REAL *prevblk1,REAL *prevblk2,REAL *wi,REAL *out) { in++; { REAL in0,in1,in2,in3,in4,in5; - register REAL *pb2 = prevblk2; + REAL *pb2 = prevblk2; pb2[12]=pb2[13]=pb2[14]=pb2[15]=pb2[16]=pb2[17]=0.0; DCT12_PART1; diff --git a/mpeglib/lib/splay/dct64.cpp b/mpeglib/lib/splay/dct64.cpp index 14241651..889a2229 100644 --- a/mpeglib/lib/splay/dct64.cpp +++ b/mpeglib/lib/splay/dct64.cpp @@ -67,7 +67,7 @@ inline void dct64(REAL* out1,REAL* out2,REAL *fraction) { // compute new values via a fast cosine transform: { // put to buffer 0..15 - 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]; @@ -102,7 +102,7 @@ inline void dct64(REAL* out1,REAL* out2,REAL *fraction) { 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); @@ -128,7 +128,7 @@ inline void dct64(REAL* out1,REAL* out2,REAL *fraction) { { // put to buffer 16..31 - 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]); diff --git a/mpeglib/lib/splay/dct64_down.cpp b/mpeglib/lib/splay/dct64_down.cpp index 7137664c..b6b0e90b 100644 --- a/mpeglib/lib/splay/dct64_down.cpp +++ b/mpeglib/lib/splay/dct64_down.cpp @@ -64,7 +64,7 @@ inline void dct64_downsample(REAL* out1,REAL* out2,REAL *fraction) { // 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]; @@ -81,7 +81,7 @@ inline void dct64_downsample(REAL* out1,REAL* out2,REAL *fraction) { { - 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]; @@ -110,7 +110,7 @@ inline void dct64_downsample(REAL* out1,REAL* out2,REAL *fraction) { pc=qc+qd;pd=hcos_4_down*(qc-qd);pe=qe+qf;pf=hcos_4_down*(qe-qf); { - register REAL tmp; + REAL tmp; tmp=p6+p7; OUT2(36)=-(p5+tmp); @@ -135,7 +135,7 @@ inline void dct64_downsample(REAL* out1,REAL* out2,REAL *fraction) { } { - register REAL *x=fraction; + REAL *x=fraction; /* p0=hcos_64_down[ 0]*(x[ 0]-x[31]);p1=hcos_64_down[ 1]*(x[ 1]-x[30]); p2=hcos_64_down[ 2]*(x[ 2]-x[29]);p3=hcos_64_down[ 3]*(x[ 3]-x[28]); diff --git a/mpeglib/lib/splay/huffmanlookup.cpp b/mpeglib/lib/splay/huffmanlookup.cpp index cfce3c47..767dfb26 100644 --- a/mpeglib/lib/splay/huffmanlookup.cpp +++ b/mpeglib/lib/splay/huffmanlookup.cpp @@ -100,7 +100,7 @@ void HuffmanLookup::huffmandecoder_1(const HUFFMANCODETABLE *h, int *x, int *y) level>>=1; if(!(level || ((unsigned)pointtreelen))) { - register int xx,yy; + int xx,yy; xx=(h->xlen<<1);// set x and y to a medium value as a simple concealment yy=(h->ylen<<1); diff --git a/mpeglib/lib/splay/mpegAudioBitWindow.cpp b/mpeglib/lib/splay/mpegAudioBitWindow.cpp index 5e63f1fc..b31be447 100644 --- a/mpeglib/lib/splay/mpegAudioBitWindow.cpp +++ b/mpeglib/lib/splay/mpegAudioBitWindow.cpp @@ -34,7 +34,7 @@ void MpegAudioBitWindow::wrap(void) { point&=(WINDOWSIZE-1); if(p>=point) { - for(register int i=4;i>3)&(WINDOWSIZE-1)]>>(7-(bitindex&7)))&1; - //register int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1; + int r=(buffer[(bitindex>>3)&(WINDOWSIZE-1)]>>(7-(bitindex&7)))&1; + //int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1; bitindex++; return r; } // no range check version inline int getbits9_f(int bits) { - register unsigned short a; + unsigned short a; { int offset=bitindex>>3; a=(((unsigned char)buffer[offset])<<8)|((unsigned char)buffer[offset+1]); @@ -119,7 +119,7 @@ class MpegAudioBitWindow { // range check version int getbits9(int bits) { - register unsigned short a; + unsigned short a; { int offset=(bitindex>>3)&(WINDOWSIZE-1); a=(((unsigned char)buffer[offset])<<8)|((unsigned char)buffer[offset+1]); diff --git a/mpeglib/lib/splay/mpegAudioStream.h b/mpeglib/lib/splay/mpegAudioStream.h index 9e4accc3..dba02379 100644 --- a/mpeglib/lib/splay/mpegAudioStream.h +++ b/mpeglib/lib/splay/mpegAudioStream.h @@ -59,7 +59,7 @@ class MpegAudioStream { } inline int getbits9(int bits) { - register unsigned short a; + unsigned short a; { int offset=bitindex>>3; @@ -73,7 +73,7 @@ class MpegAudioStream { } inline int getbits8() { - register unsigned short a; + unsigned short a; { int offset=bitindex>>3; @@ -88,7 +88,7 @@ class MpegAudioStream { } inline int getbit() { - register int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1; + int r=(buffer[bitindex>>3]>>(7-(bitindex&7)))&1; bitindex++; return r; diff --git a/mpeglib/lib/splay/mpeglayer1.cpp b/mpeglib/lib/splay/mpeglayer1.cpp index a32951c4..2d939d9d 100644 --- a/mpeglib/lib/splay/mpeglayer1.cpp +++ b/mpeglib/lib/splay/mpeglayer1.cpp @@ -46,7 +46,7 @@ void Mpegtoraw::extractlayer1(void) int bitalloc[MAXCHANNEL][MAXSUBBAND], sample[MAXCHANNEL][MAXSUBBAND]; - register int i,j; + int i,j; int s=stereobound,l; diff --git a/mpeglib/lib/splay/mpeglayer2.cpp b/mpeglib/lib/splay/mpeglayer2.cpp index 4012ff27..1b907a07 100644 --- a/mpeglib/lib/splay/mpeglayer2.cpp +++ b/mpeglib/lib/splay/mpeglayer2.cpp @@ -86,8 +86,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>2][i]; + REAL t=scalefactor[LS][l>>2][i]; fraction[LS][0][i]*=t; fraction[LS][1][i]*=t; fraction[LS][2][i]*=t; @@ -411,7 +411,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; @@ -428,7 +428,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; diff --git a/mpeglib/lib/splay/mpeglayer3.cpp b/mpeglib/lib/splay/mpeglayer3.cpp index eeb09697..3abed128 100644 --- a/mpeglib/lib/splay/mpeglayer3.cpp +++ b/mpeglib/lib/splay/mpeglayer3.cpp @@ -337,7 +337,7 @@ void Mpegtoraw::layer3getscalefactors(int ch,int gr) {0, 1, 2, 3, 0, 1, 2, 3, 1, 2, 3, 1, 2, 3, 2, 3}}; layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]); - register layer3scalefactor *sf=(&scalefactors[ch]); + layer3scalefactor *sf=(&scalefactors[ch]); int l0,l1; { @@ -479,7 +479,7 @@ void Mpegtoraw::layer3getscalefactors_2(int ch) int sb[54]; int extendedmode=mpegAudioHeader->getExtendedmode(); layer3grinfo *gi=&(sideinfo.ch[ch].gr[0]); - register layer3scalefactor *sf=(&scalefactors[ch]); + layer3scalefactor *sf=(&scalefactors[ch]); { int blocktypenumber,sc; @@ -641,7 +641,7 @@ inline void Mpegtoraw::huffmandecoder_1(const HUFFMANCODETABLE *h,int *x,int *y) level>>=1; if(!(level || ((unsigned)pointtreelen))) { - register int xx,yy; + int xx,yy; xx=(h->xlen<<1);// set x and y to a medium value as a simple concealment yy=(h->ylen<<1); @@ -670,7 +670,7 @@ inline void Mpegtoraw::huffmandecoder_2(const HUFFMANCODETABLE *h, { if(h->val[point][0]==0) { /*end of tree*/ - register int t=h->val[point][1]; + int t=h->val[point][1]; if(t&8)*v=1-(wgetbit()<<1); else *v=0; if(t&4)*w=1-(wgetbit()<<1); else *w=0; @@ -754,7 +754,7 @@ void Mpegtoraw::layer3huffmandecode(int ch,int gr,int out[SBLIMIT][SSLIMIT]) for(i=0;is[cb+1]-sfBandIndex->s[cb])>>1; - for(register int k=0;k<3;k++) + for(int k=0;k<3;k++) { - register REAL factor; - register int count=cb_width; + REAL factor; + int count=cb_width; // maplay12 opt. if(index+(count<<1) > arrayEnd) { if (index >= arrayEnd) break; @@ -1328,7 +1328,7 @@ inline void Mpegtoraw::layer3fixtostereo(int gr,REAL in[2][SBLIMIT][SSLIMIT]) do{ if(is_pos[i]==7) { - register REAL t=in[LS][0][i]; + REAL t=in[LS][0][i]; in[LS][0][i]=(t+in[RS][0][i])*0.7071068f; in[RS][0][i]=(t-in[RS][0][i])*0.7071068f; } @@ -1358,7 +1358,7 @@ inline void Mpegtoraw::layer3fixtostereo(int gr,REAL in[2][SBLIMIT][SSLIMIT]) { int i=maxArray-1; do{ - register REAL t=in[LS][0][i]; + REAL t=in[LS][0][i]; in[LS][0][i]=(t+in[RS][0][i])*0.7071068f; in[RS][0][i]=(t-in[RS][0][i])*0.7071068f; @@ -1488,7 +1488,7 @@ void Mpegtoraw::layer3reorderandantialias(int ch,int gr, int version=mpegAudioHeader->getVersion(); int frequency=mpegAudioHeader->getFrequency(); int mpeg25=mpegAudioHeader->getLayer25(); - register layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]); + layer3grinfo *gi=&(sideinfo.ch[ch].gr[gr]); if(gi->generalflag) { if(gi->mixed_block_flag) { @@ -1591,12 +1591,12 @@ void Mpegtoraw::extractlayer3(void) { } // read main data. if(issync()) { - for(register int i=layer3slots;i>0;i--) { + for(int i=layer3slots;i>0;i--) { bitwindow.putbyte(getbyte()); } } else { // read main data. - for(register int i=layer3slots;i>0;i--) { + for(int i=layer3slots;i>0;i--) { bitwindow.putbyte(getbits8()); } } @@ -1681,13 +1681,13 @@ void Mpegtoraw::extractlayer3_2(void) { } // read main data. if(issync()) { - for(register int i=layer3slots;i>0;i--) { + for(int i=layer3slots;i>0;i--) { bitwindow.putbyte(getbyte()); } } else { // read main data. - for(register int i=layer3slots;i>0;i--) { + for(int i=layer3slots;i>0;i--) { bitwindow.putbyte(getbits8()); } } diff --git a/mpeglib/lib/splay/synth_Down.cpp b/mpeglib/lib/splay/synth_Down.cpp index fbe3887b..e5a2f2e0 100644 --- a/mpeglib/lib/splay/synth_Down.cpp +++ b/mpeglib/lib/splay/synth_Down.cpp @@ -39,8 +39,8 @@ void Synthesis::computebuffer_Down(REAL *fraction, inline void Synthesis::generatesingle_Down(void) { int i; - register REAL r, *vp; - register const REAL *dp; + REAL r, *vp; + const REAL *dp; i=32/2; dp=filter; @@ -121,8 +121,8 @@ inline void Synthesis::generate_Down(void) { int i; REAL r1,r2; - register REAL *vp1,*vp2; - register const REAL *dp; + REAL *vp1,*vp2; + const REAL *dp; dp=filter; vp1=calcbuffer[LS][currentcalcbuffer]+calcbufferoffset; diff --git a/mpeglib/lib/splay/synth_Std.cpp b/mpeglib/lib/splay/synth_Std.cpp index 6ea1d027..121e1afb 100644 --- a/mpeglib/lib/splay/synth_Std.cpp +++ b/mpeglib/lib/splay/synth_Std.cpp @@ -39,8 +39,8 @@ inline void Synthesis::computebuffer_Std(REAL *fraction, inline void Synthesis::generatesingle_Std(void) { int i; - register REAL r, *vp; - register const REAL *dp; + REAL r, *vp; + const REAL *dp; i=32; dp=filter; @@ -120,8 +120,8 @@ inline void Synthesis::generate_old(void) { int i; REAL r1,r2; - register REAL *vp1,*vp2; - register const REAL *dp; + REAL *vp1,*vp2; + const REAL *dp; dp=filter; vp1=calcbuffer[LS][currentcalcbuffer]+calcbufferoffset; @@ -195,14 +195,14 @@ inline void Synthesis::generate_Std(void) int i; REAL r1,r2; - register REAL *vp1; - register const REAL *dp; + REAL *vp1; + const REAL *dp; dp=filter; vp1=calcbuffer[LS][currentcalcbuffer]+calcbufferoffset; // we calculate cp2 from vp1 because they are both // in the same array. code was: - // register REAL* vp2 + // REAL* vp2 //vp2=calcbuffer[RS][currentcalcbuffer]+calcbufferoffset; i=32; -- cgit v1.2.3