[MN-dev] [mndiff]: r50 - in trunk/2010: 2_nag.cc 2_vc.cc
michael
subversion at mplayerhq.hu
Wed Jul 4 09:08:11 CEST 2007
Author: michael
Date: Wed Jul 4 09:08:11 2007
New Revision: 50
Log:
version from 1998-07-09 13:18
Modified:
trunk/2010/2_nag.cc
trunk/2010/2_vc.cc
Modified: trunk/2010/2_nag.cc
==============================================================================
--- trunk/2010/2_nag.cc (original)
+++ trunk/2010/2_nag.cc Wed Jul 4 09:08:11 2007
@@ -162,13 +162,13 @@ static inline int nagLineLogi2Phys(const
return phys;
}
-static inline void mod4Fix(byte * p, const int type){
+static inline void mod4Fix(byte *p, const int type){
const bool xchg[4]={false, true, false, true};
const int neg [4]={ 0, 0, -1, -1};
for(int x=0; x<(vgax<<1); x+=4){
- const byte u= p[x ]; // perhaps u><v
- const byte v= p[x+2];
+ const byte u= p[x ];
+ const byte v= p[x+2];
if(xchg[type]){
p[x ]= (v^neg[type]) - neg[type];
@@ -256,7 +256,7 @@ void nag_decrypt(void){
for(int i=0; i<256; i++)
if( fscanf(f, "%d", &keyTable[i])!=1 ) error(KeyFile);
fclose(f);
-
+
f=fopen("2010.dat", "rb");
if(f!=NULL){
int decoLines2;
@@ -529,7 +529,7 @@ void nag_decrypt(void){
int lastVType[2];
int vPhase=0;
for(int i=0; i<NAG_LINES; i++){
- if(perm[i]>=32 && mabs(perm[i]-32 - i)<5){
+ if(perm[i]>=32 && i-perm[i]<=0){
const cleMod4= (i ) & 3;
const encMod4= (perm[i]) & 3;
const type= cleMod4 ^ encMod4;
@@ -549,7 +549,7 @@ void nag_decrypt(void){
byte *lowDriftLinep= actVid2MemBufp->b; // initalize in case nothing found else PF
int firstI=0;
for(int i=0; i<NAG_LINES; i++){
- if(perm[i]>=32 && mabs(perm[i]-32 - i)<5){
+ if(perm[i]>=32 && i-perm[i]<=0){
const cleMod4= (i + vPhase ) & 3;
const encMod4= (perm[i] + vPhase ) & 3;
const type= cleMod4 ^ encMod4;
@@ -562,11 +562,11 @@ void nag_decrypt(void){
break;
}
}
-
+
for(int clearLine=0 ;clearLine<NAG_LINES; clearLine++){
byte * const linep= actVid2MemBufp->b + nagLineLogi2Phys( perm[clearLine] ) * (vgax<<1);
- if(perm[clearLine]>=32 && mabs(perm[clearLine]-32 - clearLine)<5
+ if(perm[clearLine]>=32 && clearLine-perm[clearLine]<=0
&& firstI!=clearLine){
const cleMod4= (clearLine + vPhase ) & 3;
const encMod4= (perm[clearLine] + vPhase ) & 3;
@@ -705,644 +705,5 @@ void nag_decrypt(void){
T1=T2;
}
-
-
-
-#ifdef 0
-
-
-
-
-
-
-
-
-
-
- printf("%d %d %d %d %d %d %d\n", nagStart2, nagEnd2, nagStart1, nagEnd1,
- nagSize1, nagSize2, nagSizeAll);
-
- const int corrBlock= 16000 / ( 2*( (wndx >> dwnSmpSize ) + sizeof(COEFFSLINE)) + 100);
-
- T1=uclock();
-
- char *lowRes= (char*) new double[(wndx * nagSizeAll >> dwnSmpSize)/8 + 3]; // align 8
- LINEINF *lineInf= new LINEINF [nagSizeAll];
- BLOCK *block= new BLOCK [nagSizeAll];
- COEFFSLINE *coeffsLine= new COEFFSLINE [nagSizeAll];
- SORTEDCOEFF *sortedCoeff= new SORTEDCOEFF[nagSizeAll*L_ENT];
- char *bufferInfo= new char [nagSizeAll];
-
- for(int i=0; i<nagSizeAll; i++){
- if(i<=nagSize2) bufferInfo[i]=1; // 31 free slots
- else bufferInfo[i]=int(double(i-nagSize2)/nagSize1*NAGRA_BUFFER+.5);
-// printf("%d %d\n", bufferInfo[i],i);
- }
-
- int line= ( vgax<<1 ) * nagStart1;
- int lowResLine= 0;
- int blockp;
- for(blockp=0; blockp<nagSizeAll; blockp++){
- block[blockp].end[0]=
- block[blockp].end[1]= blockp;
- block[blockp].limit[0]=
- block[blockp].limit[1]= blockp-nagSize1+1;
- block[blockp].ent= 1;
- lineInf[blockp].block= blockp;
- lineInf[blockp].next[0]=
- lineInf[blockp].next[1]= 0xFFFF;
- lineInf[blockp].nextCoeff[0]=
- lineInf[blockp].nextCoeff[1]= 0xFFFF;
-
-
- if(blockp==nagSize1) line= ( vgax<<1 ) * nagStart2;
-
- int avg;
- if(mmx){
- asm(//"int $3 \n\t"
- "pushl %%ebp \n\t"
- "cmpb (%%eax), %%cl \n\t"
- " je 5f \n\t"
- "movb %%cl, 3f-1 \n\t"
- "movb %%cl, (%%eax) \n\t"
- "movl $1, %%eax \n\t"
- "shll %%cl, %%eax \n\t"
- "movl %%eax, 4f-4 \n\t"
-
- "5: \n\t"
- "xor %%ecx, %%ecx \n\t"
-
- "1: \n\t"
- "movb (%%edi), %%al \n\t" // U load 32 byte in L1-cache
- "xorl %%ebx, %%ebx \n\t" // V 1
- "movl $0xFFFF, %%ebp \n\t" // U
- "4: \n\t"
- "xorl %%eax, %%eax \n\t" // V 1
- "2: \n\t"
- "addl %%eax, %%ebx \n\t" // U
- "xorl %%eax, %%eax \n\t" // V 1
- "movb (%%esi), %%al \n\t" // U
- "addl $2, %%esi \n\t" // V 1
- "decl %%ebp \n\t" // U
- " jnz 2b \n\t" // V 1
- "incl %%edi \n\t" // U
- "addl %%eax, %%ebx \n\t" // V 1
- "shrl $5, %%ebx \n\t" // U 1
- "3: \n\t"
- "addl %%ebx, %%ecx \n\t" // U
- "decl %%edx \n\t" // V 1
- "movb %%bl, -1(%%edi) \n\t" // U
- " jnz 1b \n\t" // V 1
-
- "popl %%ebp \n\t"
- : "=c" (avg)
- : "c" (dwnSmp), "a"(&lastDwnSmp),
- "S" (actVid2MemBufp->b + line + 1) ,
- "d" (wndx>>dwnSmp) ,
- "D" (lowRes + lowResLine)
- : "%eax", "%ebx", "%edx", "%esi", "%edi");
-
- }
- else{
- asm(//"int $3 \n\t"
- "pushl %%ebp \n\t"
- "cmpb (%%eax), %%cl \n\t"
- " je 5f \n\t"
- "movb %%cl, 3f-1 \n\t"
- "movb %%cl, (%%eax) \n\t"
- "movl $1, %%eax \n\t"
- "shll %%cl, %%eax \n\t"
- "movl %%eax, 4f-4 \n\t"
-
- "5: \n\t"
- "xor %%ecx, %%ecx \n\t"
-
-
- "1: \n\t"
- "movw (%%edi), %%ax \n\t" // U load 32 byte in L1-cache
- "xorl %%ebx, %%ebx \n\t" // V 1
- "movl $0xFFFF, %%ebp \n\t" // U
- "4: \n\t"
- "xorl %%eax, %%eax \n\t" // V 1
- "2: \n\t"
- "addl %%eax, %%ebx \n\t" // U
- "xorl %%eax, %%eax \n\t" // V 1
- "movb (%%esi), %%al \n\t" // U
- "addl $2, %%esi \n\t" // V 1
- "decl %%ebp \n\t" // U
- " jnz 2b \n\t" // V 1
- "addl $2, %%edi \n\t" // U
- "addl %%eax, %%ebx \n\t" // V 1
- "shrl $5, %%ebx \n\t" // U 1
- "3: \n\t"
- "addl %%ebx, %%ecx \n\t" // U
- "decl %%edx \n\t" // V 1
- "movw %%bx, -2(%%edi) \n\t" // U
- " jnz 1b \n\t" // V 1
-
- "popl %%ebp \n\t"
- : "=c" (avg)
- : "c" (dwnSmp), "a"(&lastDwnSmp),
- "S" (actVid2MemBufp->b + line + 1) ,
- "d" (wndx>>dwnSmp) ,
- "D" (lowRes + lowResLine)
- : "%eax", "%ebx", "%edx", "%esi", "%edi");
- }
-
- if(avg>blackThreshold)
- lineInf[blockp].state= eSingle;
- else
- lineInf[blockp].state= eBlack;
-
- line+= vgax<<2;
- lowResLine+= wndx >> dwnSmpSize;
- }
-
-
- printf("HALLO1\n");
-
- int corrLoops=0;
-
- bool first=true;
- bool didSome;
- long T_corr=0, T_radix=0, T_merge=0;
- do{
- didSome=false;
-
- /* clear coeffs */
- for(int i=0; i<nagSizeAll; i++){
- for(int j=0; j<L_ENT; j++){
- if(lineInf[i].state>=eSingle)
- coeffsLine[i].coeff[j]= DO_COEFF;
- else
- coeffsLine[i].coeff[j]= DONT_COEFF;
- coeffsLine[i].line[j]= 0xFFFF;
- }
- }
- printf("HALLOA\n");
-
- /* corr calc */
-
- int s_line0, s_line1;
- int s_linep0, s_linep1;
- int line0, line1;
- int linep0, linep1;
-
- s_linep0=0;
- for(s_line0= 0; s_line0 < nagSizeAll; s_line0 += corrBlock){
- s_linep1 = s_linep0;
-
- for(s_line1= s_line0; s_line1 < nagSizeAll; s_line1 += corrBlock){
-
- linep0 = s_linep1 - (wndx >> dwnSmpSize);
- for(line0= s_line1; line0 < min(nagSizeAll, s_line1 + corrBlock); line0++){
-
- linep0 += wndx >> dwnSmpSize;
-
- if(coeffsLine[line0].coeff[0]==DONT_COEFF) continue;
-
- if(s_line0 == s_line1){
- linep1 = linep0 + (wndx>>dwnSmpSize);
- line1 = line0 + 1;
- if(line1 >= nagSizeAll || line1 >= s_line1 + corrBlock) continue;
- }
- else{
- linep1 = s_linep0;
- line1 = s_line0;
- }
-
- asm_temp=(u_long)(coeffsLine + line0);
- asm_temp4=line0;
-
-// printf("%d %d %d %d %d %d %d %d %d\n", corrBlock, line0, line1,
-// linep0, linep1, s_line0, s_line1, s_linep0, s_linep1);
- nagra_corr(min(nagSizeAll, s_line0 + corrBlock),
- wndx >> dwnSmpSize,
- linep0,
- linep1 - (wndx >> dwnSmpSize),
- line1,
- int(coeffsLine),
- int(lowRes) );
-
- }
- s_linep1 += (wndx >> dwnSmpSize) * corrBlock;
-
- }
- s_linep0 += (wndx >> dwnSmpSize) * corrBlock;
-
- }
-
- if(mmx) asm("emms \n\t");
- printf("HALLOB\n");
-
- if(iState){
- T2=uclock();
- T_corr+=T2-T1;
- T1=T2;
- }
- // save line info ...
- /* radix sort */
- int coeffSize= 0;
- int stat[2][257];
- for(int i=0; i<257; i++){
- stat[0][i]=
- stat[1][i]=0;
- }
- for(int i=0; i<nagSizeAll; i++){
-
- for(int j=0; j<L_ENT; j++){
- if(coeffsLine[i].line[j]==0xFFFF) break;
- stat[0][ ( coeffsLine[i].coeff[j] & 0xFF ) + 1 ]++;
- stat[1][ ( (coeffsLine[i].coeff[j] >> 8) ) + 1 ]++;
- coeffSize++;
- }
-// if(coeffsLine[i].line[min(j, L_ENT-1)]==0xFFFF) continue;
-
- if(first){
- lineInf[i].nextCoeff[0]= coeffsLine[i].coeff[0]; //
- lineInf[i].nextCoeff[1]= coeffsLine[i].coeff[1]; // for line integration
- lineInf[i].next[0]= coeffsLine[i].line[0]; //
- lineInf[i].next[1]= coeffsLine[i].line[1]; //
- }
- coeffsLine[i].line[L_ENT-1]|= LAST_MASK; // mark last coeff per line
-
- }
- for(int i=2; i<256; i++){
- stat[0][i]+= stat[0][i-1];
- stat[1][i]+= stat[1][i-1];
- }
- TEMPSORT *tempSort= new TEMPSORT[coeffSize];
- for(int i=0; i<nagSizeAll; i++){
- for(int j=0; j<L_ENT; j++){
- if(coeffsLine[i].line[j]==0xFFFF) break;
- tempSort[ stat[0][ coeffsLine[i].coeff[j] & 0xFF ] ].coeff=
- coeffsLine[i].coeff[j];
- tempSort[ stat[0][ coeffsLine[i].coeff[j] & 0xFF ] ].line[0]=i;
- tempSort[ stat[0][ coeffsLine[i].coeff[j] & 0xFF ] ].line[1]=
- coeffsLine[i].line[j];
-
- stat[0][ coeffsLine[i].coeff[j] & 0xFF ]++;
- }
- }
- for(int i=0; i<coeffSize; i++){
- sortedCoeff[ stat[1][ tempSort[i].coeff >> 8 ] ].line[0]=
- tempSort[i].line[0];
- sortedCoeff[ stat[1][ tempSort[i].coeff >> 8 ] ].line[1]=
- tempSort[i].line[1];
-
- stat[1][ tempSort[i].coeff >> 8 ]++;
- }
-
- delete [] tempSort;
-
- if(iState){
- T2=uclock();
- T_radix+=T2-T1;
- T1=T2;
- }
- printf("HALLOC\n");
-
- for(int coeffp=0; coeffp<coeffSize; coeffp++){
- if( sortedCoeff[coeffp].line[0]==0xFFFF
- || sortedCoeff[coeffp].line[1]==0xFFFF ) break;
-
- int line0= sortedCoeff[coeffp].line[0];
- int line1= sortedCoeff[coeffp].line[1];
-
- STATE state0= lineInf[ line0 & (~LAST_MASK) ].state;
- STATE state1= lineInf[ line1 & (~LAST_MASK) ].state;
-
- // last_mask is saved in opposit line
- if(line0 & LAST_MASK){
- if(state1 >= eSingle) break;
- }
- if(line1 & LAST_MASK){
- if(state0 >= eSingle) break;
- }
-
- line0 &= ~LAST_MASK;
- line1 &= ~LAST_MASK;
-
- // eBlack eMiddle eSingle eEnd
- if(state0>state1){
- const STATE tempS= state0;
- state0= state1;
- state1= tempS;
- const int tempL= line0;
- line0= line1;
- line1= tempL;
- }
-
- const int block0= lineInf[ line0 ].block;
- const int block1= lineInf[ line1 ].block;
-
- if(state0==eBlack) continue;
-
- if(state0==eMiddle){
- if(state1==eSingle) continue; // fix line integration
- else continue;
- }
-
- if(line0<0 || line0>=nagSizeAll) printf("line0 %d\n", line0);
- if(line1<0 || line1>=nagSizeAll) printf("line1 %d\n", line1);
- if(block0<0 || block0>=blockp ) printf("block0 %d %d\n", block0, blockp);
- if(block1<0 || block1>=blockp ) printf("block1 %d %d\n", block1, blockp);
-
- if(block1==block0) continue;
-
- // block + line / line + line / block + block
-
- const int whichEnd[2]= { line0==block[block0].end[0] ? 0 : 1,
- line1==block[block1].end[0] ? 0 : 1 };
-
- const int limit[2]= { max(block[block0].limit[ whichEnd[0] ^ 1 ],
- block[block1].limit[ whichEnd[1] ]
- -block[block0].ent ),
- max(block[block1].limit[ whichEnd[1] ^ 1 ],
- block[block0].limit[ whichEnd[0] ]
- -block[block1].ent ) };
-
- const int ori= limit[0] < limit[1] ? 0 : 1;
-
- const int end=limit[ori] + block[block0].ent + block[block1].ent;
-
- if(end > nagSizeAll)
- continue;
-
- const int start=min( block[block0].limit[0],
- block[block1].limit[0] );
-
- int slots=0;
- {
- int i;
- for(i=start; i<end; i++){
- if( i >= block[block0].limit[0]
- && i < block[block0].limit[0] + block[block0].ent) slots++;
- if( i >= block[block1].limit[0]
- && i < block[block1].limit[0] + block[block1].ent) slots++;
- if( i >= limit[ori] && i < end ) slots--;
- if(i>=0 && bufferInfo[i] + slots > NAGRA_BUFFER) break;
- }
- if(i<end) continue;
- }
-
- // from here merge is certain
-
- for(int i=start; i<end; i++){
- if( i >= block[block0].limit[0]
- && i < block[block0].limit[0] + block[block0].ent) slots++;
- if( i >= block[block1].limit[0]
- && i < block[block1].limit[0] + block[block1].ent) slots++;
- if( i >= limit[ori] && i < end ) slots--;
- if(i>=0) bufferInfo[i]+= slots;
- }
-
- const int newBlock= min(block0, block1);
- const int freeBlock= max(block0, block1);
-
- lineInf[ line0 ].next[1] = lineInf[ line0 ].next[0];
- lineInf[ line1 ].next[1] = lineInf[ line1 ].next[0];
-
- lineInf[ line0 ].next[0] = line1;
- lineInf[ line1 ].next[0] = line0;
-
- lineInf[ line0 ].state=
- lineInf[ line1 ].state= eMiddle;
-
- const int oriBlock[2]= { ori==0 ? block0 : block1,
- ori==0 ? block1 : block0 };
-
- BLOCK temp;
- temp.end[0]= block[ oriBlock[0] ].end[ whichEnd[ori ] ^ 1 ];
- temp.end[1]= block[ oriBlock[1] ].end[ whichEnd[ori ^ 1] ^ 1 ];
-
- lineInf[ temp.end[0] ].state=
- lineInf[ temp.end[1] ].state= eEnd;
-
- lineInf[ temp.end[0] ].block=
- lineInf[ temp.end[1] ].block= newBlock;
-
- temp.ent= block[block0].ent + block[block1].ent;
- temp.limit[0]= limit[ori ];
- temp.limit[1]= limit[ori ^ 1];
-
- block[newBlock]= temp;
-
- blockp--;
- if(freeBlock != blockp){
- block[freeBlock]= block[blockp];
- lineInf[ block[freeBlock].end[0] ].block= freeBlock;
- lineInf[ block[freeBlock].end[1] ].block= freeBlock;
- }
-
- didSome= true;
-
- }
- printf("HALLOD\n");
-
- if(iState){
- T2=uclock();
- T_merge+=T2-T1;
- T1=T2;
- }
-
- corrLoops++;
- first= false;
- }while(didSome==true);
-
- printf("blockp %d\n", blockp);
-
- if(iState){
- sprintf(textbuf[0],"%f Corr", (float)(T_corr)/UCLOCKS_PER_SEC);
- sprintf(textbuf[1],"%f Radix Sort", (float)(T_radix)/UCLOCKS_PER_SEC);
- sprintf(textbuf[2],"%f Block Handling", (float)(T_merge)/UCLOCKS_PER_SEC);
- T2=uclock();
- T1=T2;
- }
- printf("HALLO2\n");
-
-
- if(iState){
- T2=uclock();
- sprintf(textbuf[3],"%f Stat", (float)(T2-T1)/UCLOCKS_PER_SEC);
- T1=T2;
- }
-
- qsort(block, blockp, sizeof(BLOCK), qsort_block);
-
- if(iState){
- T2=uclock();
- sprintf(textbuf[4],"%f Sort", (float)(T2-T1)/UCLOCKS_PER_SEC);
- T1=T2;
- }
-
- int forwVec[outy];
- int bakwVec[outy];
-
- for(int i=0; i<outy; i++){
- forwVec[i]=
- bakwVec[i]=-1;
- }
-
- int ordLine=0;
- for(int i=0; i<blockp; i++){
- int line= block[i].end[0];
- int linePrev=-3;
- int trueLine;
- for(int j=0; j<block[i].ent; j++){
-// printf(" %d %d\n", i, line);
- if(lineInf[line].next[0] == linePrev){
- linePrev=line;
- line= lineInf[line].next[1];
- }
- else{
- linePrev=line;
- line= lineInf[line].next[0];
- }
- if(linePrev < nagSize1) trueLine=( linePrev <<1) + nagStart1;
- else trueLine=((linePrev-nagSize1)<<1) + nagStart2;
-
- if(forwVec[trueLine] != -1) printf("fatal forw %d\n", trueLine);
- if(bakwVec[ordLine ] != -1) printf("fatal bakw %d\n", ordLine);
-
- forwVec[trueLine] = ordLine;
- bakwVec[ordLine ] = trueLine;
-
- if(wndy == outy) ordLine +=2;
- else ordLine ++;
- }
- }
- printf("HALLO3\n");
-
- if(iState){
- T2=uclock();
- sprintf(textbuf[5],"%f Built Vecs", (float)(T2-T1)/UCLOCKS_PER_SEC);
- T1=T2;
- }
-
- // fix stuff below (old)
- byte copy_buff[max_x<<1];
-
- for(int i=0; i<outy; i++){
- if(bakwVec[i] == -1 || bakwVec[i] == i) continue;
- int k;
- int j=i;
- do{
- k = j;
- j = forwVec[j];
- } while(j != i && j != -1);
- const int open= ( (j == -1) ? 1 : 0 );
-
- if(open == 0){
- memcpy(copy_buff, actVid2MemBufp->cl + i * vgax, wndx << 1);
- j = i;
- do{
- k = j;
- j = bakwVec[j];
- forwVec[k] = k;
- bakwVec[k] = k;
-// printf("closed %d %d\n", j, k );
- if(j != i) memcpy(actVid2MemBufp->cl + k * vgax, actVid2MemBufp->cl + j * vgax, wndx << 1);
- } while(j != i);
- memcpy(actVid2MemBufp->cl + k * vgax, copy_buff, wndx << 1);
- }
- else{
- j = k;
- do{
- k = j;
- j = bakwVec[j];
- forwVec[k] = k;
- bakwVec[k] = k;
-// printf("open %d %d\n", j, k );
- if(j != -1) memcpy(actVid2MemBufp->cl + k * vgax, actVid2MemBufp->cl + j * vgax, wndx << 1);
- } while(j != -1);
- }
-
- }
-
- if(outy == wndy){
- for(int i=0; i<outy; i+=2){
- memcpy(actVid2MemBufp->cl + (i+1) * vgax, actVid2MemBufp->cl + i * vgax, wndx << 1);
- }
- }
-
-/*
- linep=0;
- for(line=0; line<yresst1; line++){
- linep+=vgax<<1;
- int allnor=0;
- int allinv=0;
- for(i=0; i<wndx; i+=2){
- register int x=actVid2MemBufp->b[ linep + (i<<1) - (vgax<<1) + 2 ];
- register int y=actVid2MemBufp->b[ linep + (i<<1) + 2 ];
- if(x>127) x-=256;
- if(y>127) y-=256;
- allnor+=mabs(x-y);
- allinv+=mabs(x+y);
- }
- if(allinv < allnor){
- actVid2MemBufp->cl[line * vgax + 4 ].lum=255;
- actVid2MemBufp->cl[line * vgax + 5 ].lum=0;
- for(i=0; i<wndx; i+=2){
- register int x=actVid2MemBufp->b[ linep + (i<<1) + 2 ];
- if(x>127) x-=256;
- actVid2MemBufp->b[ 2 + linep + (i<<1) ]=char(-x);
- }
- }
-
- }
- printf("HALLO4\n");
-
- linep=0;
- for(line=0; line<yresst1; line++){
- linep+=vgax<<1;
- int allnor=0;
- int allinv=0;
- for(i=0; i<wndx; i+=2){
- register int x=actVid2MemBufp->b[ linep + (i<<1) - (vgax<<1) ];
- register int y=actVid2MemBufp->b[ linep + (i<<1) ];
- if(x>127) x-=256;
- if(y>127) y-=256;
- allnor+=mabs(x-y);
- allinv+=mabs(x+y);
- }
- if(allinv < allnor){
- actVid2MemBufp->cl[line * vgax + 6 ].lum=255;
- actVid2MemBufp->cl[line * vgax + 7 ].lum=0;
- for(i=0; i<wndx; i+=2){
- register int x=actVid2MemBufp->b[ linep + (i<<1) ];
- if(x>127) x-=256;
- actVid2MemBufp->b[ linep + (i<<1) ]=char(-x);
- }
- }
-
- }
-*/
-
- line=0;
- int block_noblack= blockp;
- for(int i=0; i<blockp; i++){
-// printf("%d %d %d\n", i, block[i].up_limit, block[i].avg);
- line+= block[i].ent;
-
- actVid2MemBufp->cl[line * vgax ].lum=255;
- actVid2MemBufp->cl[line * vgax + 1 ].lum=0;
- if(lineInf[ block[i].end[0] ].state == 0){
- actVid2MemBufp->cl[line * vgax + 2 ].lum=255;
- actVid2MemBufp->cl[line * vgax + 3 ].lum=0;
- block_noblack--;
- }
- }
-
-
- delete [] lowRes;
- delete [] block;
- delete [] lineInf;
- delete [] coeffsLine;
- delete [] sortedCoeff;
- delete [] bufferInfo;
-
-#endif
-
}
Modified: trunk/2010/2_vc.cc
==============================================================================
--- trunk/2010/2_vc.cc (original)
+++ trunk/2010/2_vc.cc Wed Jul 4 09:08:11 2007
@@ -49,7 +49,7 @@ void vc_decrypt(void){
long alg1=0, alg2=0, alg3=0;
color c;
- show_points=1;
+// show_points=1;
const int vc_endx=wndx;
const int vc_startx=int(double(22-scales_x+3)/double(768-scales_x+scalee_x)*wndx);
More information about the Mndiff-dev
mailing list