X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mp4.c;h=1c33a176e2fafd1d174017cea25edcfba536a5fb;hb=c2e987abfcf711c85e00fc11b9ef00d38ad89f3a;hp=757c42958da37c7eeac1c70dc379752da2076fae;hpb=3a37c17379f82af90caa6990d402b1fc4930e9cd;p=paraslash.git

diff --git a/mp4.c b/mp4.c
index 757c4295..1c33a176 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;
@@ -596,6 +592,9 @@ 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:
@@ -606,21 +605,33 @@ fail:
 
 int mp4_open_read(const struct mp4_callback *cb, struct mp4 **result)
 {
-	return open_file(cb, false, result);
+	struct mp4 *f;
+	int ret;
+
+	*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;
 }
 
 void mp4_close(struct mp4 *f)
 {
-	int32_t i;
-
 	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);
+	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);
@@ -631,15 +642,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 +672,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 +697,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;
 }
 
@@ -889,77 +903,29 @@ 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;
 }
 
-static char *meta_find_by_name(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);
-	return NULL;
-}
-
 /**
- * Return the value of the artist meta tag of an mp4 file.
+ * Return the value of the given tag item.
  *
  * \param f Must not be NULL.
+ * \param item "artist", "title", "album", "comment", or "date".
  *
- * \return If the file does not contain this metadata tag, the function returns
- * NULL. Otherwise, a copy of the tag value is returned. The caller should free
- * this memory when it is no longer needed.
+ * \return The function always returns NULL if the given item is not in the
+ * above list. Otherwise, if the file does not contain a tag for the given
+ * item, the function also returns NULL. Otherwise a copy of the tag value is
+ * returned and the caller should free this memory when it is no longer needed.
  */
-char *mp4_meta_get_artist(const struct mp4 *f)
+char *mp4_get_tag_value(const struct mp4 *f, const char *item)
 {
-	return meta_find_by_name(f, "artist");
-}
-
-/**
- * Return the value of the title meta tag of an mp4 file.
- *
- * \param f See \ref mp4_meta_get_artist().
- * \return See \ref mp4_meta_get_artist().
- */
-char *mp4_meta_get_title(const struct mp4 *f)
-{
-	return meta_find_by_name(f, "title");
-}
-
-/**
- * Return the value of the date meta tag of an mp4 file.
- *
- * \param f See \ref mp4_meta_get_artist().
- * \return See \ref mp4_meta_get_artist().
- */
-char *mp4_meta_get_date(const struct mp4 *f)
-{
-	return meta_find_by_name(f, "date");
-}
-
-/**
- * Return the value of the album meta tag of an mp4 file.
- *
- * \param f See \ref mp4_meta_get_artist().
- * \return See \ref mp4_meta_get_artist().
- */
-char *mp4_meta_get_album(const struct mp4 *f)
-{
-	return meta_find_by_name(f, "album");
-}
-
-/**
- * Return the value of the comment meta tag of an mp4 file.
- *
- * \param f See \ref mp4_meta_get_artist().
- * \return See \ref mp4_meta_get_artist().
- */
-char *mp4_meta_get_comment(const struct mp4 *f)
-{
-	return meta_find_by_name(f, "comment");
+	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;
 }