X-Git-Url: https://git.llucax.com/z.facultad/75.06/jacu.git/blobdiff_plain/ade05bc64de4853d99cdc1ea2657845728614f03..fda048987789cf1bcf067115a593042af5ade502:/src/statichuff/statichuff.c

diff --git a/src/statichuff/statichuff.c b/src/statichuff/statichuff.c
index 32b3e8d..908729b 100644
--- a/src/statichuff/statichuff.c
+++ b/src/statichuff/statichuff.c
@@ -1,6 +1,5 @@
 
 #include "statichuff.h"
-#include "../vfile/vfile.h"
 #include <stdlib.h>
 
 void putbit(char bit, char restart, char flush, VFILE *fp)
@@ -79,7 +78,10 @@ int shuff_scanfreq_chunk(HUFF_STATE *chunkshuff, char* chunk, int chunksize)
 		/* Si llegue al tope de freq acumulada, halve em */
 		if (chunkshuff->sumfreq == 14930352) 
 			chunkshuff->sumfreq = shuff_rescalefreq(chunkshuff->freqtable);
-	}		
+	}
+	
+	/* Dumpeamos el chunk en el temporal homero */
+	fwrite(chunk,chunksize,1,chunkshuff->coderfp);
 		
 	return 1;
 }
@@ -231,7 +233,8 @@ int shuff_encode_symbols(HUFF_STATE *shuff, SHUFFCODE *ctable)
 	char bit;
 	SHUFFCODE symbolcode;
 		
-	/* Abrimos el file */
+	/* Abrimos el source y el destino */
+	if (shuff->coderfp != NULL) fclose(shuff->coderfp); /* close bychunk temp file */
 	if ((fpsource = fopen(shuff->sourcefile,"r")) == NULL) return 0;
 	if ((fpdest = vfopen(shuff->targetfile,"w",shuff->volsize)) == NULL) return 0;
 		
@@ -263,101 +266,20 @@ int shuff_encode_symbols(HUFF_STATE *shuff, SHUFFCODE *ctable)
 	return 1;	
 }
 
-int shuff_encode_chunk(HUFF_STATE *chunkshuff, char *chunk, int chunksize, int process)
-{
-	int i;
-	
-	if (!process) {
-		/* Scaneo las frecuencias de este chunk */
-		shuff_scanfreq_chunk(chunkshuff,chunk,chunksize);
-	}
-	else {		
-		/* Ya tengo la tabla y el archivo temporal, paso al huffman by file */		
-		return 0;
-	}
-	
-	return 1; 
-}
-
-HUFF_STATE *shuff_init_static_byfile(char *inputfile, char *outputfile, long volsize)
-{
-	/* Locals */
-	HUFF_STATE *fshuff = (HUFF_STATE*)malloc(sizeof(HUFF_STATE));			
-	int i;
-	
-	/* Inicializo la estructura para trabajar con Huff Static by File */
-	fshuff->tmpfp = NULL;
-	fshuff->sourcefile = (char*)malloc(sizeof(char)*(strlen(inputfile)+1));
-	fshuff->targetfile = (char*)malloc(sizeof(char)*(strlen(outputfile)+1));
-	strcpy(fshuff->sourcefile,inputfile);	
-	strcpy(fshuff->targetfile,outputfile);
-	fshuff->preloadfreq = 0;
-	fshuff->volsize = volsize;
-	fshuff->sumfreq = 0;
-	fshuff->freqtable = (t_freq*)malloc(sizeof(t_freq)*256);
-	for (i = 0; i < 256; ++i) fshuff->freqtable[i] = 0;		
-	
-	return fshuff;
-}
-
-HUFF_STATE *shuff_init_static_bychunk(char *outputfile, long volsize)
-{
-	/* Locals */
-	HUFF_STATE *cshuff = (HUFF_STATE*)malloc(sizeof(HUFF_STATE));		
-	FILE *fp;
-	int i;
-	
-	/* Inicializo la estructura para trabajar con Huff Static by Chunks */
-	cshuff->sourcefile = (char*)malloc(sizeof(char)*(strlen(outputfile)+2));
-	cshuff->targetfile = (char*)malloc(sizeof(char)*(strlen(outputfile)+1));
-	strcpy(cshuff->targetfile,outputfile);	
-	strcpy(cshuff->sourcefile,outputfile);
-	strcat(cshuff->sourcefile,"~");	
-	cshuff->volsize = volsize;
-	cshuff->preloadfreq = 1;	
-	cshuff->sumfreq = 0;
-	cshuff->freqtable = (t_freq*)malloc(sizeof(t_freq)*256);
-	for (i = 0; i < 256; ++i) cshuff->freqtable[i] = 0;		
-	
-	/* Abrimos un archivo temporal para ir tirando los chunks */	
-	if ((cshuff->tmpfp = fopen(cshuff->sourcefile,"w")) == NULL) return NULL;	
-
-	return cshuff;
-}
-
-void shuff_deinit_static_byfile(HUFF_STATE *fshuff)
-{
-	/* Libero mallocs y cierro archivos */
-	free(fshuff->freqtable);
-	free(fshuff->sourcefile);
-	free(fshuff->targetfile);		
-}
-
-void shuff_deinit_static_bychunk(HUFF_STATE *cshuff)
-{
-	/* Libero mallocs y cierro archivos */
-	free(cshuff->freqtable);
-	free(cshuff->sourcefile);
-	free(cshuff->targetfile);
-	fclose(cshuff->tmpfp);
-}
-
 int shuff_encode_file(HUFF_STATE *shuff)
 {
-	/* Locals */	
-	SHUFFNODE *codetree;
+	/* Locals */		
 	SHUFFCODE *codetable = (SHUFFCODE*)malloc(sizeof(SHUFFCODE)*256);
-	int i;
 	
 	/* Veo si debo armar una freqtable o si esta preloaded */
 	if (!shuff->preloadfreq) if (!shuff_scanfreq(shuff->sourcefile,shuff->freqtable)) return 0;
 	
 	/* Genero el arbol de huffman */
-	codetree = shuff_buildtree(shuff->freqtable);
+	shuff->codetree = shuff_buildtree(shuff->freqtable);
 
 	/* Armo la tabla de codigos prefijos para el encoder */
 	shuff_zerocodes(codetable);
-	shuff_buildcodes(codetable,codetree,0,0);
+	shuff_buildcodes(codetable,shuff->codetree,0,0);
 	/*shuff_printcodes(codetable,shuff->freqtable);*/
 
 	/* Encodeo byte per byte */
@@ -366,8 +288,6 @@ int shuff_encode_file(HUFF_STATE *shuff)
 	/* Free up memory baby yeah */	
 	free(codetable);
 	
-	/* Destruyo el arbol recursivamente TODO */
-	
 	return 1;
 }
 
@@ -388,45 +308,169 @@ SHUFFNODE *shuff_decode_symbols(SHUFFNODE *entrynode, unsigned long int buffer,
 	else return shuff_decode_symbols(entrynode->rchild,buffer,bitsleft,symbol);
 }
 
+int shuff_decode_chunk(HUFF_STATE *shuff, char *chunk, int chunksize, int *decodedbytes)
+{
+	SHUFFNODE *currnode = shuff->codetree;	
+	unsigned short int decoded_symbol;	
+	*decodedbytes = 0;
+	
+	while (!vfeof(shuff->decoderfp) && (shuff->bytesleft > 0) && (*decodedbytes < chunksize)) {
+		
+		/* Leo un buffer de 32 bits si es que quedo vacio el anterior */
+		if (shuff->bitsleft == 0) {
+			if (vfread(&(shuff->codebuffer),sizeof(unsigned long int),1,shuff->decoderfp) != 1) continue;
+			shuff->bitsleft = sizeof(unsigned long int) * 8;
+		}
+		
+		/* Proceso el buffer sacando simbolos till se me agote el buffer, file o chunk */
+		while ((shuff->bitsleft > 0) && (shuff->bytesleft > 0) && (*decodedbytes < chunksize)) {	
+			currnode = shuff_decode_symbols(currnode,shuff->codebuffer,&(shuff->bitsleft),&decoded_symbol);
+			/* Si obtuve un symbolo valido lo emito*/
+			if (decoded_symbol != 256) {				
+				chunk[(*decodedbytes)++] = decoded_symbol;
+				currnode = shuff->codetree;				
+				--(shuff->bytesleft);
+			}						
+		}		
+	}
+	
+	if (shuff->bytesleft == 0) return 0;
+	else return 1;
+}
+
 int shuff_decode_file(HUFF_STATE *shuff)
 {	
-	SHUFFNODE *codetree,*currnode;	
-	unsigned long int bytesleft,codebuffer;
-	VFILE *fpsource;
+	SHUFFNODE *currnode;	
+	unsigned long int codebuffer;	
 	FILE *fpdest;
 	unsigned short int decoded_symbol;
-	int bitsleft,freqcount = 0;	
+	int bitsleft;	
 	
-	/* Levanto cuantos bytes decodeo y la freq table */
-	if ((fpsource = vfopen(shuff->sourcefile,"r",0)) == NULL) return 0;
-	if ((fpdest = fopen(shuff->targetfile,"w")) == NULL) return 0;
-	vfread(&bytesleft,sizeof(unsigned long int),1,fpsource);
-	vfread(shuff->freqtable,sizeof(unsigned long int),256,fpsource);		
-	codetree = shuff_buildtree(shuff->freqtable);
-	currnode = codetree;
+	/* Comienzo a decodificar, pues la tabla ya la levante en el decinit */
+	if ((fpdest = fopen(shuff->targetfile,"w")) == NULL) return 0;	
+	currnode = shuff->codetree;
 	
-	while (!vfeof(fpsource) && (bytesleft > 0)) {
+	while (!vfeof(shuff->decoderfp) && (shuff->bytesleft > 0)) {
 		
 		/* Leo un buffer de 32 bits */
-		if (vfread(&codebuffer,sizeof(unsigned long int),1,fpsource) != 1) continue;
+		if (vfread(&codebuffer,sizeof(unsigned long int),1,shuff->decoderfp) != 1) continue;
 		bitsleft = sizeof(unsigned long int) * 8;
 		
 		/* Proceso el buffer sacando simbolos hasta que se me agote */
-		while ((bitsleft > 0) && (bytesleft > 0)) {	
+		while ((bitsleft > 0) && (shuff->bytesleft > 0)) {	
 			currnode = shuff_decode_symbols(currnode,codebuffer,&bitsleft,&decoded_symbol);
 			/* Si obtuve un symbolo valido lo emito*/
 			if (decoded_symbol != 256) {
 				fputc(decoded_symbol,fpdest);
-				currnode = codetree;
-				--bytesleft;				
+				currnode = shuff->codetree;
+				--(shuff->bytesleft);
 			}						
 		}		
 	}
-		
-	vfclose(fpsource);
-	fclose(fpdest);
-	
-	/* Libero el arbol recursivamente TODO */	
+			
+	/* Close destination */
+	fclose(fpdest);	
 	
 	return 1;
 }
+
+HUFF_STATE *shuff_init_decoder(char *inputfile, char *outputfile)
+{
+	/* Locals */
+	HUFF_STATE *shuff = (HUFF_STATE*)malloc(sizeof(HUFF_STATE));			
+	shuff->freqtable = (t_freq*)malloc(sizeof(t_freq)*256);	
+	
+	/* Init fields */
+	shuff->codebuffer = 0;
+	shuff->bitsleft = 0;
+	shuff->coderfp = NULL;
+	shuff->targetfile = NULL;
+	shuff->sourcefile = (char*)malloc(sizeof(char)*(strlen(inputfile)+1));
+	strcpy(shuff->sourcefile,inputfile);
+	if (outputfile != NULL) {
+		shuff->targetfile = (char*)malloc(sizeof(char)*(strlen(outputfile)+1));
+		strcpy(shuff->targetfile,outputfile);
+	}	
+	
+	/* Levanto cuantos bytes decodeo y la freq table */
+	if ((shuff->decoderfp = vfopen(shuff->sourcefile,"r",0)) == NULL) return 0;	
+	vfread(&(shuff->bytesleft),sizeof(unsigned long int),1,shuff->decoderfp);
+	vfread(shuff->freqtable,sizeof(unsigned long int),256,shuff->decoderfp);		
+	shuff->codetree = shuff_buildtree(shuff->freqtable);
+	
+	return shuff;
+}
+
+HUFF_STATE *shuff_init_encoder_byfile(char *inputfile, char *outputfile, long volsize)
+{
+	/* Locals */
+	HUFF_STATE *fshuff = (HUFF_STATE*)malloc(sizeof(HUFF_STATE));			
+	int i;
+	
+	/* Inicializo la estructura para trabajar con Huff Static by File */
+	fshuff->coderfp = NULL;	
+	fshuff->decoderfp = NULL;	
+	fshuff->sourcefile = (char*)malloc(sizeof(char)*(strlen(inputfile)+1));
+	fshuff->targetfile = (char*)malloc(sizeof(char)*(strlen(outputfile)+1));
+	strcpy(fshuff->sourcefile,inputfile);	
+	strcpy(fshuff->targetfile,outputfile);
+	fshuff->volsize = volsize;
+	fshuff->preloadfreq = 0;	
+	fshuff->freqtable = (t_freq*)malloc(sizeof(t_freq)*256);
+	for (i = 0; i < 256; ++i) fshuff->freqtable[i] = 0;	
+	fshuff->sumfreq = 0;		
+	fshuff->bytesleft = 0;
+	fshuff->codetree = NULL;
+	
+	return fshuff;
+}
+
+HUFF_STATE *shuff_init_encoder_bychunk(char *outputfile, long volsize)
+{
+	/* Locals */
+	HUFF_STATE *cshuff = (HUFF_STATE*)malloc(sizeof(HUFF_STATE));			
+	int i;
+	
+	/* Inicializo la estructura para trabajar con Huff Static by Chunks */	
+	cshuff->decoderfp = NULL;
+	cshuff->sourcefile = (char*)malloc(sizeof(char)*(strlen(outputfile)+2));
+	cshuff->targetfile = (char*)malloc(sizeof(char)*(strlen(outputfile)+1));
+	strcpy(cshuff->targetfile,outputfile);	
+	strcpy(cshuff->sourcefile,outputfile);
+	strcat(cshuff->sourcefile,"~");	
+	cshuff->volsize = volsize;
+	cshuff->preloadfreq = 1;		
+	cshuff->freqtable = (t_freq*)malloc(sizeof(t_freq)*256);	
+	for (i = 0; i < 256; ++i) cshuff->freqtable[i] = 0;	
+	cshuff->sumfreq = 0;
+	cshuff->bytesleft = 0;
+	cshuff->codetree = NULL;
+	
+	/* Abrimos un archivo temporal para ir tirando los chunks */	
+	if ((cshuff->coderfp = fopen(cshuff->sourcefile,"w")) == NULL) return NULL;	
+
+	return cshuff;
+}
+
+void shuff_deinit_encoder(HUFF_STATE *shuff)
+{
+	/* Libero mallocs y cierro archivos */
+	free(shuff->freqtable);	
+	if (shuff->coderfp != NULL) fclose(shuff->coderfp);
+	if (shuff->preloadfreq == 1) unlink(shuff->sourcefile);
+	if (shuff->targetfile != NULL) free(shuff->targetfile);			
+	free(shuff->sourcefile);	
+	
+	/* Destruyo recursivamente el arbol de codigos */
+}
+
+void shuff_deinit_decoder(HUFF_STATE *shuff)
+{
+	/* Libero mallocs y cierro archivos */	
+	free(shuff->freqtable);
+	free(shuff->sourcefile);
+	if (shuff->targetfile != NULL) free(shuff->targetfile);
+	if (shuff->decoderfp != NULL) vfclose(shuff->decoderfp);
+		
+	/* Destruyo recursivamente el arbol de codigos */
+}