X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=76b2849d8be26fa7db071c11655e62249c06f0bd;hp=85bad6d98ce8eb80c0d35ba3d1d4cbdce8e5fdc3;hb=54a480aef5bd11e922c3c2339bb207334c170df8;hpb=77960b7b4c6e5b03c5ef2fe897c5e00395b9ae15

diff --git a/aac_afh.c b/aac_afh.c
index 85bad6d9..76b2849d 100644
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -11,10 +11,11 @@
 /** \file aac_afh.c para_server's aac audio format handler */
 
 #include "para.h"
-#include "afh.h"
-#include "server.h"
 #include "error.h"
 #include "string.h"
+#include "afh.h"
+#include "afs.h"
+#include "server.h"
 #include "aac.h"
 
 static int aac_find_stsz(unsigned char *buf, size_t buflen, off_t *skip)
@@ -27,14 +28,14 @@ static int aac_find_stsz(unsigned char *buf, size_t buflen, off_t *skip)
 
 		if (p[0] != 's' || p[1] != 't' || p[2] != 's' || p[3] != 'z')
 			continue;
-		PARA_INFO_LOG("found stsz@%d\n", i);
+		PARA_DEBUG_LOG("found stsz@%d\n", i);
 		i += 8;
 		sample_size = aac_read_int32(buf + i);
-		PARA_INFO_LOG("sample size: %d\n", sample_size);
+		PARA_DEBUG_LOG("sample size: %d\n", sample_size);
 		i += 4;
 		sample_count = aac_read_int32(buf + i);
 		i += 4;
-		PARA_INFO_LOG("sample count: %d\n", sample_count);
+		PARA_DEBUG_LOG("sample count: %d\n", sample_count);
 		*skip = i;
 		return sample_count;
 	}
@@ -52,7 +53,7 @@ static ssize_t aac_compute_chunk_table(struct audio_format_info *afi,
 	if (ret < 0)
 		return ret;
 	afi->chunks_total = ret;
-	PARA_INFO_LOG("sz table has %lu entries\n", afi->chunks_total);
+	PARA_DEBUG_LOG("sz table has %lu entries\n", afi->chunks_total);
 	afi->chunk_table = para_malloc((afi->chunks_total + 1) * sizeof(size_t));
 	for (i = 1; i <= afi->chunks_total; i++) {
 		if (skip + 4 > numbytes)
@@ -112,7 +113,7 @@ static int aac_get_file_info(char *map, size_t numbytes,
 		goto out;
 	if (!channels)
 		goto out;
-	PARA_INFO_LOG("rate: %lu, channels: %d\n", rate, channels);
+	PARA_DEBUG_LOG("rate: %lu, channels: %d\n", rate, channels);
 	ret = -E_MP4ASC;
 	if (NeAACDecAudioSpecificConfig(umap + skip, numbytes - skip, &mp4ASC))
 		goto out;