X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=7d3a6e0d98a01e40974f22285e9be2d9fac01b46;hp=1756ec04ab5582edd97ab1b73bd2d777657495ec;hb=0d90aa75852c4e76d8d00659d48ba4baf32deae2;hpb=5afe721aeb241bd21b832994ec2f2b7d8ff84766

diff --git a/aft.c b/aft.c
index 1756ec04..7d3a6e0d 100644
--- a/aft.c
+++ b/aft.c
@@ -335,8 +335,8 @@ enum afhi_offsets {
 	CHUNKS_TOTAL_OFFSET = 20,
 	/** The length of the audio file header (4 bytes). */
 	HEADER_LEN_OFFSET = 24,
-	/** Was: The start of the audio file header (4 bytes). */
-	AFHI_UNUSED2_OFFSET = 28,
+	/** Size of the largest chunk in bytes. (4 bytes). */
+	AFHI_MAX_CHUNK_SIZE_OFFSET = 28,
 	/** The seconds part of the chunk time (4 bytes). */
 	CHUNK_TV_TV_SEC_OFFSET = 32,
 	/** The microseconds part of the chunk time (4 bytes). */
@@ -376,7 +376,7 @@ static void save_afhi(struct afh_info *afhi, char *buf)
 	write_u8(buf + AFHI_CHANNELS_OFFSET, afhi->channels);
 	write_u32(buf + CHUNKS_TOTAL_OFFSET, afhi->chunks_total);
 	write_u32(buf + HEADER_LEN_OFFSET, afhi->header_len);
-	write_u32(buf + AFHI_UNUSED2_OFFSET, 0);
+	write_u32(buf + AFHI_MAX_CHUNK_SIZE_OFFSET, afhi->max_chunk_size);
 	write_u32(buf + CHUNK_TV_TV_SEC_OFFSET, afhi->chunk_tv.tv_sec);
 	write_u32(buf + CHUNK_TV_TV_USEC_OFFSET, afhi->chunk_tv.tv_usec);
 	p = buf + AFHI_INFO_STRING_OFFSET;
@@ -398,6 +398,7 @@ static void load_afhi(const char *buf, struct afh_info *afhi)
 	afhi->channels = read_u8(buf + AFHI_CHANNELS_OFFSET);
 	afhi->chunks_total = read_u32(buf + CHUNKS_TOTAL_OFFSET);
 	afhi->header_len = read_u32(buf + HEADER_LEN_OFFSET);
+	afhi->max_chunk_size = read_u32(buf + AFHI_MAX_CHUNK_SIZE_OFFSET);
 	afhi->chunk_tv.tv_sec = read_u32(buf + CHUNK_TV_TV_SEC_OFFSET);
 	afhi->chunk_tv.tv_usec = read_u32(buf + CHUNK_TV_TV_USEC_OFFSET);
 	afhi->techinfo = (char *)buf + AFHI_INFO_STRING_OFFSET;
@@ -408,40 +409,35 @@ static void load_afhi(const char *buf, struct afh_info *afhi)
 	afhi->tags.comment = afhi->tags.album + strlen(afhi->tags.album) + 1;
 }
 
+/* Only used for saving the chunk table, but not for loading. */
 static unsigned sizeof_chunk_table(struct afh_info *afhi)
 {
-	if (!afhi)
+	if (!afhi || !afhi->chunk_table)
 		return 0;
 	return 4 * (afhi->chunks_total + 1);
 }
 
-static uint32_t save_chunk_table(struct afh_info *afhi, char *buf)
+static void save_chunk_table(struct afh_info *afhi, char *buf)
 {
-	int i;
-	uint32_t max = 0, old = 0;
+	uint32_t n;
 
-	for (i = 0; i <= afhi->chunks_total; i++) {
-		uint32_t val = afhi->chunk_table[i];
-		write_u32(buf + 4 * i, val);
-		/*
-		 * If the first chunk is the header, do not consider it for the
-		 * calculation of the largest chunk size.
-		 */
-		if (i == 0 || (i == 1 && afhi->header_len > 0)) {
-			old = val;
-			continue;
-		}
-		max = PARA_MAX(max, val - old);
-		old = val;
-	}
-	return max;
+	if (!afhi->chunk_table)
+		return;
+	for (n = 0; n <= afhi->chunks_total; n++)
+		write_u32(buf + 4 * n, afhi->chunk_table[n]);
 }
 
 static void load_chunk_table(struct afh_info *afhi, const struct osl_object *ct)
 {
 	int i;
+	size_t sz;
 
-	afhi->chunk_table = para_malloc(sizeof_chunk_table(afhi));
+	if (!ct->data || ct->size < 4) {
+		afhi->chunk_table = NULL;
+		return;
+	}
+	sz  = PARA_MIN(((size_t)afhi->chunks_total + 1) * 4, ct->size) + 1;
+	afhi->chunk_table = para_malloc(sz);
 	for (i = 0; i <= afhi->chunks_total && i * 4 + 3 < ct->size; i++)
 		afhi->chunk_table[i] = read_u32(ct->data + 4 * i);
 }
@@ -638,7 +634,13 @@ static int save_afd(struct audio_file_data *afd)
 		goto err;
 	buf = shm_afd;
 	buf += sizeof(*afd);
-	afd->max_chunk_size = save_chunk_table(&afd->afhi, buf);
+	save_chunk_table(&afd->afhi, buf);
+	if (afd->afhi.max_chunk_size == 0) { /* v0.5.x on-disk afhi */
+		set_max_chunk_size(&afd->afhi);
+		PARA_NOTICE_LOG("max chunk size unset, re-add required\n");
+	} else
+		PARA_INFO_LOG("using max chunk size from afhi\n");
+	afd->max_chunk_size = afd->afhi.max_chunk_size;
 	*(struct audio_file_data *)shm_afd = *afd;
 	shm_detach(shm_afd);
 	return shmid;
@@ -947,6 +949,8 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 	WRITE_STATUS_ITEM(b, SI_CHUNK_TIME, "%lu\n", tv2ms(&afhi->chunk_tv));
 	WRITE_STATUS_ITEM(b, SI_NUM_CHUNKS, "%" PRIu32 "\n",
 		afhi->chunks_total);
+	WRITE_STATUS_ITEM(b, SI_MAX_CHUNK_SIZE, "%" PRIu32 "\n",
+		afhi->max_chunk_size);
 	WRITE_STATUS_ITEM(b, SI_TECHINFO, "%s\n", afhi->techinfo);
 	WRITE_STATUS_ITEM(b, SI_ARTIST, "%s\n", afhi->tags.artist);
 	WRITE_STATUS_ITEM(b, SI_TITLE, "%s\n", afhi->tags.title);
@@ -1066,8 +1070,15 @@ again:
 	d->afhi.chunk_table = afd->afhi.chunk_table = NULL;
 	ret = osl(osl_open_disk_object(audio_file_table, current_aft_row,
 		AFTCOL_CHUNKS, &chunk_table_obj));
-	if (ret < 0)
-		return ret;
+	if (ret < 0) {
+		if (!afh_supports_dynamic_chunks(d->afsi.audio_format_id))
+			return ret;
+		PARA_INFO_LOG("no chunk table for %s\n", d->path);
+		chunk_table_obj.data = NULL;
+		chunk_table_obj.size = 0;
+	} else {
+		PARA_INFO_LOG("chunk table: %zu bytes\n", chunk_table_obj.size);
+	}
 	ret = mmap_full_file(d->path, O_RDONLY, &map.data, &map.size, &afd->fd);
 	if (ret < 0)
 		goto out;
@@ -1097,7 +1108,8 @@ again:
 	ret = save_afd(afd);
 out:
 	free(afd->afhi.chunk_table);
-	osl_close_disk_object(&chunk_table_obj);
+	if (chunk_table_obj.data)
+		osl_close_disk_object(&chunk_table_obj);
 	if (ret < 0) {
 		PARA_ERROR_LOG("%s: %s\n", d->path, para_strerror(-ret));
 		ret = score_delete(current_aft_row);
@@ -1748,6 +1760,7 @@ static int com_add_callback(struct afs_callback_arg *aca)
 			&objs[AFTCOL_AFHI]));
 		if (ret < 0)
 			goto out;
+		/* truncate the file to size zero if there is no chunk table */
 		ret = osl(osl_update_object(audio_file_table, row, AFTCOL_CHUNKS,
 			&objs[AFTCOL_CHUNKS]));
 		if (ret < 0)