X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=1c7fd706f0a7c9fe8c9d4d8db43846be18a9304d;hp=5b2e9fba0a2b7b50fe25b35e166f66c92973858a;hb=b52342d0b5df5446f149f0c1daf26f6e25b2aba7;hpb=0f4910b50116416fefb09ca67a615679067ef359

diff --git a/aac_afh.c b/aac_afh.c
index 5b2e9fba..1c7fd706 100644
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -15,54 +15,44 @@
 
 #include "para.h"
 #include "error.h"
+#include "portable_io.h"
 #include "afh.h"
 #include "string.h"
 #include "aac.h"
 #include "fd.h"
 
-static int aac_find_stsz(unsigned char *buf, size_t buflen, off_t *skip)
+static int aac_find_stsz(char *buf, size_t buflen, off_t *skip)
 {
 	int i;
 
 	for (i = 0; i + 16 < buflen; i++) {
-		unsigned char *p = buf + i;
+		char *p = buf + i;
 		unsigned sample_count, sample_size;
 
 		if (p[0] != 's' || p[1] != 't' || p[2] != 's' || p[3] != 'z')
 			continue;
 		PARA_DEBUG_LOG("found stsz@%d\n", i);
 		i += 8;
-		sample_size = aac_read_int32(buf + i);
-		PARA_DEBUG_LOG("sample size: %d\n", sample_size);
+		sample_size = read_u32_be(buf + i);
+		PARA_DEBUG_LOG("sample size: %u\n", sample_size);
 		i += 4;
-		sample_count = aac_read_int32(buf + i);
+		sample_count = read_u32_be(buf + i);
 		i += 4;
-		PARA_DEBUG_LOG("sample count: %d\n", sample_count);
+		PARA_DEBUG_LOG("sample count: %u\n", sample_count);
 		*skip = i;
 		return sample_count;
 	}
 	return -E_STSZ;
 }
 
-static int atom_cmp(const unsigned char *buf1, const char *buf2)
+static int atom_cmp(const char *buf1, const char *buf2)
 {
-	const unsigned char *b2 = (unsigned char *)buf2;
-
-	if (buf1[0] != b2[0])
-		return 1;
-	if (buf1[1] != b2[1])
-		return 1;
-	if (buf1[2] != b2[2])
-		return 1;
-	if (buf1[3] != b2[3])
-		return 1;
-	return 0;
+	return memcmp(buf1, buf2, 4)? 1 : 0;
 }
 
-static int read_atom_header(unsigned char *buf, uint64_t *subsize, unsigned char type[5])
+static int read_atom_header(char *buf, uint64_t *subsize, char type[5])
 {
-	int i;
-	uint64_t size = (buf[0] << 24) + (buf[1] << 16) + (buf[2] << 8) + buf[3];
+	uint64_t size = read_u32_be(buf);
 
 	memcpy(type, buf + 4, 4);
 	type[4] = '\0';
@@ -74,13 +64,12 @@ static int read_atom_header(unsigned char *buf, uint64_t *subsize, unsigned char
 	}
 	buf += 4;
 	size = 0;
-	for (i = 0; i < 8; i++)
-		size |= ((uint64_t)buf[i]) << ((7 - i) * 8);
+	size = read_u64_be(buf);
 	*subsize = size;
 	return 16;
 }
 
-static char *get_tag(unsigned char *p, int size)
+static char *get_tag(char *p, int size)
 {
 	char *buf;
 
@@ -93,12 +82,12 @@ static char *get_tag(unsigned char *p, int size)
 	return buf;
 }
 
-static void read_tags(unsigned char *buf, size_t buflen, struct afh_info *afhi)
+static void read_tags(char *buf, size_t buflen, struct afh_info *afhi)
 {
-	unsigned char *p = buf;
+	char *p = buf;
 
 	while (p + 32 < buf + buflen) {
-		unsigned char *q, type1[5], type2[5];
+		char *q, type1[5], type2[5];
 		uint64_t size1, size2;
 		int ret, ret2;
 
@@ -127,9 +116,9 @@ static void read_tags(unsigned char *buf, size_t buflen, struct afh_info *afhi)
 	}
 }
 
-static void read_meta(unsigned char *buf, size_t buflen, struct afh_info *afhi)
+static void read_meta(char *buf, size_t buflen, struct afh_info *afhi)
 {
-	unsigned char *p = buf;
+	char *p = buf;
 
 	while (p + 4 < buf + buflen) {
 
@@ -142,15 +131,14 @@ static void read_meta(unsigned char *buf, size_t buflen, struct afh_info *afhi)
 	}
 }
 
-static void aac_get_taginfo(unsigned char *buf, size_t buflen,
-		struct afh_info *afhi)
+static void aac_get_taginfo(char *buf, size_t buflen, struct afh_info *afhi)
 {
 	int i;
 	uint64_t subsize;
-	unsigned char type[5];
+	char type[5];
 
 	for (i = 0; i + 24 < buflen; i++) {
-		unsigned char *p = buf + i;
+		char *p = buf + i;
 		if (p[0] != 'm' || p[1] != 'e' || p[2] != 't' || p[3] != 'a')
 			continue;
 		PARA_INFO_LOG("found metadata at offset %d\n", i);
@@ -164,7 +152,7 @@ static void aac_get_taginfo(unsigned char *buf, size_t buflen,
 }
 
 static ssize_t aac_compute_chunk_table(struct afh_info *afhi,
-		unsigned char *map, size_t numbytes)
+		char *map, size_t numbytes)
 {
 	int ret, i;
 	size_t sum = 0;
@@ -174,12 +162,12 @@ static ssize_t aac_compute_chunk_table(struct afh_info *afhi,
 	if (ret < 0)
 		return ret;
 	afhi->chunks_total = ret;
-	PARA_DEBUG_LOG("sz table has %lu entries\n", afhi->chunks_total);
+	PARA_DEBUG_LOG("sz table has %" PRIu32 " entries\n", afhi->chunks_total);
 	afhi->chunk_table = para_malloc((afhi->chunks_total + 1) * sizeof(size_t));
 	for (i = 1; i <= afhi->chunks_total; i++) {
 		if (skip + 4 > numbytes)
 			break;
-		sum += aac_read_int32(map + skip);
+		sum += read_u32_be(map + skip);
 		afhi->chunk_table[i] = sum;
 		skip += 4;
 //		if (i < 10 || i + 10 > afhi->chunks_total)
@@ -189,7 +177,7 @@ static ssize_t aac_compute_chunk_table(struct afh_info *afhi,
 }
 
 static int aac_set_chunk_tv(struct afh_info *afhi,
-		mp4AudioSpecificConfig *mp4ASC, long unsigned *seconds)
+		mp4AudioSpecificConfig *mp4ASC, uint32_t *seconds)
 {
 	float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023;
 	struct timeval total;
@@ -200,7 +188,7 @@ static int aac_set_chunk_tv(struct afh_info *afhi,
 	ms = 1000.0 * afhi->chunks_total * tmp / mp4ASC->samplingFrequency;
 	ms2tv(ms, &total);
 	tv_divide(afhi->chunks_total, &total, &afhi->chunk_tv);
-	PARA_INFO_LOG("%luHz, %lus (%lu x %lums)\n",
+	PARA_INFO_LOG("%luHz, %lus (%" PRIu32 " x %lums)\n",
 		mp4ASC->samplingFrequency, ms / 1000,
 		afhi->chunks_total, tv2ms(&afhi->chunk_tv));
 	if (ms < 1000)
@@ -222,32 +210,33 @@ static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd,
 	unsigned char channels = 0;
 	mp4AudioSpecificConfig mp4ASC;
 	NeAACDecHandle handle = NULL;
-	unsigned char *umap = (unsigned char *) map;
 
-	ret = aac_find_esds(umap, numbytes, &skip, &decoder_len);
+	ret = aac_find_esds(map, numbytes, &skip, &decoder_len);
 	if (ret < 0)
 		goto out;
-	aac_get_taginfo(umap, numbytes, afhi);
+	aac_get_taginfo(map, numbytes, afhi);
 	handle = aac_open();
 	ret = -E_AAC_AFH_INIT;
-	if (NeAACDecInit(handle, umap + skip, decoder_len, &rate, &channels))
+	if (NeAACDecInit(handle, (unsigned char *)map + skip, decoder_len,
+			&rate, &channels))
 		goto out;
 	if (!channels)
 		goto out;
 	PARA_DEBUG_LOG("rate: %lu, channels: %d\n", rate, channels);
 	ret = -E_MP4ASC;
-	if (NeAACDecAudioSpecificConfig(umap + skip, numbytes - skip, &mp4ASC))
+	if (NeAACDecAudioSpecificConfig((unsigned char *)map + skip,
+			numbytes - skip, &mp4ASC))
 		goto out;
 	if (!mp4ASC.samplingFrequency)
 		goto out;
-	ret = aac_compute_chunk_table(afhi, umap, numbytes);
+	ret = aac_compute_chunk_table(afhi, map, numbytes);
 	if (ret < 0)
 		goto out;
 	skip = ret;
 	ret = aac_set_chunk_tv(afhi, &mp4ASC, &afhi->seconds_total);
 	if (ret < 0)
 		goto out;
-	ret = aac_find_entry_point(umap + skip, numbytes - skip, &skip);
+	ret = aac_find_entry_point(map + skip, numbytes - skip, &skip);
 	if (ret < 0)
 		goto out;
 	afhi->chunk_table[0] = ret;
@@ -327,7 +316,7 @@ close:
 	return ret;
 }
 
-static const char* aac_suffixes[] = {"m4a", "mp4", NULL};
+static const char * const aac_suffixes[] = {"m4a", "mp4", NULL};
 /**
  * the init function of the aac audio format handler
  *