len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2026-07-10 13:29:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

metadata.c small cleanup

Browse source 
add get_metadata_afmt function so we don't have to extra functions
remove unneeded bounds check on audio_format in rbcodec_format_is_atomic()
add bounds check on audio_format in get_metadata_afmt()

Change-Id: I76bd869100b000579c6546f0670ba4ba2c541f22
This commit is contained in:
William Wilgus 2026-06-28 14:24:02 -04:00
parent 3cd286d8f8
commit 24b0254d96
6 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/buffering.c
View file

@ -651,8 +651,8 @@ static bool buffer_handle(int handle_id, size_t to_buffer)
trigger_cpu_boost();
if (h->type == TYPE_ID3) {
get_metadata_ex(ringbuf_ptr(h->data), h->fd, h->path,
probe_file_format(h->path), METADATA_CLOSE_FD_ON_EXIT);
get_metadata_ex(ringbuf_ptr(h->data),
h->fd, h->path, METADATA_CLOSE_FD_ON_EXIT);
h->fd = -1; /* with above, behavior same as close_fd */
h->widx = ringbuf_add(h->data, h->filesize);
h->end = h->filesize;

4
apps/gui/skin_engine/skin_tokens.c
View file

@ -297,7 +297,7 @@ void wps_playlist_percent_prepare(void)
if (afmt != last_afmt || last_bps == 0
|| amount <= 50 || (amount <= 250 && ata_disk_isssd())) // TODO tune this for harddisk devices
{
if (get_metadata_ex(tmp, fd, info.filename, afmt,
if (get_metadata_afmt(tmp, fd, info.filename, afmt,
METADATA_EXCLUDE_ID3_PATH | METADATA_EXCLUDE_NORMALIZE))
{
secs = tmp->length / 1000;
@ -314,7 +314,7 @@ void wps_playlist_percent_prepare(void)
close(fd);
}
#else
if (get_metadata_ex(tmp, -1, info.filename, probe_file_format(info.filename),
if (get_metadata_ex(tmp, -1, info.filename,
METADATA_EXCLUDE_ID3_PATH | METADATA_EXCLUDE_NORMALIZE))
{
secs = tmp->length / 1000;

3
apps/playlist_viewer.c
View file

@ -307,8 +307,7 @@ static bool retrieve_id3_tags(const int index, const char* name, struct mp3entry
if (!id3_retrieval_successful)
{
/* Read from disk: retrieves frequency, file size, and codec */
id3_retrieval_successful = get_metadata_ex(id3, -1, name,
probe_file_format(name), flags);
id3_retrieval_successful = get_metadata_ex(id3, -1, name, flags);
}
return id3_retrieval_successful;
}

2
apps/tagcache.c
View file

@ -2339,7 +2339,7 @@ static void NO_INLINE add_tagcache(char *path, unsigned long mtime)
/*memset(&id3, 0, sizeof(struct mp3entry)); -- get_metadata does this for us */
memset(&entry, 0, sizeof(struct temp_file_entry));
memset(&tracknumfix, 0, sizeof(tracknumfix));
ret = get_metadata_ex(&id3, -1, path, afmt, METADATA_EXCLUDE_ID3_PATH);
ret = get_metadata_afmt(&id3, -1, path, afmt, METADATA_EXCLUDE_ID3_PATH);
if (!ret)
{

32
lib/rbcodec/metadata/metadata.c
View file

@ -51,7 +51,7 @@ static bool get_other_asap_metadata(int fd, struct mp3entry *id3)
id3->frequency = 44100;
id3->vbr = false;
id3->filesize = filesize(fd);
id3->genre_string = id3_get_num_genre(36);
id3->genre_string = id3_get_num_genre(36); /* GAME */
return true;
}
bool write_metadata_log = false;
@ -59,6 +59,7 @@ bool write_metadata_log = false;
const struct afmt_entry audio_formats[AFMT_NUM_CODECS] =
{
/* NOTE enc_root_fname is ignored here but kept for consistency see get_codec_enc_root_fn() */
/*AFMT_ENTRY("label", "root_fname", "enc_root_fname", func, "ext_list")*/
/* Unknown file format */
[0 ... AFMT_NUM_CODECS-1] =
AFMT_ENTRY("???", NULL, "N/A", NULL, "\0" ),
@ -322,20 +323,22 @@ int get_audio_base_codec_type(int type)
return base_type;
}
const char * get_codec_string(int type)
static const struct afmt_entry *get_afmt_entry(int type)
{
if (type < 0 || type >= AFMT_NUM_CODECS)
type = AFMT_UNKNOWN;
return audio_formats[type].label;
return &audio_formats[type];
}
const char * get_codec_string(int type)
{
return get_afmt_entry(type)->label;
}
/* Get the basic audio type */
bool rbcodec_format_is_atomic(int afmt)
{
if ((unsigned)afmt >= AFMT_NUM_CODECS)
return false;
switch (get_audio_base_codec_type(afmt))
{
case AFMT_NSF:
@ -355,7 +358,8 @@ bool rbcodec_format_is_atomic(int afmt)
/* Type must be allocated and loaded in its entirety onto
the buffer */
return true;
case AFMT_UNKNOWN:
return false;
default:
/* Assume type may be loaded and discarded incrementally */
return false;
@ -421,11 +425,12 @@ unsigned int probe_file_format(const char *filename)
* file that would prevent playback. supply a filedescriptor <0 and the file will be opened
* and closed automatically within the get_metadata call
* audio_fmt is AFMT_ enum provided by probe_file_format(trackname),
* get_metadata_ex allows flags to change the way get_metadata behaves
* get_metadata_ex & afmt allow flags to change the way get_metadata behaves
* METADATA_EXCLUDE_ID3_PATH won't copy filename path to the id3 path buffer
* METADATA_CLOSE_FD_ON_EXIT closes the open filedescriptor on exit
* METADATA_EXCLUDE_NORMALIZE won't utf8 normalize the string type id3 entries
*/
bool get_metadata_ex(struct mp3entry* id3, int fd, const char* trackname, int audio_fmt, int flags)
bool get_metadata_afmt(struct mp3entry* id3, int fd, const char* trackname, int audio_fmt, int flags)
{
bool success = true;
const struct afmt_entry *entry;
@ -458,7 +463,7 @@ bool get_metadata_ex(struct mp3entry* id3, int fd, const char* trackname, int au
id3->tracknum = -1;
entry = &audio_formats[id3->codectype];
entry = get_afmt_entry(id3->codectype);
/* Load codec specific track tag information and confirm the codec type. */
if (!entry->parse_func)
@ -516,9 +521,14 @@ log_on_exit:
return success;
}
bool get_metadata_ex(struct mp3entry* id3, int fd, const char* trackname, int flags)
{
return get_metadata_afmt(id3, fd, trackname, probe_file_format(trackname), flags);
}
bool get_metadata(struct mp3entry* id3, int fd, const char* trackname)
{
return get_metadata_ex(id3, fd, trackname, probe_file_format(trackname), 0);
return get_metadata_ex(id3, fd, trackname, 0);
}
#define MOVE_ENTRY(x) if (x) x += offset;

3
lib/rbcodec/metadata/metadata.h
View file

@ -330,7 +330,8 @@ struct mp3entry {
unsigned int probe_file_format(const char *filename); /* returns audio_fmt */
bool get_metadata(struct mp3entry* id3, int fd, const char* trackname);
bool get_metadata_ex(struct mp3entry* id3, int fd, const char* trackname, int audio_fmt, int flags);
bool get_metadata_ex(struct mp3entry* id3, int fd, const char* trackname, int flags);
bool get_metadata_afmt(struct mp3entry* id3, int fd, const char* trackname, int audio_fmt, int flags);
void adjust_mp3entry(struct mp3entry *entry, void *dest, const void *orig);
void copy_mp3entry(struct mp3entry *dest, const struct mp3entry *orig);
void wipe_mp3entry(struct mp3entry *id3);