Skip to content

[SDL2] Fixed detection of FLAC files with ID3 tag at begin #526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[SDL2] Fixed detection of FLAC files with ID3 tag at begin #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions src/codecs/mp3utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,4 +1173,29 @@ int read_id3v2_from_mem(Mix_MusicMetaTags *out_tags, Uint8 *data, size_t length)
}
return -1;
}

long get_id3v2_length(SDL_RWops *src)
{
Uint8 buf[TAGS_INPUT_BUFFER_SIZE];
size_t readsize;
Sint64 start;

if(!src) {
return -1;
}

start = SDL_RWtell(src);
readsize = SDL_RWread(src, buf, 1, TAGS_INPUT_BUFFER_SIZE);
SDL_RWseek(src, start, RW_SEEK_SET);

if (!readsize) {
return -1;
}

if (!is_id3v2(buf, readsize)) {
return -1;
}

return get_id3v2_len(buf, (long)readsize);
}
#endif /* ENABLE_ID3V2_TAG */
1 change: 1 addition & 0 deletions src/codecs/mp3utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ extern int mp3_read_tags(Mix_MusicMetaTags *out_tags, struct mp3file_t *fil, SDL

#ifdef ENABLE_ID3V2_TAG
extern int read_id3v2_from_mem(Mix_MusicMetaTags *out_tags, Uint8 *data, size_t length);
extern long get_id3v2_length(SDL_RWops *src);
#endif

#ifdef ENABLE_ALL_MP3_TAGS
Expand Down
27 changes: 26 additions & 1 deletion src/music.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@
#include "native_midi/native_midi.h"

#include "utils.h"
#if defined(MUSIC_FLAC_DRFLAC) || defined(MUSIC_FLAC_LIBFLAC)
#define ID3_EXTRA_FORMAT_CHECKS
#include "mp3utils.h"
#endif

/* Check to make sure we are building with a new enough SDL */
#if SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 7)
Expand Down Expand Up @@ -551,12 +555,18 @@ SDL_bool has_music(Mix_MusicType type)
Mix_MusicType detect_music_type(SDL_RWops *src)
{
Uint8 magic[12];
Sint64 start = SDL_RWtell(src);
#ifdef ID3_EXTRA_FORMAT_CHECKS
Uint8 submagic[4];
long id3len = 0;
size_t readlen = 0;
#endif

if (SDL_RWread(src, magic, 1, 12) != 12) {
Mix_SetError("Couldn't read first 12 bytes of audio data");
return MUS_NONE;
}
SDL_RWseek(src, -12, RW_SEEK_CUR);
SDL_RWseek(src, start, RW_SEEK_SET);

/* WAVE files have the magic four bytes "RIFF"
AIFF files have the magic 12 bytes "FORM" XXXX "AIFF" */
Expand Down Expand Up @@ -594,6 +604,21 @@ Mix_MusicType detect_music_type(SDL_RWops *src)
if (SDL_memcmp(magic, "ID3", 3) == 0 ||
/* see: https://bugzilla.libsdl.org/show_bug.cgi?id=5322 */
(magic[0] == 0xFF && (magic[1] & 0xE6) == 0xE2)) {
#ifdef ID3_EXTRA_FORMAT_CHECKS
id3len = get_id3v2_length(src);

/* Check if there is something not an MP3, however, also has ID3 tag */
if (id3len > 0) {
SDL_RWseek(src, id3len, RW_SEEK_CUR);
readlen = SDL_RWread(src, submagic, 1, 4);
SDL_RWseek(src, start, RW_SEEK_SET);

if (readlen == 4) {
if (SDL_memcmp(submagic, "fLaC", 4) == 0)
return MUS_FLAC;
}
}
#endif
return MUS_MP3;
}

Expand Down