Skip to content

Commit

Permalink
stb_vorbis: sync with stb_vorbis SDL fork, and SDL_mixer
Browse files Browse the repository at this point in the history
  • Loading branch information
@sezero
sezero committed Feb 21, 2025
1 parent 74bc83a commit f7fc5aa
Showing 1 changed file with 26 additions and 24 deletions.
50 changes: 26 additions & 24 deletions src/stb_vorbis.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,8 @@ extern stb_vorbis * stb_vorbis_open_file_section(FILE *f, int close_handle_on_cl
#endif

#ifdef STB_VORBIS_SDL
extern stb_vorbis * stb_vorbis_open_rwops_section(SDL_IOStream *rwops, int close_on_free, int *error, const stb_vorbis_alloc *alloc, unsigned int length);
extern stb_vorbis * stb_vorbis_open_rwops(SDL_IOStream *rwops, int close_on_free, int *error, const stb_vorbis_alloc *alloc);
extern stb_vorbis * stb_vorbis_open_io_section(SDL_IOStream *io, int close_on_free, int *error, const stb_vorbis_alloc *alloc, unsigned int length);
extern stb_vorbis * stb_vorbis_open_io(SDL_IOStream *io, int close_on_free, int *error, const stb_vorbis_alloc *alloc);
#endif

extern int stb_vorbis_seek_frame(stb_vorbis *f, unsigned int sample_number);
Expand Down Expand Up @@ -620,8 +620,10 @@ enum STBVorbisError
#include <limits.h>

#ifndef STB_FORCEINLINE
#if defined(_MSC_VER)
#if defined(_MSC_VER) && (_MSC_VER >= 1200)
#define STB_FORCEINLINE __forceinline
#elif defined(_MSC_VER)
#define STB_FORCEINLINE static __inline
#elif (defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))) || defined(__clang__)
#define STB_FORCEINLINE static __inline __attribute__((always_inline))
#else
Expand Down Expand Up @@ -832,8 +834,8 @@ struct stb_vorbis
int close_on_free;
#endif
#ifdef STB_VORBIS_SDL
SDL_IOStream *rwops;
uint32 rwops_start;
SDL_IOStream *io;
uint32 io_start;
int close_on_free;
#endif

Expand Down Expand Up @@ -1399,7 +1401,7 @@ static uint8 get8(vorb *z)
{
#ifdef STB_VORBIS_SDL
uint8 c;
if (SDL_ReadIO(z->rwops, &c, 1) != 1) { z->eof = TRUE; return 0; }
if (SDL_ReadIO(z->io, &c, 1) != 1) { z->eof = TRUE; return 0; }
return c;

#else
Expand Down Expand Up @@ -1431,7 +1433,7 @@ static uint32 get32(vorb *f)
static int getn(vorb *z, uint8 *data, int n)
{
#ifdef STB_VORBIS_SDL
if (SDL_ReadIO(z->rwops, data, n) == n) return 1;
if (SDL_ReadIO(z->io, data, n) == (size_t)n) return 1;
z->eof = 1;
return 0;

Expand All @@ -1457,7 +1459,7 @@ static int getn(vorb *z, uint8 *data, int n)
static void skip(vorb *z, int n)
{
#ifdef STB_VORBIS_SDL
SDL_SeekIO(z->rwops, n, SDL_IO_SEEK_CUR);
SDL_SeekIO(z->io, n, SDL_IO_SEEK_CUR);

#else
if (USE_MEMORY(z)) {
Expand All @@ -1483,16 +1485,16 @@ static int set_file_offset(stb_vorbis *f, unsigned int loc)
f->eof = 0;

#ifdef STB_VORBIS_SDL
if (loc + f->rwops_start < loc || loc >= 0x80000000) {
if (loc + f->io_start < loc || loc >= 0x80000000) {
loc = 0x7fffffff;
f->eof = 1;
} else {
loc += f->rwops_start;
loc += f->io_start;
}
if (SDL_SeekIO(f->rwops, loc, SDL_IO_SEEK_SET) != -1)
if (SDL_SeekIO(f->io, loc, SDL_IO_SEEK_SET) != -1)
return 1;
f->eof = 1;
SDL_SeekIO(f->rwops, f->rwops_start, SDL_IO_SEEK_END);
SDL_SeekIO(f->io, f->io_start, SDL_IO_SEEK_END);
return 0;

#else
Expand Down Expand Up @@ -3766,7 +3768,7 @@ static int start_decoder(vorb *f)
f->comment_list = NULL;
if (f->comment_list_length > 0)
{
if (INT_MAX / sizeof(char*) < f->comment_list_length)
if (INT_MAX / (int)sizeof(char*) < f->comment_list_length)
goto no_comment;
len = sizeof(char*) * f->comment_list_length;
f->comment_list = (char**) setup_malloc(f, len);
Expand Down Expand Up @@ -4408,7 +4410,7 @@ static void vorbis_deinit(stb_vorbis *p)
setup_temp_free(p, &p->temp_mults, 0);
}
#ifdef STB_VORBIS_SDL
if (p->close_on_free) SDL_CloseIO(p->rwops);
if (p->close_on_free) SDL_CloseIO(p->io);
#endif
#ifndef STB_VORBIS_NO_STDIO
if (p->close_on_free) fclose(p->f);
Expand Down Expand Up @@ -4437,7 +4439,7 @@ static void vorbis_init(stb_vorbis *p, const stb_vorbis_alloc *z)
p->page_crc_tests = -1;
#ifdef STB_VORBIS_SDL
p->close_on_free = FALSE;
p->rwops = NULL;
p->io = NULL;
#endif
#ifndef STB_VORBIS_NO_STDIO
p->close_on_free = FALSE;
Expand Down Expand Up @@ -4709,7 +4711,7 @@ unsigned int stb_vorbis_get_file_offset(stb_vorbis *f)
if (f->push_mode) return 0;
#endif
#ifdef STB_VORBIS_SDL
return (unsigned int) (SDL_TellIO(f->rwops) - f->rwops_start);
return (unsigned int) (SDL_TellIO(f->io) - f->io_start);
#else
if (USE_MEMORY(f)) return (unsigned int) (f->stream - f->stream_start);
#endif
Expand Down Expand Up @@ -5271,12 +5273,12 @@ stb_vorbis * stb_vorbis_open_filename(const char *filename, int *error, const st
#endif // STB_VORBIS_NO_STDIO

#ifdef STB_VORBIS_SDL
stb_vorbis * stb_vorbis_open_rwops_section(SDL_IOStream *rwops, int close_on_free, int *error, const stb_vorbis_alloc *alloc, unsigned int length)
stb_vorbis * stb_vorbis_open_io_section(SDL_IOStream *io, int close_on_free, int *error, const stb_vorbis_alloc *alloc, unsigned int length)
{
stb_vorbis *f, p;
vorbis_init(&p, alloc);
p.rwops = rwops;
p.rwops_start = (uint32) SDL_TellIO(rwops);
p.io = io;
p.io_start = (uint32) SDL_TellIO(io);
p.stream_len = length;
p.close_on_free = close_on_free;
if (start_decoder(&p)) {
Expand All @@ -5292,11 +5294,11 @@ stb_vorbis * stb_vorbis_open_rwops_section(SDL_IOStream *rwops, int close_on_fre
return NULL;
}

stb_vorbis * stb_vorbis_open_rwops(SDL_IOStream *rwops, int close_on_free, int *error, const stb_vorbis_alloc *alloc)
stb_vorbis * stb_vorbis_open_io(SDL_IOStream *io, int close_on_free, int *error, const stb_vorbis_alloc *alloc)
{
const unsigned int start = (unsigned int) SDL_TellIO(rwops);
const unsigned int len = (unsigned int) (SDL_GetIOSize(rwops) - start);
return stb_vorbis_open_rwops_section(rwops, close_on_free, error, alloc, len);
const unsigned int start = (unsigned int) SDL_TellIO(io);
const unsigned int len = (unsigned int) (SDL_GetIOSize(io) - start);
return stb_vorbis_open_io_section(io, close_on_free, error, alloc, len);
}
#endif

Expand Down Expand Up @@ -5518,7 +5520,7 @@ static int fixup_current_playback_loc(stb_vorbis *f, int n)

f->current_playback_loc += n;
lgs = stb_vorbis_stream_length_in_samples(f);
if (f->current_playback_loc > lgs && lgs > 0 && lgs != SAMPLE_unknown) {
if (lgs != 0 && lgs != SAMPLE_unknown && f->current_playback_loc > (int)lgs) {
int r = n - (f->current_playback_loc - (int)lgs);
f->current_playback_loc = lgs;
return r;
Expand Down

0 comments on commit f7fc5aa

Please sign in to comment.