aac: improving seeking WIP

3 files changed, 44 insertions, 2 deletions

diff --git a/plugins/libmp4ff/mp4atom.c b/plugins/libmp4ff/mp4atom.c
index aa638c80..9776c17b 100644
--- a/plugins/libmp4ff/mp4atom.c
+++ b/plugins/libmp4ff/mp4atom.c
@@ -290,8 +290,7 @@ static int32_t mp4ff_read_stsz(mp4ff_t *f)
     if (f->track[f->total_tracks - 1]->stsz_sample_size == 0)
     {
         int32_t i;
-        f->track[f->total_tracks - 1]->stsz_table =
-            (int32_t*)malloc(f->track[f->total_tracks - 1]->stsz_sample_count*sizeof(int32_t));
+        f->track[f->total_tracks - 1]->stsz_table = (int32_t*)malloc(f->track[f->total_tracks - 1]->stsz_sample_count*sizeof(int32_t));
 
         for (i = 0; i < f->track[f->total_tracks - 1]->stsz_sample_count; i++)
         {
diff --git a/plugins/libmp4ff/mp4ff.c b/plugins/libmp4ff/mp4ff.c
index 2b396ec0..4e116d8f 100644
--- a/plugins/libmp4ff/mp4ff.c
+++ b/plugins/libmp4ff/mp4ff.c
@@ -409,6 +409,47 @@ int32_t mp4ff_get_sample_duration(const mp4ff_t *f, const int32_t track, const i
     return (int32_t)(-1);
 }
 
+int32_t mp4ff_get_num_sample_byte_sizes (const mp4ff_t *f, const int32_t track) {
+    return f->track[track]->stsz_sample_count;
+}
+
+int32_t mp4ff_get_sample_info(const mp4ff_t *f, const int32_t track, const int32_t samplenum, uint32_t *sample_duration, uint32_t *sample_byte_size) {
+// num_sample_byte_sizes --- stsz_sample_count
+// num_time_to_samples --- stts_entry_count
+// time_to_sample[i].sample_count --- p_track->stts_sample_count[i]
+// time_to_sample[i].sample_duration --- p_track->stts_sample_delta[i]
+// sample_byte_size[i] --- p_track->stsz_table[i]
+    unsigned int duration_index_accum = 0;
+    unsigned int duration_cur_index = 0;
+
+    if (samplenum >= f->track[track]->stsz_sample_count)
+    {
+        fprintf(stderr, "sample %i does not exist\n", samplenum);
+        return 0;
+    }
+
+    if (!f->track[track]->stts_entry_count)
+    {
+        fprintf(stderr, "no time to samples\n");
+        return 0;
+    }
+    while ((f->track[track]->stts_sample_count[duration_cur_index] + duration_index_accum) <= samplenum)
+    {
+        duration_index_accum += f->track[track]->stts_sample_count[duration_cur_index];
+        duration_cur_index++;
+        if (duration_cur_index >= f->track[track]->stts_entry_count)
+        {
+            fprintf(stderr, "sample %i does not have a duration\n", samplenum);
+            return 0;
+        }
+    }
+
+    *sample_duration = f->track[track]->stts_sample_delta[duration_cur_index];
+    *sample_byte_size = f->track[track]->stsz_table[samplenum];
+
+    return 1;
+}
+
 int64_t mp4ff_get_sample_position(const mp4ff_t *f, const int32_t track, const int32_t sample)
 {
     int32_t i, co = 0;
diff --git a/plugins/libmp4ff/mp4ff.h b/plugins/libmp4ff/mp4ff.h
index b47bcb8e..3936ebb1 100644
--- a/plugins/libmp4ff/mp4ff.h
+++ b/plugins/libmp4ff/mp4ff.h
@@ -48,6 +48,8 @@ mp4ff_t *mp4ff_open_read(mp4ff_callback_t *f);
 mp4ff_t *mp4ff_open_read_metaonly(mp4ff_callback_t *f);
 void mp4ff_close(mp4ff_t *f);
 int32_t mp4ff_get_sample_duration(const mp4ff_t *f, const int32_t track, const int32_t sample);
+int32_t mp4ff_get_num_sample_byte_sizes (const mp4ff_t *f, const int32_t track);
+int32_t mp4ff_get_sample_info(const mp4ff_t *f, const int32_t track, const int32_t samplenum, uint32_t *sample_duration, uint32_t *sample_byte_size);
 int32_t mp4ff_get_sample_duration_use_offsets(const mp4ff_t *f, const int32_t track, const int32_t sample);
 int64_t mp4ff_get_sample_position(const mp4ff_t *f, const int32_t track, const int32_t sample);
 int32_t mp4ff_get_sample_offset(const mp4ff_t *f, const int32_t track, const int32_t sample);