X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aac_afh.c;h=c2daf5b533ca881990963618fbd2c488468f58ce;hb=39a3eb513e1a98a3a0cc54c38dacb89451ffe88e;hp=d8ad48a1527a0b223c02a94ba9e65cf3b462d109;hpb=c9f23c7c737251ceb6f278fd3d3d016d754bf497;p=paraslash.git diff --git a/aac_afh.c b/aac_afh.c index d8ad48a1..c2daf5b5 100644 --- a/aac_afh.c +++ b/aac_afh.c @@ -108,20 +108,6 @@ static void aac_afh_close(void *afh_context) free(c); } -/** - * Libmp4ff function to reposition the file to the given sample. - * - * \param f The opaque handle returned by mp4ff_open_read(). - * \param track The number of the (audio) track. - * \param sample Destination. - * - * We need this function to obtain the offset of the sample within the audio - * file. Unfortunately, it is not exposed in the mp4ff header. - * - * \return This function always returns 0. - */ -int32_t mp4ff_set_sample_position(mp4ff_t *f, const int32_t track, const int32_t sample); - static int aac_afh_get_chunk(uint32_t chunk_num, void *afh_context, const char **buf, uint32_t *len) { @@ -130,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);