#include <stdio.h>
#include <unistd.h>
-long get_file_size(const char* filename);
+long fsize(const char* filename);
+
+/* Flags del archivo comprimido */
+#define FLAGS_ZG 0x1
+#define FLAGS_WS 0x2
+#define FLAGS_RESERVED_1 0x4
+#define FLAGS_RESERVED_2 0x8
+#define FLAGS_RESERVED_3 0x16
+#define FLAGS_RESERVED_4 0x64
+#define FLAGS_RESERVED_5 0x128
+#define FLAGS_RESERVED_6 0x255
+
+typedef struct _flags_ {
+ int cflag;
+ int dflag;
+ int zflag;
+ int tflag;
+ int qflag;
+ int sflag;
+ int mflag;
+ int rflag; /* Richard Dictionary :-) */
+} t_Flags;
+
+int comprimir(char *src, char *dst, Uint32 pagesize, Uint32 volumesize, t_Flags *flags, char *staticmodel);
+int descomprimir(char *src, char *dst);
+
+char is_flags_on(unsigned char flags, unsigned char flag)
+{
+ return (flags & flag);
+}
+
+char flag_on(unsigned char flags, unsigned char flag)
+{
+ return (flags | flag);
+}
+
+char flag_off(unsigned char flags, unsigned char flag)
+{
+ return (flags & (~flag));
+}
int main(int argc, char* argv[])
{
- int cflag = 0;
- int dflag = 0;
- int zflag = 0;
- int tflag = 0;
- int qflag = 0;
- int sflag = 0;
- int mflag = 0;
long int volumesize = 0;
- size_t pagesize = 32768; /* 32KB */
+ Uint32 pagesize = 32768; /* 32KB */
int ch;
- t_BlockSort *bs;
- HUFF_STATE *shuff;
+ t_Flags flags;
char *staticmodel = NULL;
- while ((ch = getopt(argc, argv, "scdzm:t:q:")) != -1) {
+ memset(&flags, 0, sizeof(t_Flags));
+
+ while ((ch = getopt(argc, argv, "rscdzm:t:q:")) != -1) {
switch (ch) {
- case 'c': cflag = 1;
+ case 'c': flags.cflag = 1;
break;
- case 'd': dflag = 1;
+ case 'd': flags.dflag = 1;
break;
- case 'z': zflag = 1;
+ case 'z': flags.zflag = 1;
break;
- case 'm': mflag = 1;
+ case 'm': flags.mflag = 1;
staticmodel = optarg;
break;
- case 's': sflag = 1;
+ case 's': flags.sflag = 1;
break;
- case 't': tflag = 1;
+ case 't': flags.tflag = 1;
volumesize = atol(optarg);
break;
- case 'q': qflag = 1;
+ case 'r': flags.rflag = 1;
+ break;
+ case 'q': flags.qflag = 1;
switch (atoi(optarg))
{
case 0: pagesize = 1024; /* 1K */
}
break;
- default: fprintf(stderr, "Usage: %s [-cdzs][-q blksize][-t volsize][-m modeldumpfile] source target\n", argv[0]);
+ default: fprintf(stderr, "Usage: %s [-cdzsr][-q blksize][-t volsize][-m modeldumpfile] source target\n", argv[0]);
return(2);
}
}
- if ( (argc == 1) || (cflag & dflag) || !(cflag | dflag) || ((argc - optind) < 2) || (mflag & sflag)) {
- fprintf(stderr, "Usage: %s [-cdzs][-q compressionquality][-t volsize][-m modeldumpfile] source target\n", argv[0]);
+ if ( (argc == 1) || (flags.cflag & flags.dflag) || !(flags.cflag | flags.dflag) || ((argc - optind) < 2) || (flags.mflag & flags.sflag)) {
+ fprintf(stderr, "Usage: %s [-cdzsr][-q compressionquality][-t volsize][-m modeldumpfile] source target\n", argv[0]);
return (3);
}
- if ((tflag) && (volumesize <= 0l)) {
+ if ((flags.tflag) && (volumesize <= 0l)) {
fprintf(stderr,"Error: The volume size must be a non-zero value\n");
return (4);
}
- if ((qflag) && (pagesize <= 1u)) {
+ if ((flags.qflag) && (pagesize <= 1u)) {
fprintf(stderr,"Error: El nivel de compresión debe ser entre 0 (menor) y 9 (mayor).\n");
return (5);
}
- if (cflag == 1) {
- /* Comprimo */
- FILE *fp;
- Uint32 i, j, total, k;
- 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 1;
- if (mflag == 1) shuff_loadmodel(shuff,staticmodel);
-
- /* 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");
-
- /* 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)) {
- i = 0;
- while ((!feof(fp)) && (i < pagesize)) {
- data[i++] = fgetc(fp);
- total++;
- }
+ if (flags.cflag == 1) {
+ return comprimir(argv[optind], argv[optind+1], pagesize, volumesize, &flags, staticmodel);
+ }
+
+ if (flags.dflag == 1) {
+ return descomprimir(argv[optind], argv[optind+1]);
+ }
- /* Saco un EOF que lee de mas */
- if (i<pagesize) i--;
+ return 0;
+}
- /* Aplico BS guardando su resultado + el K en salida */
- bs_solve(data, salida, bs, &k, i);
+long fsize(const char* filename)
+{
+ FILE* file;
+ long file_size;
- /* Le aplico el MTF a salida */
- mtf = jacu_mtf(salida, i+sizeof(Uint32), &z, &z_len);
+ if (!(file = fopen(filename, "ab"))) return -1;
+ file_size = ftell(file);
+ fclose(file);
+ return file_size;
+}
- /* 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);
- /* 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 {
- /* Comprimo la salida del MTF */
- shuff_scanfreq_chunk(shuff,mtf,i+sizeof(Uint32));
- }
- free(mtf);
- free(z);
- }
+int comprimir(char *src, char *dst, Uint32 pagesize, Uint32 volumesize, t_Flags *flags, char *staticmodel)
+{
+ /* Comprimo */
+ t_BlockSort *bs;
+ HUFF_STATE *shuff;
+ FILE *fp;
+ Uint32 i, j, total, k;
+ unsigned char *mtf;
+ unsigned char *salida, *data;
+ unsigned char *z;
+ unsigned char file_flags = 0;
+ int z_len;
+
+ /* Abrimos el archivo a comprimir y encodeamos bloques */
+ if ((fp = fopen(src, "rb")) == NULL) return 1;
+
+ /* Preparo el compresor huffman */
+ if ((shuff = shuff_init_encoder_bychunk(dst, volumesize*1024)) == NULL) return 1;
+ if (flags->mflag == 1) shuff_loadmodel(shuff, staticmodel);
+
+ /* 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);
- /* Limpiando */
- fclose(fp);
- bs_destroy(bs);
+ /* Guardamos el pagesize como header (huffencoded) */
+ shuff_scanfreq_chunk(shuff,(char*)&pagesize,sizeof(Uint32));
- /* Comprimo con Huffman */
- shuff_encode_file(shuff);
- if (sflag == 1) shuff_savemodel(shuff);
- /* Shutdown Huffman */
- shuff_deinit_encoder(shuff);
- free(shuff);
+ /* Guardamos cabecera para indicar si usamos ZG (huffencoded) */
+ if (flags->zflag)
+ file_flags = flag_on(file_flags, FLAGS_ZG);
+ if (flags->rflag)
+ file_flags = flag_on(file_flags, FLAGS_WS);
- /* Muestro bpb */
- printf("Comprimido a %.04f bpb.\n", get_file_size(argv[optind+1])*8.0/get_file_size(argv[optind]));
- return 0;
- }
-
- if (dflag == 1) {
- /* Descomprimo */
- FILE *fp_out;
- /*FILE *fp_in;*/
- 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 {
- 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);
-
- /* 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);
+ shuff_scanfreq_chunk(shuff, &file_flags, 1);
- /* Ya tengo la salida del BS, tonces levanto su K */
- memcpy(&k, mtf, sizeof(Uint32));
+ total = 0;
+ while (!feof(fp)) {
+ i = 0;
+ i = bs_readblock(fp, data, pagesize, flags->rflag);
+ total += i;
- /* Obtengo el chunk original aplicando BS Inverso */
- bs_restore(orig, mtf+sizeof(Uint32), k, decoded - sizeof(Uint32));
- fwrite(orig, decoded - sizeof(Uint32), sizeof(unsigned char), fp_out);
- free(mtf);
- free(z);
- }
- else return 1;
- } while (moredata);
-
- /* Close up files and free mem */
- fclose(fp_out);
- free(block);
- free(orig);
+ /* Aplico BS guardando su resultado + el K en salida */
+ bs_solve(data, salida, bs, &k, i);
+
+ /* 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);
- /* Shutdown Huffman */
- shuff_deinit_decoder(shuff);
- free(shuff);
+ /* Si me lo piden, aplico ZG. */
+ if (flags->zflag) {
+ Uint32 len;
+ unsigned char buff[2];
+ Uint32 total_size = i + sizeof(Uint32);
+ ZG zg;
+ /* Guardo la salida del MTF con ceros agrupados (ZG) */
+ zg_init(&zg);
+ for (j = 0; j < total_size; ++j)
+ if ((len = zg_group(&zg, buff, mtf[j])))
+ shuff_scanfreq_chunk(shuff, buff, len);
+
+ /* Flusheo ultimo zgrouping */
+ if ((len = zg_group_finish(&zg,buff)))
+ shuff_scanfreq_chunk(shuff, buff, len);
+ } else {
+ /* Comprimo la salida del MTF */
+ shuff_scanfreq_chunk(shuff,mtf,i+sizeof(Uint32));
+ }
+ free(mtf);
+ free(z);
}
+ /* Limpiando */
+ if (fclose(fp)) fprintf(stderr, "Error al cerrar archivo de entrada!\n");
+ bs_destroy(bs);
+ free(data);
+ free(salida);
+
+ /* Comprimo con Huffman */
+ shuff_encode_file(shuff);
+ if (flags->sflag == 1) shuff_savemodel(shuff);
+ /* Shutdown Huffman */
+ shuff_deinit_encoder(shuff);
+ free(shuff);
+
+ /* Muestro bpb */
+ printf("%s: %.04f bits/byte.\n", dst, vfsize(dst)*8.0f/fsize(src));
return 0;
}
-long get_file_size(const char* filename)
+int descomprimir(char *src, char *dst)
{
- FILE* file;
- long file_size;
+ /* Descomprimo */
+ FILE *fp_out;
+ Uint32 block_size = 0, k;
+ unsigned char *block, *mtf, *orig;
+ unsigned char *z;
+ Uint32 z_len=0,moredata = 0,decoded = 0;
+ unsigned char file_flags = 0,retbytes = 0;
+ HUFF_STATE *shuff;
- if (!(file = fopen(filename, "ab"))) return -1;
- file_size = ftell(file);
- fclose(file);
- return file_size;
+ /* Inicializo el descompresor */
+ if ((shuff = shuff_init_decoder(src, NULL)) == NULL) return 1;
+
+ /* Abrimos el archivo de salida */
+ fp_out = fopen(dst, "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, &file_flags, 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 {
+ 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);
+
+ /* Veo si se uso Zero Grouping para comprimir */
+ if (is_flags_on(file_flags, FLAGS_ZG)) {
+ ZG zg;
+ unsigned char zgbuffer[255];
+ unsigned char zgbyte = 0;
+ int zgmoved = 0;
+ Uint32 zgungrouped = 0;
+ /* Desagrupo bytes hasta completar la pagina or End of Source File */
+ zg_init(&zg);
+ do {
+ /* Levanto un byte zerogrouped y lo paso por el zg_ungroup */
+ zgmoved = 0;
+ moredata = shuff_decode_chunk(shuff,&zgbyte,1,&decoded);
+ retbytes = zg_ungroup(&zg,zgbuffer,zgbyte);
+ /* Muevo del zgbuffer a mi bloque lo que corresponda */
+ while ((zgmoved < retbytes) && (zgungrouped < block_size+sizeof(Uint32))) {
+ block[zgungrouped++] = zgbuffer[zgmoved++];
+ }
+ } while ((moredata) && (zgungrouped < block_size+sizeof(Uint32)));
+
+ /* Me fijo si el ultimo byte procesado que me completo la pagina fue un 0 */
+ if (zgbyte == 0) {
+ /* Leo un byte mas (un 0 seguro) y zg_ungroup cambiara su estado */
+ moredata = shuff_decode_chunk(shuff,&zgbyte,1,&decoded);
+ zg_ungroup(&zg,zgbuffer,zgbyte);
+ }
+
+ /* Normalizo variables para continuar en common code */
+ decoded = zgungrouped;
+ }
+ else {
+ /* Levanto una salida de MTF */
+ moredata = shuff_decode_chunk(shuff,block,block_size+sizeof(Uint32),&decoded);
+ }
+
+ /* Le aplico MTF inverso a la salida de MTF levantada previamente */
+ mtf = jacu_mtf_inv(z, block, decoded);
+
+ /* Ya tengo la salida del BS, tonces levanto su K */
+ memcpy(&k, mtf, sizeof(Uint32));
+
+ /* Obtengo el chunk original aplicando BS Inverso */
+ bs_restore(orig, mtf+sizeof(Uint32), k, decoded - sizeof(Uint32));
+
+ decoded -= sizeof(Uint32);
+ if (is_flags_on(file_flags, FLAGS_WS)) {
+ orig = bs_finalblock(orig, decoded, &decoded);
+ }
+
+ fwrite(orig, decoded, sizeof(unsigned char), fp_out);
+ free(mtf);
+ free(z);
+ }
+ 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;
}
projects / z.facultad / 75.06 / jacu.git / blobdiff