mp4: Merge read_mp4a() into read_stsd().

[paraslash.git] / mp4.c

diff --git a/mp4.c b/mp4.c
index 08812c89b18345bb238ae117572ea9fc8c67b3d6..365dce6550a5a150d1736cd194de8318667f4492 100644 (file)
--- a/mp4.c
+++ b/mp4.c
@@ -90,7 +90,7 @@ static int read_int64(struct mp4 *f, uint64_t *result)
        uint8_t data[8];
        int ret = read_data(f, data, 8);
 
-       if (ret > 0 && result)
+       if (ret > 0)
                *result = read_u64_be(data);
        return ret;
 }
@@ -100,41 +100,21 @@ static int read_int32(struct mp4 *f, uint32_t *result)
        uint8_t data[4];
        int ret = read_data(f, data, 4);
 
-       if (ret > 0 && result)
+       if (ret > 0)
                *result = read_u32_be(data);
        return ret;
 }
 
-static int read_int24(struct mp4 *f, uint32_t *result)
-{
-       uint8_t data[3];
-       int ret = read_data(f, data, 3);
-
-       if (ret > 0 && result)
-               *result = read_u24_be(data);
-       return ret;
-}
-
 static int read_int16(struct mp4 *f, uint16_t *result)
 {
        uint8_t data[2];
        int ret = read_data(f, data, 2);
 
-       if (ret > 0 && result)
+       if (ret > 0)
                *result = read_u16_be(data);
        return ret;
 }
 
-static uint8_t read_int8(struct mp4 *f, uint8_t *result)
-{
-       uint8_t data[1];
-       int ret = read_data(f, data, 1);
-
-       if (ret > 0 && result)
-               *result = data[0];
-       return ret;
-}
-
 #define ATOM_ITEMS \
        ATOM_ITEM(MOOV, 'm', 'o', 'o', 'v') \
        ATOM_ITEM(TRAK, 't', 'r', 'a', 'k') \
@@ -218,6 +198,11 @@ static void set_position(struct mp4 *f, off_t position)
        f->cb->seek(f->cb->user_data, position, SEEK_SET);
 }
 
+static void skip_bytes(struct mp4 *f, off_t num_skip)
+{
+       f->cb->seek(f->cb->user_data, num_skip, SEEK_CUR);
+}
+
 static int read_stsz(struct mp4 *f)
 {
        int ret;
@@ -227,12 +212,7 @@ static int read_stsz(struct mp4 *f)
        if (f->total_tracks == 0)
                return -1;
        t = f->track[f->total_tracks - 1];
-       ret = read_int8(f, NULL); /* version */
-       if (ret <= 0)
-               return ret;
-       ret = read_int24(f, NULL); /* flags */
-       if (ret <= 0)
-               return ret;
+       skip_bytes(f, 4); /* version (1), flags (3) */
        ret = read_int32(f, &t->stsz_sample_size);
        if (ret <= 0)
                return ret;
@@ -261,12 +241,7 @@ static int read_stts(struct mp4 *f)
        t = f->track[f->total_tracks - 1];
        if (t->stts_entry_count)
                return 0;
-       ret = read_int8(f, NULL); /* version */
-       if (ret <= 0)
-               return ret;
-       ret = read_int24(f, NULL); /* flags */
-       if (ret <= 0)
-               return ret;
+       skip_bytes(f, 4); /* version (1), flags (3) */
        ret = read_int32(f, &t->stts_entry_count);
        if (ret <= 0)
                return ret;
@@ -276,9 +251,7 @@ static int read_stts(struct mp4 *f)
                ret = read_int32(f, &t->stts_sample_count[i]);
                if (ret <= 0)
                        return ret;
-               ret = read_int32(f, NULL); /* sample delta */
-               if (ret <= 0)
-                       return ret;
+               skip_bytes(f, 4); /* sample delta */
        }
        return 1;
 }
@@ -293,12 +266,7 @@ static int read_stsc(struct mp4 *f)
                return -1;
        t = f->track[f->total_tracks - 1];
 
-       ret = read_int8(f, NULL); /* version */
-       if (ret <= 0)
-               return ret;
-       ret = read_int24(f, NULL); /* flags */
-       if (ret <= 0)
-               return ret;
+       skip_bytes(f, 4); /* version (1), flags (3) */
        ret = read_int32(f, &t->stsc_entry_count);
        if (ret <= 0)
                return ret;
@@ -312,9 +280,7 @@ static int read_stsc(struct mp4 *f)
                ret = read_int32(f, &t->stsc_samples_per_chunk[i]);
                if (ret <= 0)
                        return ret;
-               ret = read_int32(f, NULL); /* sample desc index */
-               if (ret <= 0)
-                       return ret;
+               skip_bytes(f, 4); /* sample desc index */
        }
        return 1;
 }
@@ -329,12 +295,7 @@ static int read_stco(struct mp4 *f)
                return -1;
        t = f->track[f->total_tracks - 1];
 
-       ret = read_int8(f, NULL); /* version */
-       if (ret <= 0)
-               return ret;
-       ret = read_int24(f, NULL); /* flags */
-       if (ret <= 0)
-               return ret;
+       skip_bytes(f, 4); /* version (1), flags (3) */
        ret = read_int32(f, &t->stco_entry_count);
        if (ret <= 0)
                return ret;
@@ -348,45 +309,6 @@ static int read_stco(struct mp4 *f)
        return 1;
 }
 
-static int read_mp4a(struct mp4 *f)
-{
-       int ret;
-       int32_t i;
-       struct mp4_track *t;
-
-       if (f->total_tracks == 0)
-               return -1;
-       t = f->track[f->total_tracks - 1];
-
-       for (i = 0; i < 6; i++) {
-               ret = read_int8(f, NULL); /* reserved */
-               if (ret <= 0)
-                       return ret;
-       }
-       ret = read_int16(f, NULL); /* data_reference_index */
-       if (ret <= 0)
-               return ret;
-       ret = read_int32(f, NULL); /* reserved */
-       if (ret <= 0)
-               return ret;
-       ret = read_int32(f, NULL); /* reserved */
-       if (ret <= 0)
-               return ret;
-       ret = read_int16(f, &t->channel_count);
-       if (ret <= 0)
-               return ret;
-       ret = read_int16(f, NULL);
-       if (ret <= 0)
-               return ret;
-       ret = read_int16(f, NULL);
-       if (ret <= 0)
-               return ret;
-       ret = read_int16(f, NULL);
-       if (ret <= 0)
-               return ret;
-       return read_int16(f, &t->sample_rate);
-}
-
 static int read_stsd(struct mp4 *f)
 {
        int ret;
@@ -396,12 +318,7 @@ static int read_stsd(struct mp4 *f)
        if (f->total_tracks == 0)
                return -1;
        t = f->track[f->total_tracks - 1];
-       ret = read_int8(f, NULL); /* version */
-       if (ret <= 0)
-               return ret;
-       ret = read_int24(f, NULL); /* flags */
-       if (ret <= 0)
-               return ret;
+       skip_bytes(f, 4); /* version (1), flags (3) */
        ret = read_int32(f, &entry_count);
        if (ret <= 0)
                return ret;
@@ -415,7 +332,15 @@ static int read_stsd(struct mp4 *f)
                skip += size;
                if (!f->audio_track && atom_type == ATOM_MP4A) {
                        f->audio_track = t;
-                       read_mp4a(f);
+                       /* reserved (6), data reference index (2), reserved (8) */
+                       skip_bytes(f, 16);
+                       ret = read_int16(f, &t->channel_count);
+                       if (ret <= 0)
+                               return ret;
+                       skip_bytes(f, 6);
+                       ret = read_int16(f, &t->sample_rate);
+                       if (ret <= 0)
+                               return ret;
                }
                set_position(f, skip);
        }
@@ -456,15 +381,7 @@ static int parse_tag(struct mp4 *f, uint8_t parent, int32_t size)
                destpos = get_position(f) + subsize - header_size;
                if (atom_type != ATOM_DATA)
                        continue;
-               ret = read_int8(f, NULL); /* version */
-               if (ret <= 0)
-                       goto fail;
-               ret = read_int24(f, NULL); /* flags */
-               if (ret <= 0)
-                       goto fail;
-               ret = read_int32(f, NULL); /* reserved */
-               if (ret <= 0)
-                       goto fail;
+               skip_bytes(f, 8); /* version (1), flags (3), reserved (4) */
                ret = -ERRNO_TO_PARA_ERROR(EINVAL);
                if (subsize < header_size + 8 || subsize > UINT_MAX)
                        goto fail;
@@ -505,12 +422,7 @@ static int read_mdhd(struct mp4 *f)
        if (ret <= 0)
                return ret;
        if (version == 1) {
-               ret = read_int64(f, NULL); /* creation-time */
-               if (ret <= 0)
-                       return ret;
-               ret = read_int64(f, NULL); /* modification-time */
-               if (ret <= 0)
-                       return ret;
+               skip_bytes(f, 16); /* creation time (8), modification time (8) */
                ret = read_int32(f, &t->time_scale);
                if (ret <= 0)
                        return ret;
@@ -520,12 +432,7 @@ static int read_mdhd(struct mp4 *f)
        } else { //version == 0
                uint32_t temp;
 
-               ret = read_int32(f, NULL); /* creation-time */
-               if (ret <= 0)
-                       return ret;
-               ret = read_int32(f, NULL); /* modification-time */
-               if (ret <= 0)
-                       return ret;
+               skip_bytes(f, 8); /* creation time (4), modification time (4) */
                ret = read_int32(f, &t->time_scale);
                if (ret <= 0)
                        return ret;
@@ -535,12 +442,7 @@ static int read_mdhd(struct mp4 *f)
                t->duration = (temp == (uint32_t) (-1))?
                        (uint64_t) (-1) : (uint64_t) (temp);
        }
-       ret = read_int16(f, NULL);
-       if (ret <= 0)
-               return ret;
-       ret = read_int16(f, NULL);
-       if (ret <= 0)
-               return ret;
+       skip_bytes(f, 4);
        return 1;
 }
 
@@ -580,12 +482,7 @@ static int32_t read_meta(struct mp4 *f, uint64_t size)
        uint8_t atom_type;
        uint8_t header_size = 0;
 
-       ret = read_int8(f, NULL); /* version */
-       if (ret <= 0)
-               return ret;
-       ret = read_int24(f, NULL); /* flags */
-       if (ret <= 0)
-               return ret;
+       skip_bytes(f, 4); /* version (1), flags (3) */
        while (sumsize < (size - (header_size + 4))) {
                ret = atom_read_header(f, &atom_type, &header_size, &subsize);
                if (ret <= 0)