void *data;
unsigned written;
unsigned allocated;
- unsigned error;
};
static struct membuffer *membuffer_create(void)
{
- const unsigned initial_size = 256;
-
- struct membuffer *buf = para_malloc(sizeof(*buf));
- buf->data = para_malloc(initial_size);
- buf->written = 0;
- buf->allocated = initial_size;
- buf->error = buf->data == 0 ? 1 : 0;
+ struct membuffer *buf = para_calloc(sizeof(*buf));
+ buf->allocated = 256;
+ buf->data = para_malloc(buf->allocated);
return buf;
}
-static unsigned membuffer_write(struct membuffer *buf, const void *ptr, unsigned bytes)
+static void membuffer_write(struct membuffer *buf, const void *ptr,
+ unsigned bytes)
{
unsigned dest_size = buf->written + bytes;
- if (buf->error)
- return 0;
if (dest_size > buf->allocated) {
do {
buf->allocated <<= 1;
if (ptr)
memcpy((char *) buf->data + buf->written, ptr, bytes);
buf->written += bytes;
- return bytes;
}
-static unsigned membuffer_write_atom_name(struct membuffer *buf, const char *data)
+static void membuffer_write_atom_name(struct membuffer *buf, const char *data)
{
- return membuffer_write(buf, data, 4) == 4 ? 1 : 0;
+ membuffer_write(buf, data, 4);
}
-static unsigned membuffer_write_int32(struct membuffer *buf, uint32_t data)
+static void membuffer_write_int32(struct membuffer *buf, uint32_t data)
{
uint8_t temp[4];
write_u32_be(temp, data);
- return membuffer_write(buf, temp, 4);
+ membuffer_write(buf, temp, 4);
}
static void membuffer_write_std_tag(struct membuffer *buf, const char *name,
membuffer_write(buf, value, len);
}
-static unsigned membuffer_error(const struct membuffer *buf)
-{
- return buf->error;
-}
-
static void membuffer_free(struct membuffer *buf)
{
free(buf->data);
static void *membuffer_detach(struct membuffer *buf)
{
- void *ret;
-
- if (buf->error)
- return 0;
- ret = para_realloc(buf->data, buf->written);
- buf->data = 0;
- buf->error = 1;
+ void *ret = para_realloc(buf->data, buf->written);
+ free(buf);
return ret;
}
else
PARA_ERROR_LOG("invalid tag item: %s\n", tag->item);
}
- if (membuffer_error(buf)) {
- membuffer_free(buf);
- return 0;
- }
-
*out_size = membuffer_get_size(buf);
*out_buffer = membuffer_detach(buf);
- membuffer_free(buf);
-
return 1;
}
return buf->data;
}
-static void membuffer_set_error(struct membuffer *buf)
-{
- buf->error = 1;
-}
-
-static unsigned membuffer_transfer_from_file(struct membuffer *buf, struct mp4 *src,
+static bool membuffer_transfer_from_file(struct membuffer *buf, struct mp4 *src,
unsigned bytes)
{
unsigned oldsize;
void *bufptr;
oldsize = membuffer_get_size(buf);
- if (membuffer_write(buf, 0, bytes) != bytes)
- return 0;
-
+ membuffer_write(buf, 0, bytes);
bufptr = membuffer_get_ptr(buf);
if (bufptr == 0)
- return 0;
+ return false;
if ((unsigned)read_data(src, (char *) bufptr + oldsize, bytes) !=
bytes) {
- membuffer_set_error(buf);
- return 0;
+ membuffer_free(buf);
+ return false;
}
-
- return bytes;
+ return true;
}
static uint32_t create_meta(const struct mp4_metadata *meta, void **out_buffer,
*out_size = membuffer_get_size(buf);
*out_buffer = membuffer_detach(buf);
- membuffer_free(buf);
return 1;
}
*out_size = membuffer_get_size(buf);
*out_buffer = membuffer_detach(buf);
- membuffer_free(buf);
return 1;
}
return read_u32_be(&src);
}
-static uint32_t modify_moov(struct mp4 *f, void **out_buffer,
- uint32_t *out_size)
+static void *modify_moov(struct mp4 *f, uint32_t *out_size)
{
uint64_t total_base = f->moov_offset + 8;
uint32_t total_size = (uint32_t) (f->moov_size - 8);
uint32_t udta_size, meta_size, ilst_size;
uint32_t new_ilst_size;
- void *new_ilst_buffer;
+ void *new_ilst_buffer, *out_buffer;
uint8_t *p_out;
int32_t size_delta;
void *new_udta_buffer;
uint32_t new_udta_size;
if (!create_udta(&f->meta, &new_udta_buffer, &new_udta_size))
- return 0;
+ return NULL;
buf = membuffer_create();
set_position(f, total_base);
- membuffer_transfer_from_file(buf, f, total_size);
-
+ if (!membuffer_transfer_from_file(buf, f, total_size)) {
+ free(new_udta_buffer);
+ return NULL;
+ }
membuffer_write_atom(buf, "udta", new_udta_size,
new_udta_buffer);
free(new_udta_buffer);
*out_size = membuffer_get_size(buf);
- *out_buffer = membuffer_detach(buf);
- membuffer_free(buf);
- return 1;
+ return membuffer_detach(buf);
}
udta_offset = get_position(f);
udta_size = read_int32(f);
uint32_t new_meta_size;
if (!create_meta(&f->meta, &new_meta_buffer, &new_meta_size))
- return 0;
+ return NULL;
buf = membuffer_create();
set_position(f, total_base);
- membuffer_transfer_from_file(buf, f,
- (uint32_t)(udta_offset - total_base));
+ if (!membuffer_transfer_from_file(buf, f,
+ udta_offset - total_base)) {
+ free(new_meta_buffer);
+ return NULL;
+ }
membuffer_write_int32(buf, udta_size + 8 + new_meta_size);
membuffer_write_atom_name(buf, "udta");
- membuffer_transfer_from_file(buf, f, udta_size);
+ if (!membuffer_transfer_from_file(buf, f, udta_size)) {
+ free(new_meta_buffer);
+ return NULL;
+ }
membuffer_write_atom(buf, "meta", new_meta_size,
new_meta_buffer);
free(new_meta_buffer);
*out_size = membuffer_get_size(buf);
- *out_buffer = membuffer_detach(buf);
- membuffer_free(buf);
- return 1;
+ return membuffer_detach(buf);
}
meta_offset = get_position(f);
meta_size = read_int32(f);
+ /* shouldn't happen, find_atom_v2 above takes care of it */
if (!find_atom(f, meta_offset + 12, meta_size - 12, "ilst"))
- return 0; /* shouldn't happen, find_atom_v2 above takes care of it */
+ return NULL;
ilst_offset = get_position(f);
ilst_size = read_int32(f);
if (!create_ilst(&f->meta, &new_ilst_buffer, &new_ilst_size))
- return 0;
+ return NULL;
size_delta = new_ilst_size - (ilst_size - 8);
*out_size = total_size + size_delta;
- *out_buffer = para_malloc(*out_size);
- p_out = (uint8_t *)*out_buffer;
+ out_buffer = para_malloc(*out_size);
+ p_out = out_buffer;
set_position(f, total_base);
read_data(f, p_out, (uint32_t) (udta_offset - total_base));
p_out += (uint32_t) (udta_offset - total_base);
read_data(f, p_out, (uint32_t) (total_size
- (ilst_offset - total_base) - ilst_size));
free(new_ilst_buffer);
- return 1;
+ return out_buffer;
}
static int32_t write_data(struct mp4 *f, void *data, uint32_t size)
uint32_t new_moov_size;
set_position(f, 0);
- if (!modify_moov(f, &new_moov_data, &new_moov_size)) {
+ new_moov_data = modify_moov(f, &new_moov_size);
+ if (!new_moov_data ) {
mp4_close(f);
return 0;
}
projects / paraslash.git / blobdiff