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)
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);
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;
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;
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);
int ret;
int32_t rv;
struct aac_afh_context *c;
- int64_t tmp;
+ uint64_t milliseconds;
const char *buf;
uint32_t n, len;
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;
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);
{
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,
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))