X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=ogg_afh.c;h=2b4c100a9f32c7f1091b568680aee97598a6d7e0;hb=29335f03c2a0581cb3c88295cf9f09100048cb8d;hp=a9b07a3c676515f610dc678ad06aa5cfcbb06435;hpb=471684761a2039bbc89aa1e3c33c62de6bef86cf;p=paraslash.git

diff --git a/ogg_afh.c b/ogg_afh.c
index a9b07a3c..2b4c100a 100644
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -10,6 +10,8 @@
 #include <vorbis/codec.h>
 #include <vorbis/vorbisfile.h>
 
+#include "para.h"
+#include "afh.h"
 #include "server.h"
 #include "error.h"
 #include "string.h"
@@ -131,8 +133,11 @@ static int ogg_compute_header_len(char *map, size_t numbytes,
 	memcpy(buf, map, len);
 	ogg_sync_wrote(sync_in, (long)len);
 	ret = -E_SYNC_PAGEOUT;
-	if (ogg_sync_pageout(sync_in, &page) <= 0)
+	if (ogg_sync_pageout(sync_in, &page) <= 0) {
+		free(stream_in);
+		free(stream_out);
 		goto err1;
+	}
 	serial = ogg_page_serialno(&page);
 	ogg_stream_init(stream_in, serial);
 	ogg_stream_init(stream_out, serial);
@@ -149,7 +154,7 @@ static int ogg_compute_header_len(char *map, size_t numbytes,
 	ret = -E_VORBIS;
 	if (vorbis_synthesis_headerin(&vi, &vc, &packet) < 0)
 		goto err2;
-	PARA_INFO_LOG("channels: %i, rate: %li\n", vi.channels, vi.rate);
+	PARA_DEBUG_LOG("channels: %i, rate: %li\n", vi.channels, vi.rate);
 	ogg_stream_packetin(stream_out, &packet);
 
 	ret = ogg_sync_pageout(sync_in, &page);
@@ -173,7 +178,7 @@ static int ogg_compute_header_len(char *map, size_t numbytes,
 	afi->header_len = 0;
 	while (ogg_stream_flush(stream_out, &page))
 		afi->header_len += page.body_len + page.header_len;
-	PARA_INFO_LOG("header_len = %d\n", afi->header_len);
+	PARA_DEBUG_LOG("header_len = %d\n", afi->header_len);
 	afi->header_offset = 0;
 	ret = 1;
 err2:
@@ -224,7 +229,7 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
 	}
 	num_chunks = i - 1;
 //fi->chunk_table[i] = pos;
-	PARA_INFO_LOG("%lu chunks (%fs), max chunk: %zd, min chunk: %zd\n",
+	PARA_DEBUG_LOG("%lu chunks (%fs), max chunk: %zd, min chunk: %zd\n",
 		num_chunks, chunk_time, max_chunk_len, min);
 	return num_chunks;
 }