From bcb1b6fdd7a95348403f77d209c09e885654f672 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Wed, 11 Aug 2021 21:56:09 +0200 Subject: [PATCH] mp4: Mark callback function pointers as const. The code in mp4.c never modifies any of the members of the callback structure. --- mp4.c | 9 +++++---- mp4.h | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mp4.c b/mp4.c index 23bd7934..b8746e32 100644 --- a/mp4.c +++ b/mp4.c @@ -44,7 +44,7 @@ struct mp4_track { #define MAX_TRACKS 1024 struct mp4 { - struct mp4_callback *cb; + const struct mp4_callback *cb; int64_t current_position; uint64_t moov_offset; @@ -1066,7 +1066,7 @@ static int32_t parse_atoms(struct mp4 *f, int meta_only) return 0; } -struct mp4 *mp4_open_read(struct mp4_callback *cb) +struct mp4 *mp4_open_read(const struct mp4_callback *cb) { struct mp4 *f = para_calloc(sizeof(struct mp4)); @@ -1279,7 +1279,7 @@ int32_t mp4_num_samples(const struct mp4 *f, int32_t track) return total; } -struct mp4 *mp4_open_meta(struct mp4_callback *cb) +struct mp4 *mp4_open_meta(const struct mp4_callback *cb) { struct mp4 *f = para_calloc(sizeof(struct mp4)); @@ -1896,7 +1896,8 @@ static int32_t write_int32(struct mp4 *f, uint32_t data) return write_data(f, temp, sizeof(temp)); } -int32_t mp4_meta_update(struct mp4_callback *cb, const struct mp4_metadata *data) +int32_t mp4_meta_update(const struct mp4_callback *cb, + const struct mp4_metadata *data) { void *new_moov_data; uint32_t new_moov_size; diff --git a/mp4.h b/mp4.h index 1690b0da..7e9d24b8 100644 --- a/mp4.h +++ b/mp4.h @@ -22,18 +22,19 @@ struct mp4; /* opaque */ void mp4_set_sample_position(struct mp4 *f, int32_t track, int32_t sample); int32_t mp4_total_tracks(const struct mp4 *f); bool mp4_is_audio_track(const struct mp4 *f, int32_t track); -struct mp4 *mp4_open_read(struct mp4_callback *cb); +struct mp4 *mp4_open_read(const struct mp4_callback *cb); void mp4_close(struct mp4 *f); int32_t mp4_get_sample_size(const struct mp4 *f, int track, int sample); uint32_t mp4_get_sample_rate(const struct mp4 *f, int32_t track); uint32_t mp4_get_channel_count(const struct mp4 * f, int32_t track); int32_t mp4_num_samples(const struct mp4 *f, int track); uint64_t mp4_get_duration(const struct mp4 *f, int32_t track); -struct mp4 *mp4_open_meta(struct mp4_callback *cb); +struct mp4 *mp4_open_meta(const struct mp4_callback *cb); int mp4_meta_get_by_index(const struct mp4 *f, unsigned int index, char **item, char **value); -int32_t mp4_meta_update(struct mp4_callback *cb, const struct mp4_metadata *data); +int32_t mp4_meta_update(const struct mp4_callback *cb, + const struct mp4_metadata *data); int mp4_meta_get_num_items(const struct mp4 *f); int mp4_meta_get_artist(const struct mp4 *f, char **value); -- 2.39.5