"completo" descompresor ... se pierde todos los datos :-/

[z.facultad/75.06/jacu.git] / src / jacu.c

diff --git a/src/jacu.c b/src/jacu.c
index 3d18ed3be44af85c1c97ae75db13ec99fe6283ff..ee98a059412c87a1e3c7b66b2ee8b9fd5d5c0d15 100644 (file)
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -1,16 +1,20 @@
 
 

-#include "statichuff/statichuff.h"

 #include "blocksorting/bs.h"
 #include "mtf/mtf.h"
 #include "blocksorting/bs.h"
 #include "mtf/mtf.h"

+#include "zerogrouping/zerogrouping.h"
+#include "statichuff/statichuff.h"

 #include "vfile/vfile.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 
 #include "vfile/vfile.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 

+long get_file_size(const char* filename);
+

 int main(int argc, char* argv[])
 {      
        int cflag = 0;
        int dflag = 0;
 int main(int argc, char* argv[])
 {      
        int cflag = 0;
        int dflag = 0;

+       int zflag = 0;

        int tflag = 0;
        int pflag = 0;
        long int volumesize = 0;
        int tflag = 0;
        int pflag = 0;
        long int volumesize = 0;


@@ -18,7 +22,7 @@ int main(int argc, char* argv[])
        int ch;
        t_BlockSort *bs;
                        
        int ch;
        t_BlockSort *bs;
                        

-       while ((ch = getopt(argc, argv, "cdt:p:")) != -1) { 
+       while ((ch = getopt(argc, argv, "cdzt:p:")) != -1) { 

                 
                switch (ch) { 
                        case 'c': cflag = 1; 
                 
                switch (ch) { 
                        case 'c': cflag = 1; 


@@ -27,6 +31,9 @@ int main(int argc, char* argv[])
                        case 'd': dflag = 1; 
                                          break; 
 
                        case 'd': dflag = 1; 
                                          break; 
 

+                       case 'z': zflag = 1; 
+                                         break; 
+

                        case 't': tflag = 1; 
                                          volumesize = atol(optarg);
                                          break; 
                        case 't': tflag = 1; 
                                          volumesize = atol(optarg);
                                          break; 


@@ -57,12 +64,15 @@ int main(int argc, char* argv[])
                /* Comprimo */
                /* No me gusta el tmpfile ... es para probar como anda todo junto */
                FILE *fp, *fp_out;
                /* Comprimo */
                /* No me gusta el tmpfile ... es para probar como anda todo junto */
                FILE *fp, *fp_out;

-               unsigned long int i, j, total, k;
+               Uint32 i, j, total, k;

                char *mtf;
                char *salida, *data, c;
                char *mtf;
                char *salida, *data, c;

+               char *z;
+               int z_len;
+

                data = malloc(sizeof(char)*pagesize);
                /* Reservo lugar tambien para guardar el k y el tamaño  */
                data = malloc(sizeof(char)*pagesize);
                /* Reservo lugar tambien para guardar el k y el tamaño  */

-               salida = malloc(sizeof(char)*(pagesize)+sizeof(unsigned long int)*2);
+               salida = malloc(sizeof(char)*(pagesize)+sizeof(Uint32)*2);

                bs = bs_create(pagesize);
 
                fp = fopen(argv[optind], "rb");
                bs = bs_create(pagesize);
 
                fp = fopen(argv[optind], "rb");


@@ -82,10 +92,32 @@ int main(int argc, char* argv[])
                        bs_solve(data, salida, bs, &k, i);
 
                        /* Le aplico el MTF, salteo el tamaño del bloque para que no se pierda. */
                        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(unsigned long int), i+sizeof(unsigned long int));
-                       for(j=0; j<i; j++)
-                               fputc(mtf[j], fp_out);
+                       mtf = jacu_mtf(salida+sizeof(Uint32), i+sizeof(Uint32), &z, &z_len);
+
+                       /* Si me lo piden, aplico ZG. */
+                       if (zflag) {
+                               size_t len;
+                               char buff[2];
+                               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]))) fwrite(buff, 1, len, fp_out);
+                       } else {
+                               /* Guardo el PageSize */
+                               for(j=0; j<sizeof(Uint32); j++)
+                                       fputc(mtf[j], fp_out);
+
+                               /* Guardo el Z len y el Z */
+                               fwrite(&z_len, sizeof(int), 1, fp_out);
+                               fwrite(z, z_len, sizeof(char), fp_out);
+
+                               /* Guardo la salida del MTF */
+                               for(j=sizeof(Uint32); j<i; j++)
+                                       fputc(mtf[j], fp_out);
+                       }

                        free(mtf);
                        free(mtf);

+                       free(z);

                }
 
                /* Limpiando */
                }
 
                /* Limpiando */


@@ -98,34 +130,42 @@ int main(int argc, char* argv[])
 
                /* borro el temporal */
                unlink("tmp.comp");
 
                /* borro el temporal */
                unlink("tmp.comp");

+
+               /* Muestro bpb */
+               printf("Comprimido a %.04f bpb.\n", get_file_size(argv[optind+1])*8.0/get_file_size(argv[optind]));

                return i;
        }
        
        if (dflag == 1) { 
                /* Descomprimo */
                FILE *fp_out;
                return i;
        }
        
        if (dflag == 1) { 
                /* Descomprimo */
                FILE *fp_out;

-               VFILE *fp_in;
-               unsigned long int block_size, k;
+               FILE *fp_in;
+               Uint32 block_size, k;

                char *block, *mtf, *orig;
                char *block, *mtf, *orig;

-               int *pos;
+               char *z;
+               int z_len;

 
                shuff_decode_file(argv[optind], "tmp.comp"); /*argv[optind+1]);*/
 
                shuff_decode_file(argv[optind], "tmp.comp"); /*argv[optind+1]);*/

-               fp_in = vfopen("tmp.comp", "r", 0);
+               fp_in = fopen("tmp.comp", "rb");

                fp_out = fopen(argv[optind+1], "wb");
 
                fp_out = fopen(argv[optind+1], "wb");
 

-               while (!vfeof(fp_in)) {
+               while (!feof(fp_in)) {

                        block_size = 0;
                        block_size = 0;

-                       vfread(&block_size, sizeof(unsigned long int), 1, fp_in);
+                       fread(&block_size, sizeof(Uint32), 1, fp_in);
+                       fread(&z_len, sizeof(int), 1, fp_in);
+                       z = malloc(sizeof(char)*z_len);
+                       fread(z, z_len, sizeof(char), fp_in);
+

                        if (block_size > 0) {
                        if (block_size > 0) {

-                               block = malloc((block_size+sizeof(unsigned long int))*sizeof(char));
+                               block = malloc(block_size*sizeof(char)+sizeof(Uint32));

                                orig = malloc(block_size*sizeof(char));
                                orig = malloc(block_size*sizeof(char));

-                               vfread(block, block_size, sizeof(char), fp_in);
+                               fread(block, block_size, sizeof(char), fp_in);

 
 

-                               mtf = jacu_mtf_inv(block, /*XXX NO LO TENGO XXX */pos, block_size);
+                               mtf = jacu_mtf_inv(z, block, block_size);

 
 

-                               memcpy(&k, block, sizeof(unsigned long int));
+                               memcpy(&k, block, sizeof(Uint32));

 
 

-                               bs_restore(orig, block+sizeof(unsigned long int), k, block_size);
+                               bs_restore(orig, block+sizeof(Uint32), k, block_size);

 
                                fwrite(orig, block_size, sizeof(char), fp_out);
                                free(block);
 
                                fwrite(orig, block_size, sizeof(char), fp_out);
                                free(block);


@@ -133,9 +173,21 @@ int main(int argc, char* argv[])
                                free(mtf);
                        }
                }
                                free(mtf);
                        }
                }

-               vfclose(fp_in);
+               fclose(fp_in);

                fclose(fp_out);
        }
 
        return 0;
 }
                fclose(fp_out);
        }
 
        return 0;
 }

+
+long get_file_size(const char* filename)
+{
+       FILE* file;
+       long  file_size;
+
+       if (!(file = fopen(filename, "ab"))) return -1;
+       file_size = ftell(file);
+       fclose(file);
+       return file_size;
+}
+