}
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)) {
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 */
+ /* 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)*2);
+ 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)) {
/* Saco un EOF que lee de mas */
if (i<pagesize) i--;
- /* Aplico el BlockSorting */
+ /* Aplico BS guardando su resultado + el K en salida */
bs_solve(data, salida, bs, &k, i);
- /* Le aplico el MTF, salteo el tamaño del bloque para que no se pierda. */
- mtf = jacu_mtf(salida+sizeof(Uint32), i+sizeof(Uint32), &z, &z_len);
+ /* Le aplico el MTF a salida */
+ mtf = jacu_mtf(salida, i+sizeof(Uint32), &z, &z_len);
+
+ /* Guardo el z_len y el Z */
+ shuff_scanfreq_chunk(shuff,(char*)&z_len,sizeof(int));
+ shuff_scanfreq_chunk(shuff,z,z_len);
/* Si me lo piden, aplico ZG. */
if (zflag) {
size_t len;
char buff[2];
+ Uint32 total_size = i + sizeof(Uint32);
ZG zg;
zg_init(&zg);
- /* TODO HACER LO MISMO QUE EN EL ELSE XXX */
- for (j = 0; j < i; ++j)
- if ((len = zg_group(&zg, buff, mtf[j]))) shuff_scanfreq_chunk(shuff,buff,len);
+ /* Guardo la salida del MTF con ceros agrupados (ZG) */
+ for (j = 0; j < total_size; ++j)
+ if ((len = zg_group(&zg, buff, mtf[j])))
+ shuff_scanfreq_chunk(shuff, buff, len);
} else {
- /* Guardo el PageSize */
- shuff_scanfreq_chunk(shuff,salida,sizeof(Uint32));
-
- /* Guardo el Z len y el Z */
- shuff_scanfreq_chunk(shuff,(char*)&z_len,sizeof(int));
- shuff_scanfreq_chunk(shuff,z,z_len);
-
- /* Guardo la salida del MTF */
- shuff_scanfreq_chunk(shuff,mtf,i+sizeof(Uint32));
+ /* Comprimo la salida del MTF */
+ shuff_scanfreq_chunk(shuff,mtf,i+sizeof(Uint32));
}
free(mtf);
free(z);
/* Descomprimo */
FILE *fp_out;
/*FILE *fp_in;*/
- Uint32 block_size, k;
+ Uint32 block_size = 0, k;
unsigned char *block, *mtf, *orig;
unsigned char *z;
int z_len,moredata = 0,decoded = 0;
+ char use_zg;
/* Inicializo el descompresor */
if ((shuff = shuff_init_decoder(argv[optind],NULL)) == NULL) return 1;
/* Abrimos el archivo de salida */
fp_out = fopen(argv[optind+1], "wb");
+
+ /* Descomprimo primero que nada el pagesize utilizado para comprimir */
+ if (!(moredata = shuff_decode_chunk(shuff,(char*)&block_size,sizeof(Uint32),&decoded))) return 1;
+
+ /* Descomprimo byte que indica si se usa ZG */
+ if (!(moredata = shuff_decode_chunk(shuff, &use_zg, 1, &decoded))) return 1;
+
+ /* Creo buffers */
+ block = malloc(block_size*sizeof(unsigned char)+sizeof(Uint32));
+ orig = malloc(block_size*sizeof(unsigned char));
/* Descomprimimos de a chunks segun convenga */
- do {
- block_size = 0;
- moredata = shuff_decode_chunk(shuff,(char*)&block_size,sizeof(Uint32),&decoded);
+ do {
if (block_size > 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);
-
- block = malloc(block_size*sizeof(unsigned char)+sizeof(Uint32));
- orig = malloc(block_size*sizeof(unsigned char));
+ 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);
- mtf = jacu_mtf_inv(z, block, block_size*sizeof(unsigned char)+sizeof(Uint32));
-
- /* 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(unsigned char), fp_out);
- free(block);
- free(orig);
+ fwrite(orig, decoded - sizeof(Uint32), sizeof(unsigned char), fp_out);
free(mtf);
free(z);
}
+ else return 1;
} while (moredata);
- /* Close up files */
+ /* Close up files and free mem */
fclose(fp_out);
+ free(block);
+ free(orig);
/* Shutdown Huffman */
shuff_deinit_decoder(shuff);
projects / z.facultad / 75.06 / jacu.git / blobdiff