mp4: Introduce mp4ff_get_duration().

[paraslash.git] / aac_afh.c

diff --git a/aac_afh.c b/aac_afh.c
index b16cea27371b3d329ca36fcddb1c6d8c9b881c67..15e338e5b61efb84d39e24fbff17952137008871 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -23,9 +23,8 @@ struct aac_afh_context {
        size_t mapsize;
        size_t fpos;
        int32_t track;
-       mp4ff_t *mp4ff;
-       mp4AudioSpecificConfig masc;
-       mp4ff_callback_t cb;
+       struct mp4ff *mp4ff;
+       struct mp4ff_callback cb;
 };
 
 static uint32_t aac_afh_read_cb(void *user_data, void *dest, uint32_t want)
@@ -50,7 +49,7 @@ static uint32_t aac_afh_seek_cb(void *user_data, uint64_t pos)
        return 0;
 }
 
-static int32_t aac_afh_get_track(mp4ff_t *mp4ff, mp4AudioSpecificConfig *masc)
+static int32_t aac_afh_get_track(struct mp4ff *mp4ff)
 {
        int32_t i, rc, num_tracks = mp4ff_total_tracks(mp4ff);
 
@@ -61,7 +60,8 @@ static int32_t aac_afh_get_track(mp4ff_t *mp4ff, mp4AudioSpecificConfig *masc)
 
                mp4ff_get_decoder_config(mp4ff, i, &buf, &buf_size);
                if (buf) {
-                       rc = NeAACDecAudioSpecificConfig(buf, buf_size, masc);
+                       mp4AudioSpecificConfig masc;
+                       rc = NeAACDecAudioSpecificConfig(buf, buf_size, &masc);
                        free(buf);
                        if (rc < 0)
                                continue;
@@ -87,7 +87,7 @@ static int aac_afh_open(const void *map, size_t mapsize, void **afh_context)
        c->mp4ff = mp4ff_open_read(&c->cb);
        if (!c->mp4ff)
                goto free_ctx;
-       c->track = aac_afh_get_track(c->mp4ff, &c->masc);
+       c->track = aac_afh_get_track(c->mp4ff);
        ret = -E_MP4FF_TRACK;
        if (c->track < 0)
                goto close_mp4ff;
@@ -116,10 +116,9 @@ static int aac_afh_get_chunk(uint32_t chunk_num, void *afh_context,
        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);
@@ -128,7 +127,7 @@ static int aac_afh_get_chunk(uint32_t chunk_num, void *afh_context,
        return 1;
 }
 
-static void _aac_afh_get_taginfo(const mp4ff_t *mp4ff, struct taginfo *tags)
+static void _aac_afh_get_taginfo(const struct mp4ff *mp4ff, struct taginfo *tags)
 {
        mp4ff_meta_get_artist(mp4ff, &tags->artist);
        mp4ff_meta_get_title(mp4ff, &tags->title);
@@ -146,7 +145,7 @@ static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd,
        int ret;
        int32_t rv;
        struct aac_afh_context *c;
-       int64_t tmp;
+       uint64_t milliseconds;
        const char *buf;
        uint32_t n, len;
 
@@ -177,11 +176,9 @@ 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);
        }
-
-       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);
-
+       milliseconds = mp4ff_get_duration(c->mp4ff, c->track);
+       afhi->seconds_total = milliseconds / 1000;
+       ms2tv(milliseconds / afhi->chunks_total, &afhi->chunk_tv);
        if (aac_afh_get_chunk(0, c, &buf, &len) >= 0)
                numbytes -= buf - map;
        afhi->bitrate = 8 * numbytes / afhi->seconds_total / 1000;
@@ -217,14 +214,14 @@ static uint32_t aac_afh_meta_truncate_cb(void *user_data)
        return ftruncate(fd, offset);
 }
 
-static void replace_tag(mp4ff_tag_t *tag, const char *new_val, bool *found)
+static void replace_tag(struct mp4ff_tag *tag, const char *new_val, bool *found)
 {
        free(tag->value);
        tag->value = para_strdup(new_val);
        *found = true;
 }
 
-static void add_tag(mp4ff_metadata_t *md, const char *item, const char *value)
+static void add_tag(struct mp4ff_metadata *md, const char *item, const char *value)
 {
        md->tags[md->count].item = para_strdup(item);
        md->tags[md->count].value = para_strdup(value);
@@ -236,9 +233,9 @@ static int aac_afh_rewrite_tags(const char *map, size_t mapsize,
 {
        int ret, i;
        int32_t rv;
-       mp4ff_metadata_t metadata;
-       mp4ff_t *mp4ff;
-       mp4ff_callback_t cb = {
+       struct mp4ff_metadata metadata;
+       struct mp4ff *mp4ff;
+       struct mp4ff_callback cb = {
                .read = aac_afh_meta_read_cb,
                .seek = aac_afh_meta_seek_cb,
                .write = aac_afh_meta_write_cb,
@@ -264,9 +261,9 @@ static int aac_afh_rewrite_tags(const char *map, size_t mapsize,
        metadata.count = rv;
        PARA_NOTICE_LOG("%d metadata item(s) found\n", rv);
 
-       metadata.tags = para_malloc((metadata.count + 5) * sizeof(mp4ff_tag_t));
+       metadata.tags = para_malloc((metadata.count + 5) * sizeof(struct mp4ff_tag));
        for (i = 0; i < metadata.count; i++) {
-               mp4ff_tag_t *tag = metadata.tags + i;
+               struct mp4ff_tag *tag = metadata.tags + i;
 
                ret = -E_MP4FF_META_READ;
                if (!mp4ff_meta_get_by_index(mp4ff, i, &tag->item, &tag->value))