mp4: Remove const qualifier from non-pointer function arguments.

[paraslash.git] / mp4.c

diff --git a/mp4.c b/mp4.c
index 32871727b345ab61ff3b0498a69de772c387cabd..40d8bd1bb79d5e5d2806fd4c771bd9e13bc0ac1f 100644 (file)
--- a/mp4.c
+++ b/mp4.c
@@ -113,10 +113,8 @@ static uint64_t read_int64(struct mp4ff *f)
 }
 
 /* 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;
@@ -215,8 +213,7 @@ enum atoms {
 
 #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'))
@@ -421,7 +418,7 @@ static int need_parse_when_meta_only(uint8_t atom_type)
        }
 }
 
-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;
@@ -842,7 +839,7 @@ static char *read_string(struct mp4ff *f, uint32_t length)
        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",
@@ -956,7 +953,7 @@ static int32_t set_metadata_name(const uint8_t atom_type, char **name)
        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:
@@ -979,8 +976,7 @@ static uint32_t min_body_size(const uint8_t atom_type)
        }
 }
 
-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;
@@ -1102,7 +1098,7 @@ static int32_t read_mdhd(struct mp4ff *f)
        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;
@@ -1119,7 +1115,7 @@ static int32_t parse_metadata(struct mp4ff *f, const int32_t size)
        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;
@@ -1143,8 +1139,7 @@ static int32_t read_meta(struct mp4ff *f, const uint64_t size)
        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) {
@@ -1181,7 +1176,7 @@ static int32_t atom_read(struct mp4ff *f, const int32_t size,
 }
 
 /* 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;
@@ -1248,8 +1243,8 @@ static int32_t parse_atoms(struct mp4ff *f, int meta_only)
        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;
@@ -1324,8 +1319,8 @@ void mp4ff_close(struct mp4ff *ff)
        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;
@@ -1370,8 +1365,8 @@ static int32_t chunk_of_sample(const struct mp4ff *f, const int32_t track,
        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];
 
@@ -1387,8 +1382,8 @@ static int32_t chunk_to_offset(const struct mp4ff *f, const int32_t 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];
@@ -1407,8 +1402,8 @@ static int32_t sample_range_size(const struct mp4ff *f, const int32_t 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;
 
@@ -1420,8 +1415,7 @@ static int32_t sample_to_offset(const struct mp4ff *f, const int32_t track,
        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);
@@ -1436,17 +1430,17 @@ int32_t mp4ff_get_sample_size(const struct mp4ff *f, int track, int sample)
        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;
@@ -1564,8 +1558,6 @@ struct membuffer {
        unsigned error;
 };
 
-#define stricmp strcasecmp
-
 static struct membuffer *membuffer_create(void)
 {
        const unsigned initial_size = 256;
@@ -1672,7 +1664,7 @@ static uint32_t meta_genre_to_index(const char *genrestr)
 {
        unsigned n;
        for (n = 0; n < sizeof (ID3v1GenreList) / sizeof (ID3v1GenreList[0]); n++) {
-               if (!stricmp(genrestr, ID3v1GenreList[n]))
+               if (!strcasecmp(genrestr, ID3v1GenreList[n]))
                        return n + 1;
        }
        return 0;
@@ -1700,7 +1692,7 @@ static const char *find_standard_meta(const char *name)   //returns atom name if f
 {
        unsigned n;
        for (n = 0; n < sizeof (stdmetas) / sizeof (stdmetas[0]); n++) {
-               if (!stricmp(name, stdmetas[n].name))
+               if (!strcasecmp(name, stdmetas[n].name))
                        return stdmetas[n].atom;
        }
        return 0;
@@ -1795,78 +1787,70 @@ static uint32_t create_ilst(const struct mp4ff_metadata *data, void **out_buffer
        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 (!stricmp(tag->item, "tracknumber") || !stricmp(tag->item, "track")) {
-                               if (tracknumber_ptr == 0)
-                                       tracknumber_ptr = tag->value;
-                               mask[metaptr] = 1;
-                       } else if (!stricmp(tag->item, "totaltracks")) {
-                               if (totaltracks_ptr == 0)
-                                       totaltracks_ptr = tag->value;
-                               mask[metaptr] = 1;
-                       } else if (!stricmp(tag->item, "discnumber")
-                                       || !stricmp(tag->item, "disc")) {
-                               if (discnumber_ptr == 0)
-                                       discnumber_ptr = tag->value;
-                               mask[metaptr] = 1;
-                       } else if (!stricmp(tag->item, "totaldiscs")) {
-                               if (totaldiscs_ptr == 0)
-                                       totaldiscs_ptr = tag->value;
-                               mask[metaptr] = 1;
-                       } else if (!stricmp(tag->item, "genre")) {
-                               if (genre_ptr == 0)
-                                       genre_ptr = tag->value;
-                               mask[metaptr] = 1;
-                       } else if (!stricmp(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)) {
@@ -2096,7 +2080,7 @@ static int32_t write_data(struct mp4ff *f, void *data, uint32_t size)
        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);
@@ -2157,7 +2141,7 @@ static int32_t meta_find_by_name(const struct mp4ff *f, const char *item,
        uint32_t i;
 
        for (i = 0; i < f->tags.count; i++) {
-               if (!stricmp(f->tags.tags[i].item, item)) {
+               if (!strcasecmp(f->tags.tags[i].item, item)) {
                        *value = para_strdup(f->tags.tags[i].value);
                        return 1;
                }