X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mp4.c;h=e60f18f59b1adc26350ae25055df7c822f6f174c;hb=1182720326e0392271fa66fe582d5c2be108877b;hp=e4082549113c5bb89a6c765b9ff50f76d765a60f;hpb=e4fe9f0acfaf73694f6070d5bda7f14844f61a77;p=paraslash.git

diff --git a/mp4.c b/mp4.c
index e4082549..e60f18f5 100644
--- a/mp4.c
+++ b/mp4.c
@@ -212,7 +212,6 @@ static void skip_bytes(struct mp4 *f, off_t num_skip)
 static int read_stsz(struct mp4 *f)
 {
 	int ret;
-	int32_t i;
 	struct mp4_track *t = &f->track;
 
 	if (t->state != ATS_SEEN_MP4A || t->stsz_table)
@@ -227,8 +226,8 @@ static int read_stsz(struct mp4 *f)
 	if (t->stsz_sample_size != 0)
 		return 1;
 	t->stsz_table = para_malloc(t->stsz_sample_count * sizeof(int32_t));
-	for (i = 0; i < t->stsz_sample_count; i++) {
-		ret = read_int32(f, &t->stsz_table[i]);
+	for (uint32_t n = 0; n < t->stsz_sample_count; n++) {
+		ret = read_int32(f, &t->stsz_table[n]);
 		if (ret <= 0)
 			return ret;
 	}
@@ -238,7 +237,6 @@ static int read_stsz(struct mp4 *f)
 static int read_stts(struct mp4 *f)
 {
 	int ret;
-	int32_t i;
 	struct mp4_track *t = &f->track;
 
 	if (t->state != ATS_SEEN_MP4A || t->stts_sample_count)
@@ -249,8 +247,8 @@ static int read_stts(struct mp4 *f)
 		return ret;
 	t->stts_sample_count = para_malloc(t->stts_entry_count
 		* sizeof(int32_t));
-	for (i = 0; i < t->stts_entry_count; i++) {
-		ret = read_int32(f, &t->stts_sample_count[i]);
+	for (uint32_t n = 0; n < t->stts_entry_count; n++) {
+		ret = read_int32(f, &t->stts_sample_count[n]);
 		if (ret <= 0)
 			return ret;
 		skip_bytes(f, 4); /* sample delta */
@@ -261,7 +259,6 @@ static int read_stts(struct mp4 *f)
 static int read_stsc(struct mp4 *f)
 {
 	int ret;
-	int32_t i;
 	struct mp4_track *t = &f->track;
 
 	if (t->state != ATS_SEEN_MP4A)
@@ -275,11 +272,11 @@ static int read_stsc(struct mp4 *f)
 	t->stsc_first_chunk = para_malloc(t->stsc_entry_count * sizeof(int32_t));
 	t->stsc_samples_per_chunk = para_malloc(t->stsc_entry_count
 		* sizeof (int32_t));
-	for (i = 0; i < t->stsc_entry_count; i++) {
-		ret = read_int32(f, &t->stsc_first_chunk[i]);
+	for (uint32_t n = 0; n < t->stsc_entry_count; n++) {
+		ret = read_int32(f, &t->stsc_first_chunk[n]);
 		if (ret <= 0)
 			return ret;
-		ret = read_int32(f, &t->stsc_samples_per_chunk[i]);
+		ret = read_int32(f, &t->stsc_samples_per_chunk[n]);
 		if (ret <= 0)
 			return ret;
 		skip_bytes(f, 4); /* sample desc index */
@@ -290,7 +287,6 @@ static int read_stsc(struct mp4 *f)
 static int read_stco(struct mp4 *f)
 {
 	int ret;
-	int32_t i;
 	struct mp4_track *t = &f->track;
 
 	if (t->state != ATS_SEEN_MP4A || t->stco_chunk_offset)
@@ -301,8 +297,8 @@ static int read_stco(struct mp4 *f)
 		return ret;
 	t->stco_chunk_offset = para_malloc(t->stco_entry_count
 		* sizeof(int32_t));
-	for (i = 0; i < t->stco_entry_count; i++) {
-		ret = read_int32(f, &t->stco_chunk_offset[i]);
+	for (uint32_t n = 0; n < t->stco_entry_count; n++) {
+		ret = read_int32(f, &t->stco_chunk_offset[n]);
 		if (ret <= 0)
 			return ret;
 	}
@@ -312,7 +308,7 @@ static int read_stco(struct mp4 *f)
 static int read_stsd(struct mp4 *f)
 {
 	int ret;
-	uint32_t i, entry_count;
+	uint32_t entry_count;
 
 	if (f->track.state != ATS_INITIAL)
 		return 1;
@@ -320,7 +316,7 @@ static int read_stsd(struct mp4 *f)
 	ret = read_int32(f, &entry_count);
 	if (ret <= 0)
 		return ret;
-	for (i = 0; i < entry_count; i++) {
+	for (uint32_t n = 0; n < entry_count; n++) {
 		uint64_t skip = get_position(f);
 		uint64_t size;
 		uint8_t atom_type = 0;
@@ -398,7 +394,6 @@ static int parse_tag(struct mp4 *f, uint8_t parent, int32_t size)
 	tag = f->meta.tags + f->meta.count;
 	tag->item = para_strdup(get_metadata_name(parent));
 	tag->value = value;
-	tag->len = len;
 	f->meta.count++;
 	return 1;
 fail:
@@ -425,7 +420,7 @@ static int read_mdhd(struct mp4 *f)
 		ret = read_int64(f, &t->duration);
 		if (ret <= 0)
 			return ret;
-	} else { //version == 0
+	} else { /* version == 0 */
 		uint32_t temp;
 
 		skip_bytes(f, 8); /* creation time (4), modification time (4) */
@@ -442,7 +437,7 @@ static int read_mdhd(struct mp4 *f)
 	return 1;
 }
 
-static int32_t read_ilst(struct mp4 *f, int32_t size)
+static int read_ilst(struct mp4 *f, int32_t size)
 {
 	int ret;
 	uint64_t sumsize = 0;
@@ -471,7 +466,7 @@ static int32_t read_ilst(struct mp4 *f, int32_t size)
 	return 1;
 }
 
-static int32_t read_meta(struct mp4 *f, uint64_t size)
+static int read_meta(struct mp4 *f, uint64_t size)
 {
 	int ret;
 	uint64_t subsize, sumsize = 0;
@@ -571,6 +566,21 @@ static int parse_sub_atoms(struct mp4 *f, uint64_t total_size, bool meta_only)
 	return 1;
 }
 
+void mp4_close(struct mp4 *f)
+{
+	free(f->track.stsz_table);
+	free(f->track.stts_sample_count);
+	free(f->track.stsc_first_chunk);
+	free(f->track.stsc_samples_per_chunk);
+	free(f->track.stco_chunk_offset);
+	for (uint32_t n = 0; n < f->meta.count; n++) {
+		free(f->meta.tags[n].item);
+		free(f->meta.tags[n].value);
+	}
+	free(f->meta.tags);
+	free(f);
+}
+
 static int open_file(const struct mp4_callback *cb, bool meta_only, struct mp4 **result)
 {
 	int ret;
@@ -596,34 +606,34 @@ static int open_file(const struct mp4_callback *cb, bool meta_only, struct mp4 *
 	ret = -E_MP4_TRACK;
 	if (f->track.channel_count == 0)
 		goto fail;
+	ret = -E_MP4_BAD_SAMPLERATE;
+	if (f->track.sample_rate == 0)
+		goto fail;
 	*result = f;
 	return 1;
 fail:
 	*result = NULL;
-	free(f);
+	mp4_close(f);
 	return ret;
 }
 
 int mp4_open_read(const struct mp4_callback *cb, struct mp4 **result)
 {
-	return open_file(cb, false, result);
-}
-
-void mp4_close(struct mp4 *f)
-{
-	int32_t i;
+	struct mp4 *f;
+	int ret;
 
-	free(f->track.stsz_table);
-	free(f->track.stts_sample_count);
-	free(f->track.stsc_first_chunk);
-	free(f->track.stsc_samples_per_chunk);
-	free(f->track.stco_chunk_offset);
-	for (i = 0; i < f->meta.count; i++) {
-		free(f->meta.tags[i].item);
-		free(f->meta.tags[i].value);
-	}
-	free(f->meta.tags);
-	free(f);
+	*result = NULL;
+	ret = open_file(cb, false, &f);
+	if (ret < 0)
+		return ret;
+	ret = -E_MP4_BAD_SAMPLE_COUNT;
+	if (f->track.stsz_sample_count == 0)
+		goto fail;
+	*result = f;
+	return 1;
+fail:
+	mp4_close(f);
+	return ret;
 }
 
 static int32_t chunk_of_sample(const struct mp4 *f, int32_t sample,
@@ -631,15 +641,15 @@ static int32_t chunk_of_sample(const struct mp4 *f, int32_t sample,
 {
 	const struct mp4_track *t = &f->track;
 	uint32_t *fc = t->stsc_first_chunk, *spc = t->stsc_samples_per_chunk;
-	int32_t chunk1, chunk1samples, n, total, i;
+	uint32_t chunk1, chunk1samples, n, total, k;
 
-	for (i = 1, total = 0; i < t->stsc_entry_count; i++, total += n) {
-		n = (fc[i] - fc[i - 1]) * spc[i - 1]; /* number of samples */
+	for (k = 1, total = 0; k < t->stsc_entry_count; k++, total += n) {
+		n = (fc[k] - fc[k - 1]) * spc[k - 1]; /* number of samples */
 		if (sample < total + n)
 			break;
 	}
-	chunk1 = fc[i - 1];
-	chunk1samples = spc[i - 1];
+	chunk1 = fc[k - 1];
+	chunk1samples = spc[k - 1];
 	if (chunk1samples != 0)
 		*chunk = (sample - total) / chunk1samples + chunk1;
 	else
@@ -661,7 +671,7 @@ uint64_t mp4_get_duration(const struct mp4 *f)
 	return t->duration * 1000 / t->time_scale;
 }
 
-int mp4_set_sample_position(struct mp4 *f, int32_t sample)
+int mp4_set_sample_position(struct mp4 *f, uint32_t sample)
 {
 	const struct mp4_track *t = &f->track;
 	int32_t offset, chunk, chunk_sample;
@@ -686,33 +696,36 @@ int mp4_set_sample_position(struct mp4 *f, int32_t sample)
 	return 1;
 }
 
-int32_t mp4_get_sample_size(const struct mp4 *f, int sample)
+int mp4_get_sample_size(const struct mp4 *f, uint32_t sample, uint32_t *result)
 {
 	const struct mp4_track *t = &f->track;
 
+	if (sample >= t->stsz_sample_count)
+		return -ERRNO_TO_PARA_ERROR(EINVAL);
 	if (t->stsz_sample_size != 0)
-		return t->stsz_sample_size;
-	return t->stsz_table[sample];
+		*result = t->stsz_sample_size;
+	else
+		*result = t->stsz_table[sample];
+	return 1;
 }
 
-uint32_t mp4_get_sample_rate(const struct mp4 *f)
+uint16_t mp4_get_sample_rate(const struct mp4 *f)
 {
 	return f->track.sample_rate;
 }
 
-uint32_t mp4_get_channel_count(const struct mp4 *f)
+uint16_t mp4_get_channel_count(const struct mp4 *f)
 {
 	return f->track.channel_count;
 }
 
-int32_t mp4_num_samples(const struct mp4 *f)
+uint32_t mp4_num_samples(const struct mp4 *f)
 {
 	const struct mp4_track *t = &f->track;
-	int32_t i;
-	int32_t total = 0;
+	uint32_t total = 0;
 
-	for (i = 0; i < t->stts_entry_count; i++)
-		total += t->stts_sample_count[i];
+	for (uint32_t n = 0; n < t->stts_entry_count; n++)
+		total += t->stts_sample_count[n];
 	return total;
 }
 
@@ -783,7 +796,7 @@ static void *modify_moov(struct mp4 *f, uint32_t *out_size)
 {
 	int ret;
 	uint64_t total_base = f->moov_offset + 8;
-	uint32_t total_size = (uint32_t) (f->moov_size - 8);
+	uint32_t total_size = f->moov_size - 8;
 	uint32_t new_ilst_size = 0;
 	void *out_buffer;
 	uint8_t *p_out;
@@ -889,8 +902,9 @@ int mp4_meta_update(struct mp4 *f)
 	ret = write_data(f, new_moov_data, new_moov_size);
 	if (ret < 0)
 		goto free_moov;
-	f->cb->truncate(f->cb->user_data);
-	ret = 1;
+	ret = f->cb->truncate(f->cb->user_data);
+	if (ret < 0)
+		ret = -ERRNO_TO_PARA_ERROR(errno);
 free_moov:
 	free(new_moov_data);
 	return ret;
@@ -909,10 +923,8 @@ free_moov:
  */
 char *mp4_get_tag_value(const struct mp4 *f, const char *item)
 {
-	uint32_t i;
-
-	for (i = 0; i < f->meta.count; i++)
-		if (!strcasecmp(f->meta.tags[i].item, item))
-			return para_strdup(f->meta.tags[i].value);
+	for (unsigned n = 0; n < f->meta.count; n++)
+		if (!strcasecmp(f->meta.tags[n].item, item))
+			return para_strdup(f->meta.tags[n].value);
 	return NULL;
 }