const void *map;
size_t mapsize;
size_t fpos;
- int32_t track;
struct mp4 *mp4;
struct mp4_callback cb;
};
-static uint32_t aac_afh_read_cb(void *user_data, void *dest, uint32_t want)
+static ssize_t aac_afh_read_cb(void *user_data, void *dest, size_t want)
{
struct aac_afh_context *c = user_data;
size_t have, rv;
if (want == 0 || c->fpos >= c->mapsize)
return 0;
have = c->mapsize - c->fpos;
- rv = PARA_MIN(have, (size_t)want);
+ rv = PARA_MIN(have, want);
PARA_DEBUG_LOG("reading %zu bytes @%zu\n", rv, c->fpos);
memcpy(dest, c->map + c->fpos, rv);
c->fpos += rv;
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;
c->mp4 = mp4_open_read(&c->cb);
if (!c->mp4)
goto free_ctx;
- ret = aac_afh_get_track(c->mp4);
- if (ret < 0)
- goto close_mp4;
- c->track = ret;
*afh_context = c;
return 0;
-close_mp4:
- mp4_close(c->mp4);
free_ctx:
free(c);
*afh_context = NULL;
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);
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;
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)
return ret;
}
-static uint32_t aac_afh_meta_read_cb(void *user_data, void *dest, uint32_t want)
+static ssize_t aac_afh_meta_read_cb(void *user_data, void *dest, size_t want)
{
int fd = *(int *)user_data;
return read(fd, dest, want);