X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=ogg_afh.c;h=f4f375cbea76480de87838612569eaf47cd9f658;hb=ecff9e8a5b4e4c3c9fbf7f9c2f86067285d66ecc;hp=1c0c63234e0837457fc3e8e79138c11367884494;hpb=cb6d1dfb9e4067229a4bbde0abd05784d97ef14b;p=paraslash.git

diff --git a/ogg_afh.c b/ogg_afh.c
index 1c0c6323..f4f375cb 100644
--- a/ogg_afh.c
+++ b/ogg_afh.c
@@ -12,9 +12,10 @@
 
 #include "para.h"
 #include "afh.h"
-#include "server.h"
 #include "error.h"
 #include "string.h"
+#include "afs.h"
+#include "server.h"
 
 /** must be big enough to hold header */
 #define CHUNK_SIZE 32768
@@ -111,7 +112,7 @@ static int ogg_open_callbacks(void *datasource, OggVorbis_File *vf, ov_callbacks
 }
 
 static int ogg_compute_header_len(char *map, size_t numbytes,
-		struct audio_format_info *afi)
+		struct afh_info *afi)
 {
 	int ret;
 	size_t len = PARA_MIN(numbytes, CHUNK_SIZE);
@@ -133,8 +134,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);
@@ -151,7 +155,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);
@@ -175,7 +179,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:
@@ -194,7 +198,7 @@ err1:
  * CHUNK_TIME begins. Always successful.
  */
 static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
-	struct audio_format_info *afi, long unsigned time_total)
+	struct afh_info *afi, long unsigned time_total)
 {
 	int i, ret, num;
 	ssize_t max_chunk_len, pos = 0, min = 0, old_pos;
@@ -226,7 +230,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;
 }
@@ -235,7 +239,7 @@ static long unsigned ogg_compute_chunk_table(OggVorbis_File *of,
  * Init oggvorbis file and write some tech data to given pointers.
  */
 static int ogg_get_file_info(char *map, size_t numbytes,
-		struct audio_format_info *afi)
+		struct afh_info *afi)
 {
 	int ret;
 	vorbis_info *vi;
@@ -260,7 +264,7 @@ static int ogg_get_file_info(char *map, size_t numbytes,
 		goto err;
 	afi->seconds_total = ov_time_total(&of, -1);
 	afi->frequency = vi->rate;
-	afi->bitrate = ov_bitrate(&of, 0);
+	afi->bitrate = ov_bitrate(&of, 0) / 1000;
 	afi->channels = vi->channels;
 	afi->chunks_total = ogg_compute_chunk_table(&of, afi, afi->seconds_total);
 	sprintf(afi->info_string, "audio_file_info1:%lu x %lu, %ukHz, "
@@ -268,7 +272,7 @@ static int ogg_get_file_info(char *map, size_t numbytes,
 		"audio_file_info2: \n"
 		"audio_file_info3: \n",
 		afi->chunks_total, (long unsigned) (chunk_time * 1000 * 1000),
-		afi->frequency / 1000, vi->channels, afi->bitrate / 1000
+		afi->frequency / 1000, vi->channels, afi->bitrate
 		);
 	afi->chunk_tv.tv_sec = 0;
 	afi->chunk_tv.tv_usec = 250 * 1000;