mp4: Implement error checking for the write path.

[paraslash.git] / aac_afh.c

diff --git a/aac_afh.c b/aac_afh.c
index 2226394aa2f2370d0e85b8bfc648328bc8452245..0a80bfcf3a44205ea7d42f9ac260c03f910ba199 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -22,7 +22,6 @@ struct aac_afh_context {
        const void *map;
        size_t mapsize;
        size_t fpos;
-       int32_t track;
        struct mp4 *mp4;
        struct mp4_callback cb;
 };
@@ -49,17 +48,6 @@ static uint32_t aac_afh_seek_cb(void *user_data, uint64_t pos)
        return 0;
 }
 
-static int32_t aac_afh_get_track(struct mp4 *mp4)
-{
-       int32_t i, num_tracks = mp4_total_tracks(mp4);
-
-       assert(num_tracks >= 0);
-       for (i = 0; i < num_tracks; i++)
-               if (mp4_is_audio_track(mp4, i))
-                       return i;
-       return -E_MP4_TRACK; /* no audio track */
-}
-
 static int aac_afh_open(const void *map, size_t mapsize, void **afh_context)
 {
        int ret;
@@ -72,18 +60,11 @@ static int aac_afh_open(const void *map, size_t mapsize, void **afh_context)
        c->cb.seek = aac_afh_seek_cb;
        c->cb.user_data = c;
 
-       ret = -E_MP4_OPEN;
-       c->mp4 = mp4_open_read(&c->cb);
-       if (!c->mp4)
-               goto free_ctx;
-       ret = aac_afh_get_track(c->mp4);
+       ret = mp4_open_read(&c->cb, &c->mp4);
        if (ret < 0)
-               goto close_mp4;
-       c->track = ret;
+               goto free_ctx;
        *afh_context = c;
        return 0;
-close_mp4:
-       mp4_close(c->mp4);
 free_ctx:
        free(c);
        *afh_context = NULL;
@@ -103,11 +84,13 @@ static int aac_afh_get_chunk(uint32_t chunk_num, void *afh_context,
        struct aac_afh_context *c = afh_context;
        int32_t ss;
        size_t offset;
+       int ret;
 
-       assert(chunk_num <= INT_MAX);
-       mp4_set_sample_position(c->mp4, c->track, chunk_num);
+       ret = mp4_set_sample_position(c->mp4, chunk_num);
+       if (ret < 0)
+               return ret;
        offset = c->fpos;
-       ss = mp4_get_sample_size(c->mp4, c->track, chunk_num);
+       ss = mp4_get_sample_size(c->mp4, chunk_num);
        if (ss <= 0)
                return -E_MP4_BAD_SAMPLE;
        assert(ss + offset <= c->mapsize);
@@ -143,19 +126,19 @@ static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd,
                return ret;
 
        ret = -E_MP4_BAD_SAMPLERATE;
-       rv = mp4_get_sample_rate(c->mp4, c->track);
+       rv = mp4_get_sample_rate(c->mp4);
        if (rv <= 0)
                goto close;
        afhi->frequency = rv;
 
        ret = -E_MP4_BAD_CHANNEL_COUNT;
-       rv = mp4_get_channel_count(c->mp4, c->track);
+       rv = mp4_get_channel_count(c->mp4);
        if (rv <= 0)
                goto close;
        afhi->channels = rv;
 
        ret = -E_MP4_BAD_SAMPLE_COUNT;
-       rv = mp4_num_samples(c->mp4, c->track);
+       rv = mp4_num_samples(c->mp4);
        if (rv <= 0)
                goto close;
        afhi->chunks_total = rv;
@@ -165,7 +148,7 @@ static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd,
                        break;
                afhi->max_chunk_size = PARA_MAX(afhi->max_chunk_size, len);
        }
-       milliseconds = mp4_get_duration(c->mp4, c->track);
+       milliseconds = mp4_get_duration(c->mp4);
        afhi->seconds_total = milliseconds / 1000;
        ms2tv(milliseconds / afhi->chunks_total, &afhi->chunk_tv);
        if (aac_afh_get_chunk(0, c, &buf, &len) >= 0)
@@ -190,10 +173,10 @@ static uint32_t aac_afh_meta_seek_cb(void *user_data, uint64_t pos)
        return lseek(fd, pos, SEEK_SET);
 }
 
-static uint32_t aac_afh_meta_write_cb(void *user_data, void *dest, uint32_t want)
+static ssize_t aac_afh_meta_write_cb(void *user_data, void *dest, size_t count)
 {
        int fd = *(int *)user_data;
-       return write(fd, dest, want);
+       return write(fd, dest, count);
 }
 
 static uint32_t aac_afh_meta_truncate_cb(void *user_data)
@@ -245,9 +228,9 @@ static int aac_afh_rewrite_tags(const char *map, size_t mapsize,
                return ret;
        lseek(fd, 0, SEEK_SET);
 
-       mp4 = mp4_open_meta(&cb);
-       if (!mp4)
-               return -E_MP4_OPEN;
+       ret = mp4_open_meta(&cb, &mp4);
+       if (ret < 0)
+               return ret;
        metadata = mp4_get_meta(mp4);
        PARA_NOTICE_LOG("%u metadata item(s) found\n", metadata->count);
        replace_or_add_tag("artist", tags->artist, metadata);
@@ -255,11 +238,7 @@ static int aac_afh_rewrite_tags(const char *map, size_t mapsize,
        replace_or_add_tag("album", tags->album, metadata);
        replace_or_add_tag("date", tags->year, metadata);
        replace_or_add_tag("comment", tags->comment, metadata);
-       ret = -E_MP4_META_WRITE;
-       if (!mp4_meta_update(mp4))
-               goto close;
-       ret = 1;
-close:
+       ret = mp4_meta_update(mp4);
        mp4_close(mp4);
        return ret;
 }