mp4: Drop metadata parameter from mp4_meta_update().

[paraslash.git] / mp4.c

diff --git a/mp4.c b/mp4.c
index d2a54eb2b0c4370dfe0010a669681f2398f8e6dd..1158a381f9b54f3a175ca9f55d5c5c620b15e63b 100644 (file)
--- a/mp4.c
+++ b/mp4.c
@@ -1105,23 +1105,17 @@ struct mp4 *mp4_open_meta(const struct mp4_callback *cb)
        return f;
 }
 
-int32_t mp4_meta_get_num_items(const struct mp4 *f)
-{
-       return f->tags.count;
-}
-
-int32_t mp4_meta_get_by_index(const struct mp4 *f, uint32_t index,
-                               char **item, char **value)
+/**
+ * Return the metadata of an mp4 file.
+ *
+ * \param f As returned by either \ref mp4_open_read() or \ref mp4_open_meta().
+ *
+ * The caller is allowed to add, delete or modify the entries of the returned
+ * structure in order to pass the modified version to \ref mp4_meta_update().
+ */
+struct mp4_metadata *mp4_get_meta(struct mp4 *f)
 {
-       if (index >= f->tags.count) {
-               *item = NULL;
-               *value = NULL;
-               return 0;
-       } else {
-               *item = para_strdup(f->tags.tags[index].item);
-               *value = para_strdup(f->tags.tags[index].value);
-               return 1;
-       }
+       return &f->tags;
 }
 
 static uint32_t find_atom(struct mp4 *f, uint64_t base, uint32_t size,
@@ -1577,8 +1571,8 @@ static uint32_t fix_byte_order_32(uint32_t src)
        return read_u32_be(&src);
 }
 
-static uint32_t modify_moov(struct mp4 *f, const struct mp4_metadata *data,
-               void **out_buffer, uint32_t * out_size)
+static uint32_t modify_moov(struct mp4 *f, void **out_buffer,
+               uint32_t *out_size)
 {
        uint64_t total_base = f->moov_offset + 8;
        uint32_t total_size = (uint32_t) (f->moov_size - 8);
@@ -1596,7 +1590,7 @@ static uint32_t modify_moov(struct mp4 *f, const struct mp4_metadata *data,
                struct membuffer *buf;
                void *new_udta_buffer;
                uint32_t new_udta_size;
-               if (!create_udta(data, &new_udta_buffer, &new_udta_size))
+               if (!create_udta(&f->tags, &new_udta_buffer, &new_udta_size))
                        return 0;
 
                buf = membuffer_create();
@@ -1619,7 +1613,8 @@ static uint32_t modify_moov(struct mp4 *f, const struct mp4_metadata *data,
                        struct membuffer *buf;
                        void *new_meta_buffer;
                        uint32_t new_meta_size;
-                       if (!create_meta(data, &new_meta_buffer, &new_meta_size))
+
+                       if (!create_meta(&f->tags, &new_meta_buffer, &new_meta_size))
                                return 0;
 
                        buf = membuffer_create();
@@ -1647,7 +1642,7 @@ static uint32_t modify_moov(struct mp4 *f, const struct mp4_metadata *data,
                ilst_offset = get_position(f);
                ilst_size = read_int32(f);
 
-               if (!create_ilst(data, &new_ilst_buffer, &new_ilst_size))
+               if (!create_ilst(&f->tags, &new_ilst_buffer, &new_ilst_size))
                        return 0;
 
                size_delta = new_ilst_size - (ilst_size - 8);
@@ -1709,21 +1704,16 @@ static int32_t write_int32(struct mp4 *f, uint32_t data)
        return write_data(f, temp, sizeof(temp));
 }
 
-int32_t mp4_meta_update(const struct mp4_callback *cb,
-               const struct mp4_metadata *data)
+int32_t mp4_meta_update(struct mp4 *f)
 {
        void *new_moov_data;
        uint32_t new_moov_size;
 
-       struct mp4 *f = para_calloc(sizeof(struct mp4));
-       f->cb = cb;
        set_position(f, 0);
-       parse_atoms(f, 1);
-       if (!modify_moov(f, data, &new_moov_data, &new_moov_size)) {
+       if (!modify_moov(f, &new_moov_data, &new_moov_size)) {
                mp4_close(f);
                return 0;
        }
-
        /* copy moov atom to end of the file */
        if (f->last_atom != ATOM_MOOV) {
                char *free_data = "free";
@@ -1743,8 +1733,7 @@ int32_t mp4_meta_update(const struct mp4_callback *cb,
                write_data(f, new_moov_data, new_moov_size);
        }
        free(new_moov_data);
-       cb->truncate(cb->user_data);
-       mp4_close(f);
+       f->cb->truncate(f->cb->user_data);
        return 1;
 }