}
/* comnapre 2 atom names, returns 1 for equal, 0 for unequal */
-static int32_t atom_compare(const int8_t a1, const int8_t b1,
- const int8_t c1, const int8_t d1,
- const int8_t a2, const int8_t b2,
- const int8_t c2, const int8_t d2)
+static int32_t atom_compare(int8_t a1, int8_t b1, int8_t c1, int8_t d1,
+ int8_t a2, int8_t b2, int8_t c2, int8_t d2)
{
if (a1 == a2 && b1 == b2 && c1 == c2 && d1 == d2)
return 1;
#define COPYRIGHT_SYMBOL ((int8_t)0xA9)
-static uint8_t atom_name_to_type(const int8_t a, const int8_t b,
- const int8_t c, const int8_t d)
+static uint8_t atom_name_to_type(int8_t a, int8_t b, int8_t c, int8_t d)
{
if (a == 'm') {
if (atom_compare(a, b, c, d, 'm', 'o', 'o', 'v'))
}
}
-static int32_t set_position(struct mp4ff *f, const int64_t position)
+static int32_t set_position(struct mp4ff *f, int64_t position)
{
f->stream->seek(f->stream->user_data, position);
f->current_position = position;
static int32_t tag_add_field(struct mp4ff_metadata *tags, const char *item,
const char *value, int32_t len)
{
- void *backup = (void *) tags->tags;
-
if (!item || (item && !*item) || !value)
return 0;
- tags->tags = (struct mp4ff_tag *)realloc(tags->tags,
+ tags->tags = para_realloc(tags->tags,
(tags->count + 1) * sizeof(struct mp4ff_tag));
- if (!tags->tags) {
- free(backup);
- return 0;
+ tags->tags[tags->count].item = para_strdup(item);
+ tags->tags[tags->count].len = len;
+ if (len >= 0) {
+ tags->tags[tags->count].value = para_malloc(len + 1);
+ memcpy(tags->tags[tags->count].value, value, len);
+ tags->tags[tags->count].value[len] = 0;
} else {
- tags->tags[tags->count].item = para_strdup(item);
- tags->tags[tags->count].len = len;
- if (len >= 0) {
- tags->tags[tags->count].value = para_malloc(len + 1);
- memcpy(tags->tags[tags->count].value, value, len);
- tags->tags[tags->count].value[len] = 0;
- } else {
- tags->tags[tags->count].value = para_strdup(value);
- }
- tags->count++;
- return 1;
+ tags->tags[tags->count].value = para_strdup(value);
}
+ tags->count++;
+ return 1;
}
static const char *ID3v1GenreList[] = {
return str;
}
-static int32_t set_metadata_name(const uint8_t atom_type, char **name)
+static int32_t set_metadata_name(uint8_t atom_type, char **name)
{
static char *tag_names[] = {
"unknown", "title", "artist", "writer", "album",
return 0;
}
-static uint32_t min_body_size(const uint8_t atom_type)
+static uint32_t min_body_size(uint8_t atom_type)
{
switch(atom_type) {
case ATOM_GENRE2:
}
}
-static int32_t parse_tag(struct mp4ff *f, const uint8_t parent,
- const int32_t size)
+static int32_t parse_tag(struct mp4ff *f, uint8_t parent, int32_t size)
{
uint8_t atom_type;
uint8_t header_size = 0;
return 1;
}
-static int32_t parse_metadata(struct mp4ff *f, const int32_t size)
+static int32_t parse_metadata(struct mp4ff *f, int32_t size)
{
uint64_t subsize, sumsize = 0;
uint8_t atom_type;
return 0;
}
-static int32_t read_meta(struct mp4ff *f, const uint64_t size)
+static int32_t read_meta(struct mp4ff *f, uint64_t size)
{
uint64_t subsize, sumsize = 0;
uint8_t atom_type;
return 0;
}
-static int32_t atom_read(struct mp4ff *f, const int32_t size,
- const uint8_t atom_type)
+static int32_t atom_read(struct mp4ff *f, int32_t size, uint8_t atom_type)
{
uint64_t dest_position = get_position(f) + size - 8;
if (atom_type == ATOM_STSZ) {
}
/* parse atoms that are sub atoms of other atoms */
-static int32_t parse_sub_atoms(struct mp4ff *f, const uint64_t total_size, int meta_only)
+static int32_t parse_sub_atoms(struct mp4ff *f, uint64_t total_size, int meta_only)
{
uint64_t size;
uint8_t atom_type = 0;
return 0;
}
-void mp4ff_get_decoder_config(const struct mp4ff *f, const int track,
- unsigned char **ppBuf, unsigned int *pBufSize)
+void mp4ff_get_decoder_config(const struct mp4ff *f, int track,
+ unsigned char **ppBuf, unsigned int *pBufSize)
{
if (track >= f->total_tracks) {
*ppBuf = NULL;
free(ff);
}
-static int32_t chunk_of_sample(const struct mp4ff *f, const int32_t track,
- const int32_t sample, int32_t * chunk_sample, int32_t * chunk)
+static int32_t chunk_of_sample(const struct mp4ff *f, int32_t track,
+ int32_t sample, int32_t *chunk_sample, int32_t *chunk)
{
int32_t total_entries = 0;
int32_t chunk2entry;
return 0;
}
-static int32_t chunk_to_offset(const struct mp4ff *f, const int32_t track,
- const int32_t chunk)
+static int32_t chunk_to_offset(const struct mp4ff *f, int32_t track,
+ int32_t chunk)
{
const struct mp4ff_track *p_track = f->track[track];
return 0;
}
-static int32_t sample_range_size(const struct mp4ff *f, const int32_t track,
- const int32_t chunk_sample, const int32_t sample)
+static int32_t sample_range_size(const struct mp4ff *f, int32_t track,
+ int32_t chunk_sample, int32_t sample)
{
int32_t i, total;
const struct mp4ff_track *p_track = f->track[track];
return total;
}
-static int32_t sample_to_offset(const struct mp4ff *f, const int32_t track,
- const int32_t sample)
+static int32_t sample_to_offset(const struct mp4ff *f, int32_t track,
+ int32_t sample)
{
int32_t chunk, chunk_sample, chunk_offset1, chunk_offset2;
return chunk_offset2;
}
-void mp4ff_set_sample_position(struct mp4ff *f, const int32_t track,
- const int32_t sample)
+void mp4ff_set_sample_position(struct mp4ff *f, int32_t track, int32_t sample)
{
int32_t offset = sample_to_offset(f, track, sample);
set_position(f, offset);
return t->stsz_table[sample];
}
-uint32_t mp4ff_get_sample_rate(const struct mp4ff *f, const int32_t track)
+uint32_t mp4ff_get_sample_rate(const struct mp4ff *f, int32_t track)
{
return f->track[track]->sampleRate;
}
-uint32_t mp4ff_get_channel_count(const struct mp4ff *f, const int32_t track)
+uint32_t mp4ff_get_channel_count(const struct mp4ff *f, int32_t track)
{
return f->track[track]->channelCount;
}
-int32_t mp4ff_num_samples(const struct mp4ff *f, const int32_t track)
+int32_t mp4ff_num_samples(const struct mp4ff *f, int32_t track)
{
int32_t i;
int32_t total = 0;
do {
buf->allocated <<= 1;
} while (dest_size > buf->allocated);
-
- {
- void *newptr = realloc(buf->data, buf->allocated);
- if (newptr == 0) {
- free(buf->data);
- buf->data = 0;
- buf->error = 1;
- return 0;
- }
- buf->data = newptr;
- }
+ buf->data = para_realloc(buf->data, buf->allocated);
}
if (ptr)
if (buf->error)
return 0;
-
- ret = realloc(buf->data, buf->written);
-
- if (ret == 0)
- free(buf->data);
-
+ ret = para_realloc(buf->data, buf->written);
buf->data = 0;
buf->error = 1;
-
return ret;
}
struct membuffer *buf = membuffer_create();
unsigned metaptr;
char *mask = para_calloc(data->count);
- {
- const char *tracknumber_ptr = 0, *totaltracks_ptr = 0;
- const char *discnumber_ptr = 0, *totaldiscs_ptr = 0;
- const char *genre_ptr = 0, *tempo_ptr = 0;
- for (metaptr = 0; metaptr < data->count; metaptr++) {
- struct mp4ff_tag *tag = &data->tags[metaptr];
- if (!strcasecmp(tag->item, "tracknumber") || !strcasecmp(tag->item, "track")) {
- if (tracknumber_ptr == 0)
- tracknumber_ptr = tag->value;
- mask[metaptr] = 1;
- } else if (!strcasecmp(tag->item, "totaltracks")) {
- if (totaltracks_ptr == 0)
- totaltracks_ptr = tag->value;
- mask[metaptr] = 1;
- } else if (!strcasecmp(tag->item, "discnumber")
- || !strcasecmp(tag->item, "disc")) {
- if (discnumber_ptr == 0)
- discnumber_ptr = tag->value;
- mask[metaptr] = 1;
- } else if (!strcasecmp(tag->item, "totaldiscs")) {
- if (totaldiscs_ptr == 0)
- totaldiscs_ptr = tag->value;
- mask[metaptr] = 1;
- } else if (!strcasecmp(tag->item, "genre")) {
- if (genre_ptr == 0)
- genre_ptr = tag->value;
- mask[metaptr] = 1;
- } else if (!strcasecmp(tag->item, "tempo")) {
- if (tempo_ptr == 0)
- tempo_ptr = tag->value;
- mask[metaptr] = 1;
- }
+ const char *tracknumber_ptr = 0, *totaltracks_ptr = 0;
+ const char *discnumber_ptr = 0, *totaldiscs_ptr = 0;
+ const char *genre_ptr = 0, *tempo_ptr = 0;
- }
-
- if (tracknumber_ptr)
- membuffer_write_track_tag(buf, "trkn",
- myatoi(tracknumber_ptr),
- myatoi(totaltracks_ptr));
- if (discnumber_ptr)
- membuffer_write_track_tag(buf, "disk",
- myatoi(discnumber_ptr),
- myatoi(totaldiscs_ptr));
- if (tempo_ptr)
- membuffer_write_int16_tag(buf, "tmpo",
- (uint16_t) myatoi(tempo_ptr));
-
- if (genre_ptr) {
- uint32_t index = meta_genre_to_index(genre_ptr);
- if (index == 0)
- membuffer_write_std_tag(buf, "©gen",
- genre_ptr);
- else
- membuffer_write_int16_tag(buf, "gnre",
- (uint16_t) index);
+ for (metaptr = 0; metaptr < data->count; metaptr++) {
+ struct mp4ff_tag *tag = &data->tags[metaptr];
+ if (!strcasecmp(tag->item, "tracknumber")
+ || !strcasecmp(tag->item, "track")) {
+ if (tracknumber_ptr == 0)
+ tracknumber_ptr = tag->value;
+ mask[metaptr] = 1;
+ } else if (!strcasecmp(tag->item, "totaltracks")) {
+ if (totaltracks_ptr == 0)
+ totaltracks_ptr = tag->value;
+ mask[metaptr] = 1;
+ } else if (!strcasecmp(tag->item, "discnumber")
+ || !strcasecmp(tag->item, "disc")) {
+ if (discnumber_ptr == 0)
+ discnumber_ptr = tag->value;
+ mask[metaptr] = 1;
+ } else if (!strcasecmp(tag->item, "totaldiscs")) {
+ if (totaldiscs_ptr == 0)
+ totaldiscs_ptr = tag->value;
+ mask[metaptr] = 1;
+ } else if (!strcasecmp(tag->item, "genre")) {
+ if (genre_ptr == 0)
+ genre_ptr = tag->value;
+ mask[metaptr] = 1;
+ } else if (!strcasecmp(tag->item, "tempo")) {
+ if (tempo_ptr == 0)
+ tempo_ptr = tag->value;
+ mask[metaptr] = 1;
}
}
- for (metaptr = 0; metaptr < data->count; metaptr++) {
- if (!mask[metaptr]) {
- struct mp4ff_tag *tag = &data->tags[metaptr];
- const char *std_meta_atom = find_standard_meta(tag->item);
- if (std_meta_atom) {
- membuffer_write_std_tag(buf, std_meta_atom,
- tag->value);
- } else {
- membuffer_write_custom_tag(buf, tag->item,
- tag->value);
- }
- }
+ if (tracknumber_ptr)
+ membuffer_write_track_tag(buf, "trkn", myatoi(tracknumber_ptr),
+ myatoi(totaltracks_ptr));
+ if (discnumber_ptr)
+ membuffer_write_track_tag(buf, "disk", myatoi(discnumber_ptr),
+ myatoi(totaldiscs_ptr));
+ if (tempo_ptr)
+ membuffer_write_int16_tag(buf, "tmpo", myatoi(tempo_ptr));
+
+ if (genre_ptr) {
+ uint32_t index = meta_genre_to_index(genre_ptr);
+ if (index == 0)
+ membuffer_write_std_tag(buf, "©gen", genre_ptr);
+ else
+ membuffer_write_int16_tag(buf, "gnre", index);
}
+ for (metaptr = 0; metaptr < data->count; metaptr++) {
+ struct mp4ff_tag *tag;
+ const char *std_meta_atom;
+ if (mask[metaptr])
+ continue;
+ tag = &data->tags[metaptr];
+ std_meta_atom = find_standard_meta(tag->item);
+ if (std_meta_atom)
+ membuffer_write_std_tag(buf, std_meta_atom, tag->value);
+ else
+ membuffer_write_custom_tag(buf, tag->item, tag->value);
+ }
free(mask);
if (membuffer_error(buf)) {
return result;
}
-static int32_t write_int32(struct mp4ff *f, const uint32_t data)
+static int32_t write_int32(struct mp4ff *f, uint32_t data)
{
int8_t temp[4];
write_u32_be(temp, data);
projects / paraslash.git / blobdiff