April 2009 - Mndiff-dev - lists.mplayerhq.hu

[mndiff]: r156 - trunk/noe/ldpc.c
by michael 24 Apr '09

24 Apr '09

Author: michael Date: Fri Apr 24 21:55:12 2009 New Revision: 156 Log: Correct indention. Modified: trunk/noe/ldpc.c Modified: trunk/noe/ldpc.c ============================================================================== --- trunk/noe/ldpc.c Fri Apr 24 21:54:49 2009 (r155) +++ trunk/noe/ldpc.c Fri Apr 24 21:55:12 2009 (r156) @@ -159,9 +159,9 @@ LDPCContext *EXT(initLDPC)(int data_len, if(i<data_len || seed>0){ while(!weight_hist[min_weight&15]) min_weight++; - do{ - y= get_random(&kiss)%parity_len; - }while(tab[y] || (row_weight[y] > min_weight + (SIZE == 2))); + do{ + y= get_random(&kiss)%parity_len; + }while(tab[y] || (row_weight[y] > min_weight + (SIZE == 2))); }else{ y= i + j - data_len; if(y >= parity_len){

1 0

[mndiff]: r155 - trunk/noe/ldpc.c
by michael 24 Apr '09

24 Apr '09

Author: michael Date: Fri Apr 24 21:54:49 2009 New Revision: 155 Log: Calculate min_weight without scaning row_weight. Modified: trunk/noe/ldpc.c Modified: trunk/noe/ldpc.c ============================================================================== --- trunk/noe/ldpc.c Fri Apr 24 21:34:11 2009 (r154) +++ trunk/noe/ldpc.c Fri Apr 24 21:54:49 2009 (r155) @@ -121,9 +121,10 @@ LDPCContext *EXT(initLDPC)(int data_len, LDPCContext *c= malloc(sizeof(LDPCContext)); int row_weight[parity_len]; KISSState kiss; - int i, j, y; + int i, j, y, min_weight; int code_len= data_len + parity_len; uint8_t tab[parity_len]; + int weight_hist[16]; if(nzc==0){ #if SIZE==2 @@ -149,15 +150,15 @@ LDPCContext *EXT(initLDPC)(int data_len, memset(row_weight, 0, sizeof(row_weight)); memset(tab, 0, parity_len); + memset(weight_hist, 0, sizeof(weight_hist)); + weight_hist[0]= parity_len; + min_weight = 0; + for(i=0; i<code_len; i++){ for(j=0; j<nzc; j++){ - int min_weight=999999; - if(i<data_len || seed>0){ - for(y=0; y<parity_len; y++){ - if(row_weight[y] < min_weight) - min_weight= row_weight[y]; - } + while(!weight_hist[min_weight&15]) + min_weight++; do{ y= get_random(&kiss)%parity_len; }while(tab[y] || (row_weight[y] > min_weight + (SIZE == 2))); @@ -171,7 +172,9 @@ LDPCContext *EXT(initLDPC)(int data_len, tab[y]=1; c->parity_matrix[i][0][j] = y; c->parity_matrix[i][1][j] = EXT(log)[get_random(&kiss)%(SIZE-1)+1]; + weight_hist[ row_weight[y]&15 ]--; row_weight[y]++; + weight_hist[ row_weight[y]&15 ]++; } for(j=0; j<nzc; j++) tab[ c->parity_matrix[i][0][j] ]= 0;

1 0

[mndiff]: r154 - trunk/noe/ldpc.c
by michael 24 Apr '09

24 Apr '09

Author: michael Date: Fri Apr 24 21:34:11 2009 New Revision: 154 Log: Rename minrow to min_weight, also a better name. Modified: trunk/noe/ldpc.c Modified: trunk/noe/ldpc.c ============================================================================== --- trunk/noe/ldpc.c Fri Apr 24 21:32:26 2009 (r153) +++ trunk/noe/ldpc.c Fri Apr 24 21:34:11 2009 (r154) @@ -151,16 +151,16 @@ LDPCContext *EXT(initLDPC)(int data_len, memset(tab, 0, parity_len); for(i=0; i<code_len; i++){ for(j=0; j<nzc; j++){ - int minrow=999999; + int min_weight=999999; if(i<data_len || seed>0){ for(y=0; y<parity_len; y++){ - if(row_weight[y] < minrow) - minrow= row_weight[y]; + if(row_weight[y] < min_weight) + min_weight= row_weight[y]; } do{ y= get_random(&kiss)%parity_len; - }while(tab[y] || (row_weight[y] > minrow + (SIZE == 2))); + }while(tab[y] || (row_weight[y] > min_weight + (SIZE == 2))); }else{ y= i + j - data_len; if(y >= parity_len){

1 0

[mndiff]: r153 - trunk/noe/ldpc.c
by michael 24 Apr '09

24 Apr '09

Author: michael Date: Fri Apr 24 21:32:26 2009 New Revision: 153 Log: Rename row to row_weight, the new name is better. Modified: trunk/noe/ldpc.c Modified: trunk/noe/ldpc.c ============================================================================== --- trunk/noe/ldpc.c Fri Apr 24 21:28:48 2009 (r152) +++ trunk/noe/ldpc.c Fri Apr 24 21:32:26 2009 (r153) @@ -119,7 +119,7 @@ static int inverse(ELEM *matrix, int wid LDPCContext *EXT(initLDPC)(int data_len, int parity_len, uint32_t seed, int nzc){ LDPCContext *c= malloc(sizeof(LDPCContext)); - int row[parity_len]; + int row_weight[parity_len]; KISSState kiss; int i, j, y; int code_len= data_len + parity_len; @@ -147,7 +147,7 @@ LDPCContext *EXT(initLDPC)(int data_len, c-> inv_matrix= malloc(parity_len*(parity_len+1) * sizeof(*c->inv_matrix)*2); //FIXME could we in theory need more space? - memset(row, 0, sizeof(row)); + memset(row_weight, 0, sizeof(row_weight)); memset(tab, 0, parity_len); for(i=0; i<code_len; i++){ for(j=0; j<nzc; j++){ @@ -155,12 +155,12 @@ LDPCContext *EXT(initLDPC)(int data_len, if(i<data_len || seed>0){ for(y=0; y<parity_len; y++){ - if(row[y] < minrow) - minrow= row[y]; + if(row_weight[y] < minrow) + minrow= row_weight[y]; } do{ y= get_random(&kiss)%parity_len; - }while(tab[y] || (row[y] > minrow + (SIZE == 2))); + }while(tab[y] || (row_weight[y] > minrow + (SIZE == 2))); }else{ y= i + j - data_len; if(y >= parity_len){ @@ -171,7 +171,7 @@ LDPCContext *EXT(initLDPC)(int data_len, tab[y]=1; c->parity_matrix[i][0][j] = y; c->parity_matrix[i][1][j] = EXT(log)[get_random(&kiss)%(SIZE-1)+1]; - row[y]++; + row_weight[y]++; } for(j=0; j<nzc; j++) tab[ c->parity_matrix[i][0][j] ]= 0;

1 0

[mndiff]: r152 - trunk/noe/ldpc.c
by michael 24 Apr '09

24 Apr '09

Author: michael Date: Fri Apr 24 21:28:48 2009 New Revision: 152 Log: Only reset the (nzc) elements of tab to 0 that have been set to 1 instead of all. Idea by Yutaka Sawada. Modified: trunk/noe/ldpc.c Modified: trunk/noe/ldpc.c ============================================================================== --- trunk/noe/ldpc.c Sun Apr 19 17:02:27 2009 (r151) +++ trunk/noe/ldpc.c Fri Apr 24 21:28:48 2009 (r152) @@ -123,6 +123,7 @@ LDPCContext *EXT(initLDPC)(int data_len, KISSState kiss; int i, j, y; int code_len= data_len + parity_len; + uint8_t tab[parity_len]; if(nzc==0){ #if SIZE==2 @@ -147,9 +148,8 @@ LDPCContext *EXT(initLDPC)(int data_len, //FIXME could we in theory need more space? memset(row, 0, sizeof(row)); + memset(tab, 0, parity_len); for(i=0; i<code_len; i++){ - uint8_t tab[parity_len]; - memset(tab, 0, parity_len); for(j=0; j<nzc; j++){ int minrow=999999; @@ -173,6 +173,8 @@ LDPCContext *EXT(initLDPC)(int data_len, c->parity_matrix[i][1][j] = EXT(log)[get_random(&kiss)%(SIZE-1)+1]; row[y]++; } + for(j=0; j<nzc; j++) + tab[ c->parity_matrix[i][0][j] ]= 0; } #if 0 for(;;){

1 0

[mndiff]: r151 - trunk/noe/ldpc.c
by michael 19 Apr '09

19 Apr '09

Author: michael Date: Sun Apr 19 17:02:27 2009 New Revision: 151 Log: Fix bug that caused col_weight to become incorrect. 2% faster test_ldpc_* Modified: trunk/noe/ldpc.c Modified: trunk/noe/ldpc.c ============================================================================== --- trunk/noe/ldpc.c Sun Apr 12 05:23:05 2009 (r150) +++ trunk/noe/ldpc.c Sun Apr 19 17:02:27 2009 (r151) @@ -86,6 +86,7 @@ static int inverse(ELEM *matrix, int wid if(matrix[m + p*width]){ logline[k ][0]= m; logline[k++][1]= EXT(log)[matrix[m + p*width]]; + col_weight[m]--; } } logline[k][0]= -1;

1 0

[mndiff]: r150 - trunk/noe/ldpc.c
by michael 12 Apr '09

12 Apr '09

Author: michael Date: Sun Apr 12 05:23:05 2009 New Revision: 150 Log: indent Modified: trunk/noe/ldpc.c Modified: trunk/noe/ldpc.c ============================================================================== --- trunk/noe/ldpc.c Sun Apr 12 05:22:04 2009 (r149) +++ trunk/noe/ldpc.c Sun Apr 12 05:23:05 2009 (r150) @@ -153,10 +153,10 @@ LDPCContext *EXT(initLDPC)(int data_len, int minrow=999999; if(i<data_len || seed>0){ - for(y=0; y<parity_len; y++){ - if(row[y] < minrow) - minrow= row[y]; - } + for(y=0; y<parity_len; y++){ + if(row[y] < minrow) + minrow= row[y]; + } do{ y= get_random(&kiss)%parity_len; }while(tab[y] || (row[y] > minrow + (SIZE == 2))); @@ -232,8 +232,8 @@ int EXT(init_matrixLDPC)(LDPCContext *c, for(j=0; j<nzc; j++){ y= c->parity_matrix[x][0][j]; if(y>=0){ - inv_matrix[i + y*2*parity_len]= EXT(exp)[c->parity_matrix[x][1][j]]; - row_weight[y]++; + inv_matrix[i + y*2*parity_len]= EXT(exp)[c->parity_matrix[x][1][j]]; + row_weight[y]++; } } col_weight[i]= nzc; @@ -278,8 +278,8 @@ int EXT(decodeLDPC)(LDPCContext *c, LDPC for(j=0; j<c->nzc; j++){ int y= c->parity_matrix[i][0][j] + c->parity_len; if(y>=c->parity_len){ - int p= -EXT(exp)[c->parity_matrix[i][1][j]]; - syndrom[y]^= p & v; + int p= -EXT(exp)[c->parity_matrix[i][1][j]]; + syndrom[y]^= p & v; } } } @@ -302,8 +302,8 @@ int EXT(decodeLDPC)(LDPCContext *c, LDPC for(j=0; j<c->nzc; j++){ int y= c->parity_matrix[i][0][j] + c->parity_len; if(y>=c->parity_len){ - int p= c->parity_matrix[i][1][j]; - syndrom[y]= sum(syndrom[y], EXT(exp)[p + v]); + int p= c->parity_matrix[i][1][j]; + syndrom[y]= sum(syndrom[y], EXT(exp)[p + v]); } } }

1 0

[mndiff]: r149 - in trunk/noe: ldpc.c ldpc.h
by michael 12 Apr '09

12 Apr '09

Author: michael Date: Sun Apr 12 05:22:04 2009 New Revision: 149 Log: Optional support for fast to encode matrixes. Modified: trunk/noe/ldpc.c trunk/noe/ldpc.h Modified: trunk/noe/ldpc.c ============================================================================== --- trunk/noe/ldpc.c Sat Apr 11 23:42:47 2009 (r148) +++ trunk/noe/ldpc.c Sun Apr 12 05:22:04 2009 (r149) @@ -34,7 +34,7 @@ #define MAX_NZC 32 typedef struct LDPCContext{ - unsigned int (*parity_matrix)[2][MAX_NZC]; + int (*parity_matrix)[2][MAX_NZC]; int (*inv_matrix)[2]; int parity_len; int data_len; @@ -151,6 +151,8 @@ LDPCContext *EXT(initLDPC)(int data_len, memset(tab, 0, parity_len); for(j=0; j<nzc; j++){ int minrow=999999; + + if(i<data_len || seed>0){ for(y=0; y<parity_len; y++){ if(row[y] < minrow) minrow= row[y]; @@ -158,6 +160,13 @@ LDPCContext *EXT(initLDPC)(int data_len, do{ y= get_random(&kiss)%parity_len; }while(tab[y] || (row[y] > minrow + (SIZE == 2))); + }else{ + y= i + j - data_len; + if(y >= parity_len){ + c->parity_matrix[i][0][j] = -1; + continue; + } + } tab[y]=1; c->parity_matrix[i][0][j] = y; c->parity_matrix[i][1][j] = EXT(log)[get_random(&kiss)%(SIZE-1)+1]; @@ -222,8 +231,10 @@ int EXT(init_matrixLDPC)(LDPCContext *c, x= erasure_pos[i]; for(j=0; j<nzc; j++){ y= c->parity_matrix[x][0][j]; + if(y>=0){ inv_matrix[i + y*2*parity_len]= EXT(exp)[c->parity_matrix[x][1][j]]; row_weight[y]++; + } } col_weight[i]= nzc; } @@ -266,8 +277,10 @@ int EXT(decodeLDPC)(LDPCContext *c, LDPC unsigned int v= code[i]; for(j=0; j<c->nzc; j++){ int y= c->parity_matrix[i][0][j] + c->parity_len; + if(y>=c->parity_len){ int p= -EXT(exp)[c->parity_matrix[i][1][j]]; syndrom[y]^= p & v; + } } } @@ -288,8 +301,10 @@ int EXT(decodeLDPC)(LDPCContext *c, LDPC unsigned int v= EXT(log)[ code[i] ]; for(j=0; j<c->nzc; j++){ int y= c->parity_matrix[i][0][j] + c->parity_len; + if(y>=c->parity_len){ int p= c->parity_matrix[i][1][j]; syndrom[y]= sum(syndrom[y], EXT(exp)[p + v]); + } } } Modified: trunk/noe/ldpc.h ============================================================================== --- trunk/noe/ldpc.h Sat Apr 11 23:42:47 2009 (r148) +++ trunk/noe/ldpc.h Sun Apr 12 05:22:04 2009 (r149) @@ -26,6 +26,8 @@ struct LDPCContext; /** * + * @param seed if 0 then a matrix will be generated that can be encoded quicker + * at the expense of worse error recovery capabilities. * @param nzc number of non zero elements per column, 0 means choose automatically. */ struct LDPCContext *EXT(initLDPC)(int data_len, int parity_len, uint32_t seed, int nzc);

1 0

[mndiff]: r148 - in trunk/noe: ldpc.c ldpc.h test_ldpc.c
by michael 11 Apr '09

11 Apr '09

Author: michael Date: Sat Apr 11 23:42:47 2009 New Revision: 148 Log: Work with 32bits at a time for GF(2) LDPC, 4x faster. Modified: trunk/noe/ldpc.c trunk/noe/ldpc.h trunk/noe/test_ldpc.c Modified: trunk/noe/ldpc.c ============================================================================== --- trunk/noe/ldpc.c Sat Apr 11 23:19:18 2009 (r147) +++ trunk/noe/ldpc.c Sat Apr 11 23:42:47 2009 (r148) @@ -35,7 +35,7 @@ typedef struct LDPCContext{ unsigned int (*parity_matrix)[2][MAX_NZC]; - GFF4Element (*inv_matrix)[2]; + int (*inv_matrix)[2]; int parity_len; int data_len; int nzc; @@ -251,11 +251,11 @@ int EXT(init_matrixLDPC)(LDPCContext *c, return rank - erasure_count; } -int EXT(decodeLDPC)(LDPCContext *c, uint8_t *code, int erasure_count, int erasure_pos[]){ +int EXT(decodeLDPC)(LDPCContext *c, LDPC_ELEM *code, int erasure_count, int erasure_pos[]){ int i,j; int parity_len= c->parity_len; int code_len= c->data_len + parity_len; - GFF4Element syndrom[2*c->parity_len]; + unsigned int syndrom[2*c->parity_len]; memset(syndrom, 0, sizeof(syndrom)); for(i=0; i<erasure_count; i++) @@ -263,7 +263,7 @@ int EXT(decodeLDPC)(LDPCContext *c, uint #if SIZE == 2 for(i=0; i<code_len; i++){ - GFF4Element v= code[i]; + unsigned int v= code[i]; for(j=0; j<c->nzc; j++){ int y= c->parity_matrix[i][0][j] + c->parity_len; int p= -EXT(exp)[c->parity_matrix[i][1][j]]; @@ -273,7 +273,7 @@ int EXT(decodeLDPC)(LDPCContext *c, uint j=0; for(i=erasure_count-1; i>=0; i--){ - GFF4Element v=0; + unsigned int v=0; int idx= c->inv_matrix[j][0]; while(idx<2*parity_len){ v^= syndrom[idx] & c->inv_matrix[j++][1]; @@ -285,7 +285,7 @@ int EXT(decodeLDPC)(LDPCContext *c, uint } #else for(i=0; i<code_len; i++){ - GFF4Element v= EXT(log)[ code[i] ]; + unsigned int v= EXT(log)[ code[i] ]; for(j=0; j<c->nzc; j++){ int y= c->parity_matrix[i][0][j] + c->parity_len; int p= c->parity_matrix[i][1][j]; @@ -298,7 +298,7 @@ int EXT(decodeLDPC)(LDPCContext *c, uint j=0; for(i=erasure_count-1; i>=0; i--){ - GFF4Element v=0; + unsigned int v=0; int idx= c->inv_matrix[j][0]; while(idx<2*parity_len){ v= sum(v, EXT(exp)[syndrom[idx] + c->inv_matrix[j++][1]]); Modified: trunk/noe/ldpc.h ============================================================================== --- trunk/noe/ldpc.h Sat Apr 11 23:19:18 2009 (r147) +++ trunk/noe/ldpc.h Sat Apr 11 23:42:47 2009 (r148) @@ -18,6 +18,12 @@ struct LDPCContext; +#if SIZE==2 + typedef uint32_t LDPC_ELEM; +#else + typedef uint8_t LDPC_ELEM; +#endif + /** * * @param nzc number of non zero elements per column, 0 means choose automatically. @@ -38,6 +44,6 @@ int EXT(init_matrixLDPC)(struct LDPCCont * @param erasure_count must match what has been passed to init_matrixLDPC * @param erasure_pos must match what has been passed to init_matrixLDPC */ -int EXT(decodeLDPC)(struct LDPCContext *c, uint8_t *code, int erasure_count, int erasure_pos[]); +int EXT(decodeLDPC)(struct LDPCContext *c, LDPC_ELEM *code, int erasure_count, int erasure_pos[]); void EXT(freeLDPC)(struct LDPCContext *c); Modified: trunk/noe/test_ldpc.c ============================================================================== --- trunk/noe/test_ldpc.c Sat Apr 11 23:19:18 2009 (r147) +++ trunk/noe/test_ldpc.c Sat Apr 11 23:42:47 2009 (r148) @@ -61,13 +61,13 @@ int main(){ for(erasure_count= reliable ? parity_len-(SIZE==2 ? 4 : 1) : parity_len*3/4; ; erasure_count--){ int fail=0; for(try=0; try<10; try++){ - uint8_t code[code_len], code_bak[code_len]; + LDPC_ELEM code[code_len], code_bak[code_len]; int erasure_pos[erasure_count]; for(i=0; i<data_len; i++) code[i]= code_bak[i]= get_random(&kiss); EXT(decodeLDPC)(enc, code, parity_len, parity_pos); - memcpy(code_bak+data_len, code+data_len, parity_len); + memcpy(code_bak+data_len, code+data_len, parity_len * sizeof(*code)); for(i=0; i<code_len; i++) if(code[i] != code_bak[i]) fprintf(stderr, "FATALXX error %X!= %X at %d\n", code[i], code_bak[i], i); @@ -76,7 +76,7 @@ int main(){ do{ x= get_random(&kiss) % code_len; }while(code[x] != code_bak[x]); - code[x]+= get_random(&kiss)%255+1; + code[x]+= get_random(&kiss)%(8*sizeof(LDPC_ELEM)-1)+1; erasure_pos[i]= x; }

1 0

[mndiff]: r147 - in trunk/noe: Makefile ldpc.c test_ldpc.c
by michael 11 Apr '09

11 Apr '09

Author: michael Date: Sat Apr 11 23:19:18 2009 New Revision: 147 Log: First try of LDPC over GF(2) Modified: trunk/noe/Makefile trunk/noe/ldpc.c trunk/noe/test_ldpc.c Modified: trunk/noe/Makefile ============================================================================== --- trunk/noe/Makefile Sat Apr 11 20:40:24 2009 (r146) +++ trunk/noe/Makefile Sat Apr 11 23:19:18 2009 (r147) @@ -20,12 +20,16 @@ CFLAGS = -g -Wall -O4 $(OPTFLAGS) -I. $ %_10001.o: %.c $(CC) $(CFLAGS) -c -DSIZE=0x10001 -o $@ $< -all: test_100 test_101 test_10001 mina test_ldpc_100 +%_2.o: %.c + $(CC) $(CFLAGS) -c -DSIZE=2 -o $@ $< + +all: test_100 test_101 test_10001 mina test_ldpc_100 test_ldpc_2 libnoe_100.a: $(LIBOBJS:.o=_100.o) ldpc_100.o libnoe_101.a: $(LIBOBJS:.o=_101.o) gfft_101.o libnoe_10001.a: $(LIBOBJS:.o=_10001.o) gfft_10001.o -libnoe_100.a libnoe_101.a libnoe_10001.a: +libnoe_2.a: galois_2.o ldpc_2.o +libnoe_100.a libnoe_101.a libnoe_10001.a libnoe_2.a: $(AR) rc $@ $^ mina: mina.o libnoe_10001.a Modified: trunk/noe/ldpc.c ============================================================================== --- trunk/noe/ldpc.c Sat Apr 11 20:40:24 2009 (r146) +++ trunk/noe/ldpc.c Sat Apr 11 23:19:18 2009 (r147) @@ -124,11 +124,16 @@ LDPCContext *EXT(initLDPC)(int data_len, int code_len= data_len + parity_len; if(nzc==0){ +#if SIZE==2 + if (parity_len < 16) nzc=3; + else nzc=5; +#else if (parity_len < 16) nzc=4; else if(parity_len < 32) nzc=5; else if(parity_len < 64) nzc=5; else if(parity_len <256) nzc=6; else nzc=6; +#endif } if(nzc > MAX_NZC || nzc > parity_len) @@ -152,7 +157,7 @@ LDPCContext *EXT(initLDPC)(int data_len, } do{ y= get_random(&kiss)%parity_len; - }while(tab[y] || (row[y] > minrow)); + }while(tab[y] || (row[y] > minrow + (SIZE == 2))); tab[y]=1; c->parity_matrix[i][0][j] = y; c->parity_matrix[i][1][j] = EXT(log)[get_random(&kiss)%(SIZE-1)+1]; @@ -232,7 +237,11 @@ int EXT(init_matrixLDPC)(LDPCContext *c, for(i=0; i<parity_len*2; i++){ if(i != j && inv_matrix[i + j*2*parity_len]){ c->inv_matrix[x ][0]= i; +#if SIZE == 2 + c->inv_matrix[x++][1]= -inv_matrix[i + j*2*parity_len]; +#else c->inv_matrix[x++][1]= EXT(log)[inv_matrix[i + j*2*parity_len]]; +#endif } } c->inv_matrix[x++][0]= 2*parity_len; @@ -252,6 +261,29 @@ int EXT(decodeLDPC)(LDPCContext *c, uint for(i=0; i<erasure_count; i++) code[ erasure_pos[i] ]= 0; +#if SIZE == 2 + for(i=0; i<code_len; i++){ + GFF4Element v= code[i]; + for(j=0; j<c->nzc; j++){ + int y= c->parity_matrix[i][0][j] + c->parity_len; + int p= -EXT(exp)[c->parity_matrix[i][1][j]]; + syndrom[y]^= p & v; + } + } + + j=0; + for(i=erasure_count-1; i>=0; i--){ + GFF4Element v=0; + int idx= c->inv_matrix[j][0]; + while(idx<2*parity_len){ + v^= syndrom[idx] & c->inv_matrix[j++][1]; + idx= c->inv_matrix[j][0]; + } + j++; + syndrom[i] = v; + code[ erasure_pos[i] ]= v; + } +#else for(i=0; i<code_len; i++){ GFF4Element v= EXT(log)[ code[i] ]; for(j=0; j<c->nzc; j++){ @@ -276,6 +308,7 @@ int EXT(decodeLDPC)(LDPCContext *c, uint syndrom[i] = EXT(log)[ v ]; code[ erasure_pos[i] ]= v; } +#endif return 0; } Modified: trunk/noe/test_ldpc.c ============================================================================== --- trunk/noe/test_ldpc.c Sat Apr 11 20:40:24 2009 (r146) +++ trunk/noe/test_ldpc.c Sat Apr 11 23:19:18 2009 (r147) @@ -58,7 +58,7 @@ int main(){ dec= EXT(initLDPC)(data_len, parity_len, seed, reliable ? 0 : 3); - for(erasure_count= reliable ? parity_len-1 : parity_len*3/4; ; erasure_count--){ + for(erasure_count= reliable ? parity_len-(SIZE==2 ? 4 : 1) : parity_len*3/4; ; erasure_count--){ int fail=0; for(try=0; try<10; try++){ uint8_t code[code_len], code_bak[code_len];

1 0