shithub: aacenc

Info  •  Files  •  Log  •  Branches

Fixed bug with bitBuffer and better ADIF header writing

--- a/encoder.c

+++ b/encoder.c

@@ -547,17 +547,15 @@

 			continue;

 		}

+		bitBuffer = malloc((bitBufSize+100)*sizeof(char));

+

 		if (headerSize > 0) {

-			bitBuffer = malloc(headerSize*sizeof(char));

 			memset(bitBuffer, 0, headerSize*sizeof(char));

 			// Skip headerSize bytes

 			// They should be written after calling faacEncodeFree

 			fwrite(bitBuffer, 1, headerSize, aacfile);

-			if (bitBuffer) { free(bitBuffer); bitBuffer = NULL; }

 		}

-		bitBuffer = malloc(bitBufSize*sizeof(char));

-

 		cfr = 0;

 		// Keep encoding frames until the end of the audio file

@@ -592,8 +590,6 @@

 		sf_close(sndfile);

-		fclose(aacfile);

-

 		error = faacEncodeFree(as, bitBuffer);

 		if (error == FERROR) {

 			printf("Error while encoding %s.\n", FileNames[i]);

@@ -602,11 +598,11 @@

 		// Write the header to the beginning of the file now

 		if (headerSize > 0) {

-			aacfile = fopen(aac_fn, "rb+");

+			fseek(aacfile, 0, SEEK_SET);

 			fwrite(bitBuffer, 1, headerSize, aacfile);

-			fclose(aacfile);

 		}

+		fclose(aacfile);

 		if (bitBuffer) { free(bitBuffer); bitBuffer = NULL; }

 #ifdef WIN32