mirror of
https://github.com/mackron/miniaudio.git
synced 2026-04-24 09:14:04 +02:00
Update dr_libs.
This commit is contained in:
+28
-8
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
FLAC audio decoder. Choice of public domain or MIT-0. See license statements at the end of this file.
|
FLAC audio decoder. Choice of public domain or MIT-0. See license statements at the end of this file.
|
||||||
dr_flac - v0.12.20 - 2020-09-08
|
dr_flac - v0.12.21 - 2020-11-01
|
||||||
|
|
||||||
David Reid - mackron@gmail.com
|
David Reid - mackron@gmail.com
|
||||||
|
|
||||||
@@ -232,7 +232,7 @@ extern "C" {
|
|||||||
|
|
||||||
#define DRFLAC_VERSION_MAJOR 0
|
#define DRFLAC_VERSION_MAJOR 0
|
||||||
#define DRFLAC_VERSION_MINOR 12
|
#define DRFLAC_VERSION_MINOR 12
|
||||||
#define DRFLAC_VERSION_REVISION 20
|
#define DRFLAC_VERSION_REVISION 21
|
||||||
#define DRFLAC_VERSION_STRING DRFLAC_XSTRINGIFY(DRFLAC_VERSION_MAJOR) "." DRFLAC_XSTRINGIFY(DRFLAC_VERSION_MINOR) "." DRFLAC_XSTRINGIFY(DRFLAC_VERSION_REVISION)
|
#define DRFLAC_VERSION_STRING DRFLAC_XSTRINGIFY(DRFLAC_VERSION_MAJOR) "." DRFLAC_XSTRINGIFY(DRFLAC_VERSION_MINOR) "." DRFLAC_XSTRINGIFY(DRFLAC_VERSION_REVISION)
|
||||||
|
|
||||||
#include <stddef.h> /* For size_t. */
|
#include <stddef.h> /* For size_t. */
|
||||||
@@ -248,7 +248,7 @@ typedef unsigned int drflac_uint32;
|
|||||||
typedef signed __int64 drflac_int64;
|
typedef signed __int64 drflac_int64;
|
||||||
typedef unsigned __int64 drflac_uint64;
|
typedef unsigned __int64 drflac_uint64;
|
||||||
#else
|
#else
|
||||||
#if defined(__GNUC__)
|
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
|
||||||
#pragma GCC diagnostic push
|
#pragma GCC diagnostic push
|
||||||
#pragma GCC diagnostic ignored "-Wlong-long"
|
#pragma GCC diagnostic ignored "-Wlong-long"
|
||||||
#if defined(__clang__)
|
#if defined(__clang__)
|
||||||
@@ -257,7 +257,7 @@ typedef unsigned int drflac_uint32;
|
|||||||
#endif
|
#endif
|
||||||
typedef signed long long drflac_int64;
|
typedef signed long long drflac_int64;
|
||||||
typedef unsigned long long drflac_uint64;
|
typedef unsigned long long drflac_uint64;
|
||||||
#if defined(__GNUC__)
|
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
|
||||||
#pragma GCC diagnostic pop
|
#pragma GCC diagnostic pop
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
@@ -1319,7 +1319,7 @@ DRFLAC_API drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterat
|
|||||||
#define dr_flac_c
|
#define dr_flac_c
|
||||||
|
|
||||||
/* Disable some annoying warnings. */
|
/* Disable some annoying warnings. */
|
||||||
#if defined(__GNUC__)
|
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
|
||||||
#pragma GCC diagnostic push
|
#pragma GCC diagnostic push
|
||||||
#if __GNUC__ >= 7
|
#if __GNUC__ >= 7
|
||||||
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
|
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
|
||||||
@@ -1367,7 +1367,15 @@ DRFLAC_API drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterat
|
|||||||
#define DRFLAC_ARM
|
#define DRFLAC_ARM
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Intrinsics Support */
|
/*
|
||||||
|
Intrinsics Support
|
||||||
|
|
||||||
|
There's a bug in GCC 4.2.x which results in an incorrect compilation error when using _mm_slli_epi32() where it complains with
|
||||||
|
|
||||||
|
"error: shift must be an immediate"
|
||||||
|
|
||||||
|
Unfortuantely dr_flac depends on this for a few things so we're just going to disable SSE on GCC 4.2 and below.
|
||||||
|
*/
|
||||||
#if !defined(DR_FLAC_NO_SIMD)
|
#if !defined(DR_FLAC_NO_SIMD)
|
||||||
#if defined(DRFLAC_X64) || defined(DRFLAC_X86)
|
#if defined(DRFLAC_X64) || defined(DRFLAC_X86)
|
||||||
#if defined(_MSC_VER) && !defined(__clang__)
|
#if defined(_MSC_VER) && !defined(__clang__)
|
||||||
@@ -1378,7 +1386,7 @@ DRFLAC_API drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterat
|
|||||||
#if _MSC_VER >= 1600 && !defined(DRFLAC_NO_SSE41) /* 2010 */
|
#if _MSC_VER >= 1600 && !defined(DRFLAC_NO_SSE41) /* 2010 */
|
||||||
#define DRFLAC_SUPPORT_SSE41
|
#define DRFLAC_SUPPORT_SSE41
|
||||||
#endif
|
#endif
|
||||||
#else
|
#elif defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC__ >= 3)))
|
||||||
/* Assume GNUC-style. */
|
/* Assume GNUC-style. */
|
||||||
#if defined(__SSE2__) && !defined(DRFLAC_NO_SSE2)
|
#if defined(__SSE2__) && !defined(DRFLAC_NO_SSE2)
|
||||||
#define DRFLAC_SUPPORT_SSE2
|
#define DRFLAC_SUPPORT_SSE2
|
||||||
@@ -5741,6 +5749,9 @@ static drflac_bool32 drflac__seek_to_approximate_flac_frame_to_byte(drflac* pFla
|
|||||||
*pLastSuccessfulSeekOffset = pFlac->firstFLACFramePosInBytes;
|
*pLastSuccessfulSeekOffset = pFlac->firstFLACFramePosInBytes;
|
||||||
|
|
||||||
for (;;) {
|
for (;;) {
|
||||||
|
/* After rangeLo == rangeHi == targetByte fails, we need to break out. */
|
||||||
|
drflac_uint64 lastTargetByte = targetByte;
|
||||||
|
|
||||||
/* When seeking to a byte, failure probably means we've attempted to seek beyond the end of the stream. To counter this we just halve it each attempt. */
|
/* When seeking to a byte, failure probably means we've attempted to seek beyond the end of the stream. To counter this we just halve it each attempt. */
|
||||||
if (!drflac__seek_to_byte(&pFlac->bs, targetByte)) {
|
if (!drflac__seek_to_byte(&pFlac->bs, targetByte)) {
|
||||||
/* If we couldn't even seek to the first byte in the stream we have a problem. Just abandon the whole thing. */
|
/* If we couldn't even seek to the first byte in the stream we have a problem. Just abandon the whole thing. */
|
||||||
@@ -5781,6 +5792,11 @@ static drflac_bool32 drflac__seek_to_approximate_flac_frame_to_byte(drflac* pFla
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* We already tried this byte and there are no more to try, break out. */
|
||||||
|
if(targetByte == lastTargetByte) {
|
||||||
|
return DRFLAC_FALSE;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* The current PCM frame needs to be updated based on the frame we just seeked to. */
|
/* The current PCM frame needs to be updated based on the frame we just seeked to. */
|
||||||
@@ -11763,7 +11779,7 @@ DRFLAC_API drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterat
|
|||||||
return DRFLAC_TRUE;
|
return DRFLAC_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(__GNUC__)
|
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
|
||||||
#pragma GCC diagnostic pop
|
#pragma GCC diagnostic pop
|
||||||
#endif
|
#endif
|
||||||
#endif /* dr_flac_c */
|
#endif /* dr_flac_c */
|
||||||
@@ -11773,6 +11789,10 @@ DRFLAC_API drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterat
|
|||||||
/*
|
/*
|
||||||
REVISION HISTORY
|
REVISION HISTORY
|
||||||
================
|
================
|
||||||
|
v0.12.21 - 2020-11-01
|
||||||
|
- Fix a possible deadlock when seeking.
|
||||||
|
- Improve compiler support for older versions of GCC.
|
||||||
|
|
||||||
v0.12.20 - 2020-09-08
|
v0.12.20 - 2020-09-08
|
||||||
- Fix a compilation error on older compilers.
|
- Fix a compilation error on older compilers.
|
||||||
|
|
||||||
|
|||||||
+7
-4
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
MP3 audio decoder. Choice of public domain or MIT-0. See license statements at the end of this file.
|
MP3 audio decoder. Choice of public domain or MIT-0. See license statements at the end of this file.
|
||||||
dr_mp3 - v0.6.17 - 2020-09-28
|
dr_mp3 - v0.6.18 - 2020-11-01
|
||||||
|
|
||||||
David Reid - mackron@gmail.com
|
David Reid - mackron@gmail.com
|
||||||
|
|
||||||
@@ -95,7 +95,7 @@ extern "C" {
|
|||||||
|
|
||||||
#define DRMP3_VERSION_MAJOR 0
|
#define DRMP3_VERSION_MAJOR 0
|
||||||
#define DRMP3_VERSION_MINOR 6
|
#define DRMP3_VERSION_MINOR 6
|
||||||
#define DRMP3_VERSION_REVISION 17
|
#define DRMP3_VERSION_REVISION 18
|
||||||
#define DRMP3_VERSION_STRING DRMP3_XSTRINGIFY(DRMP3_VERSION_MAJOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_MINOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_REVISION)
|
#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. */
|
#include <stddef.h> /* For size_t. */
|
||||||
@@ -111,7 +111,7 @@ typedef unsigned int drmp3_uint32;
|
|||||||
typedef signed __int64 drmp3_int64;
|
typedef signed __int64 drmp3_int64;
|
||||||
typedef unsigned __int64 drmp3_uint64;
|
typedef unsigned __int64 drmp3_uint64;
|
||||||
#else
|
#else
|
||||||
#if defined(__GNUC__)
|
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
|
||||||
#pragma GCC diagnostic push
|
#pragma GCC diagnostic push
|
||||||
#pragma GCC diagnostic ignored "-Wlong-long"
|
#pragma GCC diagnostic ignored "-Wlong-long"
|
||||||
#if defined(__clang__)
|
#if defined(__clang__)
|
||||||
@@ -120,7 +120,7 @@ typedef unsigned int drmp3_uint32;
|
|||||||
#endif
|
#endif
|
||||||
typedef signed long long drmp3_int64;
|
typedef signed long long drmp3_int64;
|
||||||
typedef unsigned long long drmp3_uint64;
|
typedef unsigned long long drmp3_uint64;
|
||||||
#if defined(__GNUC__)
|
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
|
||||||
#pragma GCC diagnostic pop
|
#pragma GCC diagnostic pop
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
@@ -4432,6 +4432,9 @@ counts rather than sample counts.
|
|||||||
/*
|
/*
|
||||||
REVISION HISTORY
|
REVISION HISTORY
|
||||||
================
|
================
|
||||||
|
v0.6.18 - 2020-11-01
|
||||||
|
- Improve compiler support for older versions of GCC.
|
||||||
|
|
||||||
v0.6.17 - 2020-09-28
|
v0.6.17 - 2020-09-28
|
||||||
- Bring up to date with minimp3.
|
- Bring up to date with minimp3.
|
||||||
|
|
||||||
|
|||||||
+7
-4
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
WAV audio loader and writer. Choice of public domain or MIT-0. See license statements at the end of this file.
|
WAV audio loader and writer. Choice of public domain or MIT-0. See license statements at the end of this file.
|
||||||
dr_wav - v0.12.12 - 2020-09-28
|
dr_wav - v0.12.13 - 2020-11-01
|
||||||
|
|
||||||
David Reid - mackron@gmail.com
|
David Reid - mackron@gmail.com
|
||||||
|
|
||||||
@@ -144,7 +144,7 @@ extern "C" {
|
|||||||
|
|
||||||
#define DRWAV_VERSION_MAJOR 0
|
#define DRWAV_VERSION_MAJOR 0
|
||||||
#define DRWAV_VERSION_MINOR 12
|
#define DRWAV_VERSION_MINOR 12
|
||||||
#define DRWAV_VERSION_REVISION 12
|
#define DRWAV_VERSION_REVISION 13
|
||||||
#define DRWAV_VERSION_STRING DRWAV_XSTRINGIFY(DRWAV_VERSION_MAJOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_MINOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_REVISION)
|
#define DRWAV_VERSION_STRING DRWAV_XSTRINGIFY(DRWAV_VERSION_MAJOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_MINOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_REVISION)
|
||||||
|
|
||||||
#include <stddef.h> /* For size_t. */
|
#include <stddef.h> /* For size_t. */
|
||||||
@@ -160,7 +160,7 @@ typedef unsigned int drwav_uint32;
|
|||||||
typedef signed __int64 drwav_int64;
|
typedef signed __int64 drwav_int64;
|
||||||
typedef unsigned __int64 drwav_uint64;
|
typedef unsigned __int64 drwav_uint64;
|
||||||
#else
|
#else
|
||||||
#if defined(__GNUC__)
|
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
|
||||||
#pragma GCC diagnostic push
|
#pragma GCC diagnostic push
|
||||||
#pragma GCC diagnostic ignored "-Wlong-long"
|
#pragma GCC diagnostic ignored "-Wlong-long"
|
||||||
#if defined(__clang__)
|
#if defined(__clang__)
|
||||||
@@ -169,7 +169,7 @@ typedef unsigned int drwav_uint32;
|
|||||||
#endif
|
#endif
|
||||||
typedef signed long long drwav_int64;
|
typedef signed long long drwav_int64;
|
||||||
typedef unsigned long long drwav_uint64;
|
typedef unsigned long long drwav_uint64;
|
||||||
#if defined(__GNUC__)
|
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
|
||||||
#pragma GCC diagnostic pop
|
#pragma GCC diagnostic pop
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
@@ -6033,6 +6033,9 @@ two different ways to initialize a drwav object.
|
|||||||
/*
|
/*
|
||||||
REVISION HISTORY
|
REVISION HISTORY
|
||||||
================
|
================
|
||||||
|
v0.12.13 - 2020-11-01
|
||||||
|
- Improve compiler support for older versions of GCC.
|
||||||
|
|
||||||
v0.12.12 - 2020-09-28
|
v0.12.12 - 2020-09-28
|
||||||
- Add support for RF64.
|
- Add support for RF64.
|
||||||
- Fix a bug in writing mode where the size of the RIFF chunk incorrectly includes the header section.
|
- Fix a bug in writing mode where the size of the RIFF chunk incorrectly includes the header section.
|
||||||
|
|||||||
+16
-12
@@ -42874,7 +42874,7 @@ extern "C" {
|
|||||||
#define DRWAV_XSTRINGIFY(x) DRWAV_STRINGIFY(x)
|
#define DRWAV_XSTRINGIFY(x) DRWAV_STRINGIFY(x)
|
||||||
#define DRWAV_VERSION_MAJOR 0
|
#define DRWAV_VERSION_MAJOR 0
|
||||||
#define DRWAV_VERSION_MINOR 12
|
#define DRWAV_VERSION_MINOR 12
|
||||||
#define DRWAV_VERSION_REVISION 12
|
#define DRWAV_VERSION_REVISION 13
|
||||||
#define DRWAV_VERSION_STRING DRWAV_XSTRINGIFY(DRWAV_VERSION_MAJOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_MINOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_REVISION)
|
#define DRWAV_VERSION_STRING DRWAV_XSTRINGIFY(DRWAV_VERSION_MAJOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_MINOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_REVISION)
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
typedef signed char drwav_int8;
|
typedef signed char drwav_int8;
|
||||||
@@ -42887,7 +42887,7 @@ typedef unsigned int drwav_uint32;
|
|||||||
typedef signed __int64 drwav_int64;
|
typedef signed __int64 drwav_int64;
|
||||||
typedef unsigned __int64 drwav_uint64;
|
typedef unsigned __int64 drwav_uint64;
|
||||||
#else
|
#else
|
||||||
#if defined(__GNUC__)
|
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
|
||||||
#pragma GCC diagnostic push
|
#pragma GCC diagnostic push
|
||||||
#pragma GCC diagnostic ignored "-Wlong-long"
|
#pragma GCC diagnostic ignored "-Wlong-long"
|
||||||
#if defined(__clang__)
|
#if defined(__clang__)
|
||||||
@@ -42896,7 +42896,7 @@ typedef unsigned int drwav_uint32;
|
|||||||
#endif
|
#endif
|
||||||
typedef signed long long drwav_int64;
|
typedef signed long long drwav_int64;
|
||||||
typedef unsigned long long drwav_uint64;
|
typedef unsigned long long drwav_uint64;
|
||||||
#if defined(__GNUC__)
|
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
|
||||||
#pragma GCC diagnostic pop
|
#pragma GCC diagnostic pop
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
@@ -43247,7 +43247,7 @@ extern "C" {
|
|||||||
#define DRFLAC_XSTRINGIFY(x) DRFLAC_STRINGIFY(x)
|
#define DRFLAC_XSTRINGIFY(x) DRFLAC_STRINGIFY(x)
|
||||||
#define DRFLAC_VERSION_MAJOR 0
|
#define DRFLAC_VERSION_MAJOR 0
|
||||||
#define DRFLAC_VERSION_MINOR 12
|
#define DRFLAC_VERSION_MINOR 12
|
||||||
#define DRFLAC_VERSION_REVISION 20
|
#define DRFLAC_VERSION_REVISION 21
|
||||||
#define DRFLAC_VERSION_STRING DRFLAC_XSTRINGIFY(DRFLAC_VERSION_MAJOR) "." DRFLAC_XSTRINGIFY(DRFLAC_VERSION_MINOR) "." DRFLAC_XSTRINGIFY(DRFLAC_VERSION_REVISION)
|
#define DRFLAC_VERSION_STRING DRFLAC_XSTRINGIFY(DRFLAC_VERSION_MAJOR) "." DRFLAC_XSTRINGIFY(DRFLAC_VERSION_MINOR) "." DRFLAC_XSTRINGIFY(DRFLAC_VERSION_REVISION)
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
typedef signed char drflac_int8;
|
typedef signed char drflac_int8;
|
||||||
@@ -43260,7 +43260,7 @@ typedef unsigned int drflac_uint32;
|
|||||||
typedef signed __int64 drflac_int64;
|
typedef signed __int64 drflac_int64;
|
||||||
typedef unsigned __int64 drflac_uint64;
|
typedef unsigned __int64 drflac_uint64;
|
||||||
#else
|
#else
|
||||||
#if defined(__GNUC__)
|
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
|
||||||
#pragma GCC diagnostic push
|
#pragma GCC diagnostic push
|
||||||
#pragma GCC diagnostic ignored "-Wlong-long"
|
#pragma GCC diagnostic ignored "-Wlong-long"
|
||||||
#if defined(__clang__)
|
#if defined(__clang__)
|
||||||
@@ -43269,7 +43269,7 @@ typedef unsigned int drflac_uint32;
|
|||||||
#endif
|
#endif
|
||||||
typedef signed long long drflac_int64;
|
typedef signed long long drflac_int64;
|
||||||
typedef unsigned long long drflac_uint64;
|
typedef unsigned long long drflac_uint64;
|
||||||
#if defined(__GNUC__)
|
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
|
||||||
#pragma GCC diagnostic pop
|
#pragma GCC diagnostic pop
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
@@ -43608,7 +43608,7 @@ extern "C" {
|
|||||||
#define DRMP3_XSTRINGIFY(x) DRMP3_STRINGIFY(x)
|
#define DRMP3_XSTRINGIFY(x) DRMP3_STRINGIFY(x)
|
||||||
#define DRMP3_VERSION_MAJOR 0
|
#define DRMP3_VERSION_MAJOR 0
|
||||||
#define DRMP3_VERSION_MINOR 6
|
#define DRMP3_VERSION_MINOR 6
|
||||||
#define DRMP3_VERSION_REVISION 17
|
#define DRMP3_VERSION_REVISION 18
|
||||||
#define DRMP3_VERSION_STRING DRMP3_XSTRINGIFY(DRMP3_VERSION_MAJOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_MINOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_REVISION)
|
#define DRMP3_VERSION_STRING DRMP3_XSTRINGIFY(DRMP3_VERSION_MAJOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_MINOR) "." DRMP3_XSTRINGIFY(DRMP3_VERSION_REVISION)
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
typedef signed char drmp3_int8;
|
typedef signed char drmp3_int8;
|
||||||
@@ -43621,7 +43621,7 @@ typedef unsigned int drmp3_uint32;
|
|||||||
typedef signed __int64 drmp3_int64;
|
typedef signed __int64 drmp3_int64;
|
||||||
typedef unsigned __int64 drmp3_uint64;
|
typedef unsigned __int64 drmp3_uint64;
|
||||||
#else
|
#else
|
||||||
#if defined(__GNUC__)
|
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
|
||||||
#pragma GCC diagnostic push
|
#pragma GCC diagnostic push
|
||||||
#pragma GCC diagnostic ignored "-Wlong-long"
|
#pragma GCC diagnostic ignored "-Wlong-long"
|
||||||
#if defined(__clang__)
|
#if defined(__clang__)
|
||||||
@@ -43630,7 +43630,7 @@ typedef unsigned int drmp3_uint32;
|
|||||||
#endif
|
#endif
|
||||||
typedef signed long long drmp3_int64;
|
typedef signed long long drmp3_int64;
|
||||||
typedef unsigned long long drmp3_uint64;
|
typedef unsigned long long drmp3_uint64;
|
||||||
#if defined(__GNUC__)
|
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
|
||||||
#pragma GCC diagnostic pop
|
#pragma GCC diagnostic pop
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
@@ -51180,7 +51180,7 @@ DRWAV_API drwav_bool32 drwav_fourcc_equal(const drwav_uint8* a, const char* b)
|
|||||||
/* dr_flac_c begin */
|
/* dr_flac_c begin */
|
||||||
#ifndef dr_flac_c
|
#ifndef dr_flac_c
|
||||||
#define dr_flac_c
|
#define dr_flac_c
|
||||||
#if defined(__GNUC__)
|
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
|
||||||
#pragma GCC diagnostic push
|
#pragma GCC diagnostic push
|
||||||
#if __GNUC__ >= 7
|
#if __GNUC__ >= 7
|
||||||
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
|
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
|
||||||
@@ -51224,7 +51224,7 @@ DRWAV_API drwav_bool32 drwav_fourcc_equal(const drwav_uint8* a, const char* b)
|
|||||||
#if _MSC_VER >= 1600 && !defined(DRFLAC_NO_SSE41)
|
#if _MSC_VER >= 1600 && !defined(DRFLAC_NO_SSE41)
|
||||||
#define DRFLAC_SUPPORT_SSE41
|
#define DRFLAC_SUPPORT_SSE41
|
||||||
#endif
|
#endif
|
||||||
#else
|
#elif defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC__ >= 3)))
|
||||||
#if defined(__SSE2__) && !defined(DRFLAC_NO_SSE2)
|
#if defined(__SSE2__) && !defined(DRFLAC_NO_SSE2)
|
||||||
#define DRFLAC_SUPPORT_SSE2
|
#define DRFLAC_SUPPORT_SSE2
|
||||||
#endif
|
#endif
|
||||||
@@ -54555,6 +54555,7 @@ static drflac_bool32 drflac__seek_to_approximate_flac_frame_to_byte(drflac* pFla
|
|||||||
DRFLAC_ASSERT(targetByte <= rangeHi);
|
DRFLAC_ASSERT(targetByte <= rangeHi);
|
||||||
*pLastSuccessfulSeekOffset = pFlac->firstFLACFramePosInBytes;
|
*pLastSuccessfulSeekOffset = pFlac->firstFLACFramePosInBytes;
|
||||||
for (;;) {
|
for (;;) {
|
||||||
|
drflac_uint64 lastTargetByte = targetByte;
|
||||||
if (!drflac__seek_to_byte(&pFlac->bs, targetByte)) {
|
if (!drflac__seek_to_byte(&pFlac->bs, targetByte)) {
|
||||||
if (targetByte == 0) {
|
if (targetByte == 0) {
|
||||||
drflac__seek_to_first_frame(pFlac);
|
drflac__seek_to_first_frame(pFlac);
|
||||||
@@ -54580,6 +54581,9 @@ static drflac_bool32 drflac__seek_to_approximate_flac_frame_to_byte(drflac* pFla
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
if(targetByte == lastTargetByte) {
|
||||||
|
return DRFLAC_FALSE;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
drflac__get_pcm_frame_range_of_current_flac_frame(pFlac, &pFlac->currentPCMFrame, NULL);
|
drflac__get_pcm_frame_range_of_current_flac_frame(pFlac, &pFlac->currentPCMFrame, NULL);
|
||||||
DRFLAC_ASSERT(targetByte <= rangeHi);
|
DRFLAC_ASSERT(targetByte <= rangeHi);
|
||||||
@@ -59318,7 +59322,7 @@ DRFLAC_API drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterat
|
|||||||
}
|
}
|
||||||
return DRFLAC_TRUE;
|
return DRFLAC_TRUE;
|
||||||
}
|
}
|
||||||
#if defined(__GNUC__)
|
#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)))
|
||||||
#pragma GCC diagnostic pop
|
#pragma GCC diagnostic pop
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user