X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aac_afh.c;h=c2daf5b533ca881990963618fbd2c488468f58ce;hb=bf00c9051afa0011129cef89107ada198e8da8af;hp=2b3dd2cc538a57a233813b77adcb332bd77929ce;hpb=5349f35b026544d410feba55c846ac39e80de9ad;p=paraslash.git

diff --git a/aac_afh.c b/aac_afh.c
index 2b3dd2cc..c2daf5b5 100644
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -10,11 +10,7 @@
 #include <neaacdec.h>
 
 #include "para.h"
-
-/* To get the mp4ff_tag_t and mp4ff_metadata_t typedefs. */
-#define USE_TAGGING
-#include <mp4ff.h>
-
+#include "mp4.h"
 #include "error.h"
 #include "portable_io.h"
 #include "afh.h"
@@ -35,17 +31,13 @@ struct aac_afh_context {
 static uint32_t aac_afh_read_cb(void *user_data, void *dest, uint32_t want)
 {
 	struct aac_afh_context *c = user_data;
-	uint32_t have, rv;
+	size_t have, rv;
 
-	if (want == 0 || c->fpos >= c->mapsize) {
-		PARA_INFO_LOG("failed attempt to read %u bytes @%zu\n", want,
-			c->fpos);
-		errno = EAGAIN;
-		return -1;
-	}
+	if (want == 0 || c->fpos >= c->mapsize)
+		return 0;
 	have = c->mapsize - c->fpos;
-	rv = PARA_MIN(have, want);
-	PARA_DEBUG_LOG("reading %u bytes @%zu\n", rv, c->fpos);
+	rv = PARA_MIN(have, (size_t)want);
+	PARA_DEBUG_LOG("reading %zu bytes @%zu\n", rv, c->fpos);
 	memcpy(dest, c->map + c->fpos, rv);
 	c->fpos += rv;
 	return rv;
@@ -116,32 +108,17 @@ static void aac_afh_close(void *afh_context)
 	free(c);
 }
 
-/**
- * Libmp4ff function to reposition the file to the given sample.
- *
- * \param f The opaque handle returned by mp4ff_open_read().
- * \param track The number of the (audio) track.
- * \param sample Destination.
- *
- * We need this function to obtain the offset of the sample within the audio
- * file. Unfortunately, it is not exposed in the mp4ff header.
- *
- * \return This function always returns 0.
- */
-int32_t mp4ff_set_sample_position(mp4ff_t *f, const int32_t track, const int32_t sample);
-
-static int aac_afh_get_chunk(long unsigned chunk_num, void *afh_context,
-		const char **buf, size_t *len)
+static int aac_afh_get_chunk(uint32_t chunk_num, void *afh_context,
+		const char **buf, uint32_t *len)
 {
 	struct aac_afh_context *c = afh_context;
 	int32_t ss;
 	size_t offset;
 
 	assert(chunk_num <= INT_MAX);
-	/* this function always returns zero */
 	mp4ff_set_sample_position(c->mp4ff, c->track, chunk_num);
 	offset = c->fpos;
-	ss = mp4ff_read_sample_getsize(c->mp4ff, c->track, chunk_num);
+	ss = mp4ff_get_sample_size(c->mp4ff, c->track, chunk_num);
 	if (ss <= 0)
 		return -E_MP4FF_BAD_SAMPLE;
 	assert(ss + offset <= c->mapsize);
@@ -170,8 +147,7 @@ static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd,
 	struct aac_afh_context *c;
 	int64_t tmp;
 	const char *buf;
-	size_t sz;
-	uint32_t n;
+	uint32_t n, len;
 
 	ret = aac_afh_open(map, numbytes, (void **)&c);
 	if (ret < 0)
@@ -196,16 +172,16 @@ static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd,
 	afhi->chunks_total = rv;
 	afhi->max_chunk_size = 0;
 	for (n = 0; n < afhi->chunks_total; n++) {
-		if (aac_afh_get_chunk(n, c, &buf, &sz) < 0)
+		if (aac_afh_get_chunk(n, c, &buf, &len) < 0)
 			break;
-		afhi->max_chunk_size = PARA_MAX((size_t)afhi->max_chunk_size, sz);
+		afhi->max_chunk_size = PARA_MAX(afhi->max_chunk_size, len);
 	}
 
 	tmp = c->masc.sbr_present_flag == 1? 2048 : 1024;
 	afhi->seconds_total = tmp * afhi->chunks_total / afhi->frequency;
 	ms2tv(1000 * tmp / afhi->frequency, &afhi->chunk_tv);
 
-	if (aac_afh_get_chunk(0, c, &buf, &sz) >= 0)
+	if (aac_afh_get_chunk(0, c, &buf, &len) >= 0)
 		numbytes -= buf - map;
 	afhi->bitrate = 8 * numbytes / afhi->seconds_total / 1000;
 	_aac_afh_get_taginfo(c->mp4ff, &afhi->tags);