X-Git-Url: https://git.llucax.com/z.facultad/75.06/jacu.git/blobdiff_plain/fecff0df7697f3fa9351eee19c4cd30711c2b68e..2ee6f95a8db79ede018e0f15124dd486451c4170:/src/jacu.c?ds=inline diff --git a/src/jacu.c b/src/jacu.c index f0c3444..599d636 100644 --- a/src/jacu.c +++ b/src/jacu.c @@ -1,4 +1,5 @@ +/* Jacu Team - GPL */ #include "blocksorting/bs.h" #include "mtf/mtf.h" #include "zerogrouping/zerogrouping.h" @@ -83,7 +84,7 @@ int main(int argc, char* argv[]) } if ( (argc == 1) || (cflag & dflag) || !(cflag | dflag) || ((argc - optind) < 2) || (mflag & sflag)) { - fprintf(stderr, "Usage: %s [-cdzs][-q blksize][-t volsize][-m modeldumpfile] source target\n", argv[0]); + fprintf(stderr, "Usage: %s [-cdzs][-q compressionquality][-t volsize][-m modeldumpfile] source target\n", argv[0]); return (3); } if ((tflag) && (volumesize <= 0l)) { @@ -99,22 +100,29 @@ int main(int argc, char* argv[]) /* Comprimo */ FILE *fp; Uint32 i, j, total, k; - char *mtf; - char *salida, *data; - char *z; + unsigned char *mtf; + unsigned char *salida, *data; + unsigned char *z; int z_len; /* Preparo el compresor huffman */ - if ((shuff = shuff_init_encoder_bychunk(argv[optind+1],volumesize*1024)) == NULL) return 0; + if ((shuff = shuff_init_encoder_bychunk(argv[optind+1],volumesize*1024)) == NULL) return 1; if (mflag == 1) shuff_loadmodel(shuff,staticmodel); - /* Preparo el BS alocando mem para el K, el Block y su Size */ - data = malloc(sizeof(char)*pagesize); - salida = malloc(sizeof(char)*pagesize+sizeof(Uint32)*2); + /* Preparo el BS alocando mem para la Salida: V(vector) + K(colnum) */ + data = malloc(sizeof(unsigned char)*pagesize); + salida = malloc(sizeof(unsigned char)*pagesize+sizeof(Uint32)); bs = bs_create(pagesize); /* Abrimos el archivo a comprimir y encodeamos bloques */ - fp = fopen(argv[optind], "rb"); + fp = fopen(argv[optind], "rb"); + + /* Guardamos el pagesize como header (huffencoded) */ + shuff_scanfreq_chunk(shuff,(char*)&pagesize,sizeof(size_t)); + + /* Guardamos cabecera para indicar si usamos ZG (huffencoded) */ + if (zflag) shuff_scanfreq_chunk(shuff, "\001", 1); + else shuff_scanfreq_chunk(shuff, "\000", 1); total = 0; while (!feof(fp)) { @@ -127,50 +135,30 @@ int main(int argc, char* argv[]) /* Saco un EOF que lee de mas */ if (i 0) { - fread(&z_len, sizeof(int), 1, fp_in); - z = malloc(sizeof(char)*z_len); - fread(z, z_len, sizeof(char), fp_in); - - /*printf("MTF Z (len=%d) = [", z_len); - { - int ii; - for(ii=0; ii 0) { + /* Descomprimo el Zlen y el Z del MTF */ + moredata = shuff_decode_chunk(shuff,(char*)&z_len,sizeof(int),&decoded); + z = malloc(sizeof(unsigned char)*z_len); + moredata = shuff_decode_chunk(shuff,z,z_len,&decoded); + + /* Levanto una salida de MTF y le aplico MTF Inverso */ + moredata = shuff_decode_chunk(shuff,block,block_size+sizeof(Uint32),&decoded); + mtf = jacu_mtf_inv(z, block, decoded); - /* Luego de hacer el MTF inverso ya puedo recuperar el k */ + /* Ya tengo la salida del BS, tonces levanto su K */ memcpy(&k, mtf, sizeof(Uint32)); - /*printf("Restored : k=%ld\n", k);*/ - bs_restore(orig, mtf+sizeof(Uint32), k, block_size); + /* Obtengo el chunk original aplicando BS Inverso */ + bs_restore(orig, mtf+sizeof(Uint32), k, decoded - sizeof(Uint32)); - fwrite(orig, block_size, sizeof(char), fp_out); - free(block); - free(orig); + fwrite(orig, decoded - sizeof(Uint32), sizeof(unsigned char), fp_out); free(mtf); free(z); } - } - fclose(fp_in); + else return 1; + } while (moredata); + + /* Close up files and free mem */ fclose(fp_out); + free(block); + free(orig); + + /* Shutdown Huffman */ + shuff_deinit_decoder(shuff); + free(shuff); } return 0;