mp4: Rename parse_metadata() to read_ilst().

[paraslash.git] / mp4.c

diff --git a/mp4.c b/mp4.c
index 3167a132b1b6ca7a230d37df8c49f1c9abc9a12b..ba5146a992aa8dd705157be6953be58efe8e2d3c 100644 (file)
--- a/mp4.c
+++ b/mp4.c
@@ -699,7 +699,7 @@ static int32_t read_mdhd(struct mp4 *f)
        return 1;
 }
 
-static int32_t parse_metadata(struct mp4 *f, int32_t size)
+static int32_t read_ilst(struct mp4 *f, int32_t size)
 {
        uint64_t sumsize = 0;
 
@@ -739,11 +739,10 @@ static int32_t read_meta(struct mp4 *f, uint64_t size)
                subsize = atom_read_header(f, &atom_type, &header_size);
                if (subsize <= header_size + 4)
                        return 1;
-               if (atom_type == ATOM_ILST) {
-                       parse_metadata(f, (uint32_t) (subsize - (header_size + 4)));
-               } else {
+               if (atom_type == ATOM_ILST)
+                       read_ilst(f, subsize - (header_size + 4));
+               else
                        set_position(f, get_position(f) + subsize - header_size);
-               }
                sumsize += subsize;
        }
 
@@ -1206,24 +1205,19 @@ static unsigned membuffer_write_int32(struct membuffer *buf, uint32_t data)
 static void membuffer_write_std_tag(struct membuffer *buf, const char *name,
                const char *value)
 {
-       uint32_t flags = 1;
-
-       /* special check for compilation flag */
-       if (strcmp(name, "cpil") == 0) {
-               flags = 21;
-       }
-
-       membuffer_write_int32(buf,
-               8 /*atom header */  + 8 /*data atom header */  +
-               8 /*flags + reserved */  + strlen(value));
+       uint32_t len = strlen(value);
+       membuffer_write_int32(buf, 8 /* atom header */
+               + 8 /* data atom header */
+               + 8 /* flags + reserved */
+               + len);
        membuffer_write_atom_name(buf, name);
-       membuffer_write_int32(buf,
-               8 /*data atom header */  +
-               8 /*flags + reserved */  + strlen(value));
+       membuffer_write_int32(buf, 8 /* data atom header */
+               + 8 /* flags + reserved */
+               + len);
        membuffer_write_atom_name(buf, "data");
-       membuffer_write_int32(buf, flags);      //flags
-       membuffer_write_int32(buf, 0);  //reserved
-       membuffer_write(buf, value, strlen(value));
+       membuffer_write_int32(buf, 1);  /* flags */
+       membuffer_write_int32(buf, 0);  /* reserved */
+       membuffer_write(buf, value, len);
 }
 
 static unsigned membuffer_error(const struct membuffer *buf)