mirror of
https://github.com/raysan5/raylib.git
synced 2025-12-25 10:22:33 -05:00
Update external libraries
Switch to official `stb_vorbis.c` instead of using an outdated fork
This commit is contained in:
Ray
84
src/external/dr_mp3.h
vendored
84
src/external/dr_mp3.h
vendored
@ -1,6 +1,6 @@
|
||||
/*
|
||||
MP3 audio decoder. Choice of public domain or MIT-0. See license statements at the end of this file.
|
||||
dr_mp3 - v0.6.31 - 2021-08-22
|
||||
dr_mp3 - v0.6.34 - 2022-09-17
|
||||
|
||||
David Reid - mackron@gmail.com
|
||||
|
||||
@ -95,7 +95,7 @@ extern "C" {
|
||||
|
||||
#define DRMP3_VERSION_MAJOR 0
|
||||
#define DRMP3_VERSION_MINOR 6
|
||||
#define DRMP3_VERSION_REVISION 31
|
||||
#define DRMP3_VERSION_REVISION 34
|
||||
#define DRMP3_VERSION_STRING DRMP3_XSTRINGIFY(DRMP3_VERSION_MAJOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_MINOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_REVISION)
|
||||
|
||||
#include <stddef.h> /* For size_t. */
|
||||
@ -107,7 +107,7 @@ typedef signed short drmp3_int16;
|
||||
typedef unsigned short drmp3_uint16;
|
||||
typedef signed int drmp3_int32;
|
||||
typedef unsigned int drmp3_uint32;
|
||||
#if defined(_MSC_VER)
|
||||
#if defined(_MSC_VER) && !defined(__clang__)
|
||||
typedef signed __int64 drmp3_int64;
|
||||
typedef unsigned __int64 drmp3_uint64;
|
||||
#else
|
||||
@ -235,9 +235,15 @@ typedef drmp3_int32 drmp3_result;
|
||||
I am using "__inline__" only when we're compiling in strict ANSI mode.
|
||||
*/
|
||||
#if defined(__STRICT_ANSI__)
|
||||
#define DRMP3_INLINE __inline__ __attribute__((always_inline))
|
||||
#define DRMP3_GNUC_INLINE_HINT __inline__
|
||||
#else
|
||||
#define DRMP3_INLINE inline __attribute__((always_inline))
|
||||
#define DRMP3_GNUC_INLINE_HINT inline
|
||||
#endif
|
||||
|
||||
#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)) || defined(__clang__)
|
||||
#define DRMP3_INLINE DRMP3_GNUC_INLINE_HINT __attribute__((always_inline))
|
||||
#else
|
||||
#define DRMP3_INLINE DRMP3_GNUC_INLINE_HINT
|
||||
#endif
|
||||
#elif defined(__WATCOMC__)
|
||||
#define DRMP3_INLINE __inline
|
||||
@ -340,7 +346,6 @@ typedef struct
|
||||
typedef struct
|
||||
{
|
||||
drmp3dec decoder;
|
||||
drmp3dec_frame_info frameInfo;
|
||||
drmp3_uint32 channels;
|
||||
drmp3_uint32 sampleRate;
|
||||
drmp3_read_proc onRead;
|
||||
@ -595,7 +600,7 @@ DRMP3_API const char* drmp3_version_string(void)
|
||||
#define DR_MP3_ONLY_SIMD
|
||||
#endif
|
||||
|
||||
#if ((defined(_MSC_VER) && _MSC_VER >= 1400) && (defined(_M_IX86) || defined(_M_X64))) || ((defined(__i386__) || defined(__x86_64__)) && defined(__SSE2__))
|
||||
#if ((defined(_MSC_VER) && _MSC_VER >= 1400) && defined(_M_X64)) || ((defined(__i386) || defined(_M_IX86) || defined(__i386__) || defined(__x86_64__)) && ((defined(_M_IX86_FP) && _M_IX86_FP == 2) || defined(__SSE2__)))
|
||||
#if defined(_MSC_VER)
|
||||
#include <intrin.h>
|
||||
#endif
|
||||
@ -1296,7 +1301,7 @@ static void drmp3_L3_huffman(float *dst, drmp3_bs *bs, const drmp3_L3_gr_info *g
|
||||
static const drmp3_int16 tabindex[2*16] = { 0,32,64,98,0,132,180,218,292,364,426,538,648,746,0,1126,1460,1460,1460,1460,1460,1460,1460,1460,1842,1842,1842,1842,1842,1842,1842,1842 };
|
||||
static const drmp3_uint8 g_linbits[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,3,4,6,8,10,13,4,5,6,7,8,9,11,13 };
|
||||
|
||||
#define DRMP3_PEEK_BITS(n) (bs_cache >> (32 - n))
|
||||
#define DRMP3_PEEK_BITS(n) (bs_cache >> (32 - (n)))
|
||||
#define DRMP3_FLUSH_BITS(n) { bs_cache <<= (n); bs_sh += (n); }
|
||||
#define DRMP3_CHECK_BITS while (bs_sh >= 0) { bs_cache |= (drmp3_uint32)*bs_next_ptr++ << bs_sh; bs_sh -= 8; }
|
||||
#define DRMP3_BSPOS ((bs_next_ptr - bs->buf)*8 - 24 + bs_sh)
|
||||
@ -1864,7 +1869,7 @@ static void drmp3d_DCT_II(float *grbuf, int n)
|
||||
#if DRMP3_HAVE_SSE
|
||||
#define DRMP3_VSAVE2(i, v) _mm_storel_pi((__m64 *)(void*)&y[i*18], v)
|
||||
#else
|
||||
#define DRMP3_VSAVE2(i, v) vst1_f32((float32_t *)&y[i*18], vget_low_f32(v))
|
||||
#define DRMP3_VSAVE2(i, v) vst1_f32((float32_t *)&y[(i)*18], vget_low_f32(v))
|
||||
#endif
|
||||
for (i = 0; i < 7; i++, y += 4*18)
|
||||
{
|
||||
@ -1880,7 +1885,7 @@ static void drmp3d_DCT_II(float *grbuf, int n)
|
||||
DRMP3_VSAVE2(3, t[3][7]);
|
||||
} else
|
||||
{
|
||||
#define DRMP3_VSAVE4(i, v) DRMP3_VSTORE(&y[i*18], v)
|
||||
#define DRMP3_VSAVE4(i, v) DRMP3_VSTORE(&y[(i)*18], v)
|
||||
for (i = 0; i < 7; i++, y += 4*18)
|
||||
{
|
||||
drmp3_f4 s = DRMP3_VADD(t[3][i], t[3][i + 1]);
|
||||
@ -2103,7 +2108,11 @@ static void drmp3d_synth(float *xl, drmp3d_sample_t *dstl, int nch, float *lins)
|
||||
vst1_lane_s16(dstl + (49 + i)*nch, pcmb, 2);
|
||||
#endif
|
||||
#else
|
||||
#if DRMP3_HAVE_SSE
|
||||
static const drmp3_f4 g_scale = { 1.0f/32768.0f, 1.0f/32768.0f, 1.0f/32768.0f, 1.0f/32768.0f };
|
||||
#else
|
||||
const drmp3_f4 g_scale = vdupq_n_f32(1.0f/32768.0f);
|
||||
#endif
|
||||
a = DRMP3_VMUL(a, g_scale);
|
||||
b = DRMP3_VMUL(b, g_scale);
|
||||
#if DRMP3_HAVE_SSE
|
||||
@ -2406,8 +2415,6 @@ DRMP3_API void drmp3dec_f32_to_s16(const float *in, drmp3_int16 *out, size_t num
|
||||
Main Public API
|
||||
|
||||
************************************************************************************************************************************************************/
|
||||
#include <math.h> /* For sin() and exp(). */
|
||||
|
||||
#if defined(SIZE_MAX)
|
||||
#define DRMP3_SIZE_MAX SIZE_MAX
|
||||
#else
|
||||
@ -2427,7 +2434,7 @@ DRMP3_API void drmp3dec_f32_to_s16(const float *in, drmp3_int16 *out, size_t num
|
||||
|
||||
/* The size in bytes of each chunk of data to read from the MP3 stream. minimp3 recommends at least 16K, but in an attempt to reduce data movement I'm making this slightly larger. */
|
||||
#ifndef DRMP3_DATA_CHUNK_SIZE
|
||||
#define DRMP3_DATA_CHUNK_SIZE DRMP3_MIN_DATA_CHUNK_SIZE*4
|
||||
#define DRMP3_DATA_CHUNK_SIZE (DRMP3_MIN_DATA_CHUNK_SIZE*4)
|
||||
#endif
|
||||
|
||||
|
||||
@ -2472,24 +2479,6 @@ static DRMP3_INLINE drmp3_uint32 drmp3_gcf_u32(drmp3_uint32 a, drmp3_uint32 b)
|
||||
}
|
||||
|
||||
|
||||
static DRMP3_INLINE double drmp3_sin(double x)
|
||||
{
|
||||
/* TODO: Implement custom sin(x). */
|
||||
return sin(x);
|
||||
}
|
||||
|
||||
static DRMP3_INLINE double drmp3_exp(double x)
|
||||
{
|
||||
/* TODO: Implement custom exp(x). */
|
||||
return exp(x);
|
||||
}
|
||||
|
||||
static DRMP3_INLINE double drmp3_cos(double x)
|
||||
{
|
||||
return drmp3_sin((DRMP3_PI_D*0.5) - x);
|
||||
}
|
||||
|
||||
|
||||
static void* drmp3__malloc_default(size_t sz, void* pUserData)
|
||||
{
|
||||
(void)pUserData;
|
||||
@ -3434,10 +3423,23 @@ static drmp3_result drmp3_wfopen(FILE** ppFile, const wchar_t* pFilePath, const
|
||||
}
|
||||
#else
|
||||
/*
|
||||
Use fopen() on anything other than Windows. Requires a conversion. This is annoying because fopen() is locale specific. The only real way I can
|
||||
think of to do this is with wcsrtombs(). Note that wcstombs() is apparently not thread-safe because it uses a static global mbstate_t object for
|
||||
maintaining state. I've checked this with -std=c89 and it works, but if somebody get's a compiler error I'll look into improving compatibility.
|
||||
Use fopen() on anything other than Windows. Requires a conversion. This is annoying because
|
||||
fopen() is locale specific. The only real way I can think of to do this is with wcsrtombs(). Note
|
||||
that wcstombs() is apparently not thread-safe because it uses a static global mbstate_t object for
|
||||
maintaining state. I've checked this with -std=c89 and it works, but if somebody get's a compiler
|
||||
error I'll look into improving compatibility.
|
||||
*/
|
||||
|
||||
/*
|
||||
Some compilers don't support wchar_t or wcsrtombs() which we're using below. In this case we just
|
||||
need to abort with an error. If you encounter a compiler lacking such support, add it to this list
|
||||
and submit a bug report and it'll be added to the library upstream.
|
||||
*/
|
||||
#if defined(__DJGPP__)
|
||||
{
|
||||
/* Nothing to do here. This will fall through to the error check below. */
|
||||
}
|
||||
#else
|
||||
{
|
||||
mbstate_t mbs;
|
||||
size_t lenMB;
|
||||
@ -3479,6 +3481,7 @@ static drmp3_result drmp3_wfopen(FILE** ppFile, const wchar_t* pFilePath, const
|
||||
|
||||
drmp3__free_from_callbacks(pFilePathMB, pAllocationCallbacks);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (*ppFile == NULL) {
|
||||
return DRMP3_ERROR;
|
||||
@ -4473,6 +4476,19 @@ counts rather than sample counts.
|
||||
/*
|
||||
REVISION HISTORY
|
||||
================
|
||||
v0.6.34 - 2022-09-17
|
||||
- Fix compilation with DJGPP.
|
||||
- Fix compilation when compiling with x86 with no SSE2.
|
||||
- Remove an unnecessary variable from the drmp3 structure.
|
||||
|
||||
v0.6.33 - 2022-04-10
|
||||
- Fix compilation error with the MSVC ARM64 build.
|
||||
- Fix compilation error on older versions of GCC.
|
||||
- Remove some unused functions.
|
||||
|
||||
v0.6.32 - 2021-12-11
|
||||
- Fix a warning with Clang.
|
||||
|
||||
v0.6.31 - 2021-08-22
|
||||
- Fix a bug when loading from memory.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user