Commit 32ae4f93 authored by iarwain's avatar iarwain

Fixed a compilation warning with llvm

parent 760fa4c8
/* /*
Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file. Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file.
miniaudio - v0.10.42 - 2021-08-22 miniaudio - v0.10.42 - 2021-08-22
David Reid - mackron@gmail.com David Reid - mackron@gmail.com
...@@ -3282,7 +3282,7 @@ extern "C" { ...@@ -3282,7 +3282,7 @@ extern "C" {
#define MA_VERSION_MAJOR 0 #define MA_VERSION_MAJOR 0
#define MA_VERSION_MINOR 10 #define MA_VERSION_MINOR 10
#define MA_VERSION_REVISION 42 #define MA_VERSION_REVISION 42
#define MA_VERSION_STRING MA_XSTRINGIFY(MA_VERSION_MAJOR) "." MA_XSTRINGIFY(MA_VERSION_MINOR) "." MA_XSTRINGIFY(MA_VERSION_REVISION) #define MA_VERSION_STRING MA_XSTRINGIFY(MA_VERSION_MAJOR) "." MA_XSTRINGIFY(MA_VERSION_MINOR) "." MA_XSTRINGIFY(MA_VERSION_REVISION)
#if defined(_MSC_VER) && !defined(__clang__) #if defined(_MSC_VER) && !defined(__clang__)
...@@ -16492,11 +16492,11 @@ static ma_result ma_device_audio_thread__default_read_write(ma_device* pDevice) ...@@ -16492,11 +16492,11 @@ static ma_result ma_device_audio_thread__default_read_write(ma_device* pDevice)
} }
} }
/* Make sure we don't get stuck in the inner loop. */ /* Make sure we don't get stuck in the inner loop. */
if (capturedDeviceFramesProcessed == 0) { if (capturedDeviceFramesProcessed == 0) {
break; break;
} }
totalCapturedDeviceFramesProcessed += capturedDeviceFramesProcessed; totalCapturedDeviceFramesProcessed += capturedDeviceFramesProcessed;
} }
} break; } break;
...@@ -16520,11 +16520,11 @@ static ma_result ma_device_audio_thread__default_read_write(ma_device* pDevice) ...@@ -16520,11 +16520,11 @@ static ma_result ma_device_audio_thread__default_read_write(ma_device* pDevice)
break; break;
} }
/* Make sure we don't get stuck in the inner loop. */ /* Make sure we don't get stuck in the inner loop. */
if (framesProcessed == 0) { if (framesProcessed == 0) {
break; break;
} }
ma_device__send_frames_to_client(pDevice, framesProcessed, capturedDeviceData); ma_device__send_frames_to_client(pDevice, framesProcessed, capturedDeviceData);
framesReadThisPeriod += framesProcessed; framesReadThisPeriod += framesProcessed;
...@@ -16552,11 +16552,11 @@ static ma_result ma_device_audio_thread__default_read_write(ma_device* pDevice) ...@@ -16552,11 +16552,11 @@ static ma_result ma_device_audio_thread__default_read_write(ma_device* pDevice)
break; break;
} }
/* Make sure we don't get stuck in the inner loop. */ /* Make sure we don't get stuck in the inner loop. */
if (framesProcessed == 0) { if (framesProcessed == 0) {
break; break;
} }
framesWrittenThisPeriod += framesProcessed; framesWrittenThisPeriod += framesProcessed;
} }
} break; } break;
...@@ -39020,7 +39020,7 @@ MA_API ma_result ma_slot_allocator_free(ma_slot_allocator* pAllocator, ma_uint64 ...@@ -39020,7 +39020,7 @@ MA_API ma_result ma_slot_allocator_free(ma_slot_allocator* pAllocator, ma_uint64
MA_ASSERT(iBit < 32); /* This must be true due to the logic we used to actually calculate it. */ MA_ASSERT(iBit < 32); /* This must be true due to the logic we used to actually calculate it. */
while (c89atomic_load_32(&pAllocator->count) > 0) { while (c89atomic_load_32(&pAllocator->count) > 0) {
/* CAS */ /* CAS */
ma_uint32 oldBitfield; ma_uint32 oldBitfield;
ma_uint32 newBitfield; ma_uint32 newBitfield;
...@@ -55198,7 +55198,7 @@ extern "C" { ...@@ -55198,7 +55198,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 31 #define DRFLAC_VERSION_REVISION 31
#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;
...@@ -55559,7 +55559,7 @@ extern "C" { ...@@ -55559,7 +55559,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 31 #define DRMP3_VERSION_REVISION 31
#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;
...@@ -58482,7 +58482,7 @@ MA_API ma_result ma_stbvorbis_read_pcm_frames(ma_stbvorbis* pVorbis, void* pFram ...@@ -58482,7 +58482,7 @@ MA_API ma_result ma_stbvorbis_read_pcm_frames(ma_stbvorbis* pVorbis, void* pFram
framesRead = stb_vorbis_get_samples_float_interleaved(pVorbis->stb, channels, (float*)ma_offset_pcm_frames_ptr(pFramesOut, totalFramesRead, format, channels), (int)framesRemaining * channels); /* Safe cast. */ framesRead = stb_vorbis_get_samples_float_interleaved(pVorbis->stb, channels, (float*)ma_offset_pcm_frames_ptr(pFramesOut, totalFramesRead, format, channels), (int)framesRemaining * channels); /* Safe cast. */
totalFramesRead += framesRead; totalFramesRead += framesRead;
if (framesRead < framesRemaining) { if (framesRead < (int)framesRemaining) {
break; /* Nothing left to read. Get out. */ break; /* Nothing left to read. Get out. */
} }
} }
...@@ -65684,8 +65684,8 @@ MA_API void ma_debug_fill_pcm_frames_with_sine_wave(float* pFramesOut, ma_uint32 ...@@ -65684,8 +65684,8 @@ MA_API void ma_debug_fill_pcm_frames_with_sine_wave(float* pFramesOut, ma_uint32
(void)sampleRate; (void)sampleRate;
#if defined(MA_DEBUG_OUTPUT) #if defined(MA_DEBUG_OUTPUT)
{ {
#if _MSC_VER #if _MSC_VER
#pragma message ("ma_debug_fill_pcm_frames_with_sine_wave() will do nothing because MA_NO_GENERATION is enabled.") #pragma message ("ma_debug_fill_pcm_frames_with_sine_wave() will do nothing because MA_NO_GENERATION is enabled.")
#endif #endif
} }
#endif #endif
...@@ -83890,7 +83890,7 @@ static type* drflac__full_read_and_close_ ## extension (drflac* pFlac, unsigned ...@@ -83890,7 +83890,7 @@ static type* drflac__full_read_and_close_ ## extension (drflac* pFlac, unsigned
DRFLAC_ZERO_MEMORY(pSampleData + (totalPCMFrameCount*pFlac->channels), (size_t)(sampleDataBufferSize - totalPCMFrameCount*pFlac->channels*sizeof(type))); \ DRFLAC_ZERO_MEMORY(pSampleData + (totalPCMFrameCount*pFlac->channels), (size_t)(sampleDataBufferSize - totalPCMFrameCount*pFlac->channels*sizeof(type))); \
} else { \ } else { \
drflac_uint64 dataSize = totalPCMFrameCount*pFlac->channels*sizeof(type); \ drflac_uint64 dataSize = totalPCMFrameCount*pFlac->channels*sizeof(type); \
if (dataSize > (drflac_uint64)DRFLAC_SIZE_MAX) { \ if (dataSize > (drflac_uint64)DRFLAC_SIZE_MAX) { \
goto on_error; \ goto on_error; \
} \ } \
\ \
...@@ -84333,29 +84333,29 @@ static __inline__ __attribute__((always_inline)) drmp3_int32 drmp3_clip_int16_ar ...@@ -84333,29 +84333,29 @@ static __inline__ __attribute__((always_inline)) drmp3_int32 drmp3_clip_int16_ar
#else #else
#define DRMP3_HAVE_ARMV6 0 #define DRMP3_HAVE_ARMV6 0
#endif #endif
#ifndef DRMP3_ASSERT #ifndef DRMP3_ASSERT
#include <assert.h> #include <assert.h>
#define DRMP3_ASSERT(expression) assert(expression) #define DRMP3_ASSERT(expression) assert(expression)
#endif #endif
#ifndef DRMP3_COPY_MEMORY #ifndef DRMP3_COPY_MEMORY
#define DRMP3_COPY_MEMORY(dst, src, sz) memcpy((dst), (src), (sz)) #define DRMP3_COPY_MEMORY(dst, src, sz) memcpy((dst), (src), (sz))
#endif #endif
#ifndef DRMP3_MOVE_MEMORY #ifndef DRMP3_MOVE_MEMORY
#define DRMP3_MOVE_MEMORY(dst, src, sz) memmove((dst), (src), (sz)) #define DRMP3_MOVE_MEMORY(dst, src, sz) memmove((dst), (src), (sz))
#endif #endif
#ifndef DRMP3_ZERO_MEMORY #ifndef DRMP3_ZERO_MEMORY
#define DRMP3_ZERO_MEMORY(p, sz) memset((p), 0, (sz)) #define DRMP3_ZERO_MEMORY(p, sz) memset((p), 0, (sz))
#endif #endif
#define DRMP3_ZERO_OBJECT(p) DRMP3_ZERO_MEMORY((p), sizeof(*(p))) #define DRMP3_ZERO_OBJECT(p) DRMP3_ZERO_MEMORY((p), sizeof(*(p)))
#ifndef DRMP3_MALLOC #ifndef DRMP3_MALLOC
#define DRMP3_MALLOC(sz) malloc((sz)) #define DRMP3_MALLOC(sz) malloc((sz))
#endif #endif
#ifndef DRMP3_REALLOC #ifndef DRMP3_REALLOC
#define DRMP3_REALLOC(p, sz) realloc((p), (sz)) #define DRMP3_REALLOC(p, sz) realloc((p), (sz))
#endif #endif
#ifndef DRMP3_FREE #ifndef DRMP3_FREE
#define DRMP3_FREE(p) free((p)) #define DRMP3_FREE(p) free((p))
#endif #endif
typedef struct typedef struct
{ {
const drmp3_uint8 *buf; const drmp3_uint8 *buf;
...@@ -84595,7 +84595,7 @@ static int drmp3_L12_dequantize_granule(float *grbuf, drmp3_bs *bs, drmp3_L12_sc ...@@ -84595,7 +84595,7 @@ static int drmp3_L12_dequantize_granule(float *grbuf, drmp3_bs *bs, drmp3_L12_sc
static void drmp3_L12_apply_scf_384(drmp3_L12_scale_info *sci, const float *scf, float *dst) static void drmp3_L12_apply_scf_384(drmp3_L12_scale_info *sci, const float *scf, float *dst)
{ {
int i, k; int i, k;
DRMP3_COPY_MEMORY(dst + 576 + sci->stereo_bands*18, dst + sci->stereo_bands*18, (sci->total_bands - sci->stereo_bands)*18*sizeof(float)); DRMP3_COPY_MEMORY(dst + 576 + sci->stereo_bands*18, dst + sci->stereo_bands*18, (sci->total_bands - sci->stereo_bands)*18*sizeof(float));
for (i = 0; i < sci->total_bands; i++, dst += 18, scf += 6) for (i = 0; i < sci->total_bands; i++, dst += 18, scf += 6)
{ {
for (k = 0; k < 12; k++) for (k = 0; k < 12; k++)
...@@ -84733,14 +84733,14 @@ static void drmp3_L3_read_scalefactors(drmp3_uint8 *scf, drmp3_uint8 *ist_pos, c ...@@ -84733,14 +84733,14 @@ static void drmp3_L3_read_scalefactors(drmp3_uint8 *scf, drmp3_uint8 *ist_pos, c
int cnt = scf_count[i]; int cnt = scf_count[i];
if (scfsi & 8) if (scfsi & 8)
{ {
DRMP3_COPY_MEMORY(scf, ist_pos, cnt); DRMP3_COPY_MEMORY(scf, ist_pos, cnt);
} else } else
{ {
int bits = scf_size[i]; int bits = scf_size[i];
if (!bits) if (!bits)
{ {
DRMP3_ZERO_MEMORY(scf, cnt); DRMP3_ZERO_MEMORY(scf, cnt);
DRMP3_ZERO_MEMORY(ist_pos, cnt); DRMP3_ZERO_MEMORY(ist_pos, cnt);
} else } else
{ {
int max_scf = (scfsi < 0) ? (1 << bits) - 1 : -1; int max_scf = (scfsi < 0) ? (1 << bits) - 1 : -1;
...@@ -85093,7 +85093,7 @@ static void drmp3_L3_reorder(float *grbuf, float *scratch, const drmp3_uint8 *sf ...@@ -85093,7 +85093,7 @@ static void drmp3_L3_reorder(float *grbuf, float *scratch, const drmp3_uint8 *sf
*dst++ = src[2*len]; *dst++ = src[2*len];
} }
} }
DRMP3_COPY_MEMORY(grbuf, scratch, (dst - scratch)*sizeof(float)); DRMP3_COPY_MEMORY(grbuf, scratch, (dst - scratch)*sizeof(float));
} }
static void drmp3_L3_antialias(float *grbuf, int nbands) static void drmp3_L3_antialias(float *grbuf, int nbands)
{ {
...@@ -85243,8 +85243,8 @@ static void drmp3_L3_imdct_short(float *grbuf, float *overlap, int nbands) ...@@ -85243,8 +85243,8 @@ static void drmp3_L3_imdct_short(float *grbuf, float *overlap, int nbands)
for (;nbands > 0; nbands--, overlap += 9, grbuf += 18) for (;nbands > 0; nbands--, overlap += 9, grbuf += 18)
{ {
float tmp[18]; float tmp[18];
DRMP3_COPY_MEMORY(tmp, grbuf, sizeof(tmp)); DRMP3_COPY_MEMORY(tmp, grbuf, sizeof(tmp));
DRMP3_COPY_MEMORY(grbuf, overlap, 6*sizeof(float)); DRMP3_COPY_MEMORY(grbuf, overlap, 6*sizeof(float));
drmp3_L3_imdct12(tmp, grbuf + 6, overlap + 6); drmp3_L3_imdct12(tmp, grbuf + 6, overlap + 6);
drmp3_L3_imdct12(tmp + 1, grbuf + 12, overlap + 6); drmp3_L3_imdct12(tmp + 1, grbuf + 12, overlap + 6);
drmp3_L3_imdct12(tmp + 2, overlap, overlap + 6); drmp3_L3_imdct12(tmp + 2, overlap, overlap + 6);
...@@ -85285,7 +85285,7 @@ static void drmp3_L3_save_reservoir(drmp3dec *h, drmp3dec_scratch *s) ...@@ -85285,7 +85285,7 @@ static void drmp3_L3_save_reservoir(drmp3dec *h, drmp3dec_scratch *s)
} }
if (remains > 0) if (remains > 0)
{ {
DRMP3_MOVE_MEMORY(h->reserv_buf, s->maindata + pos, remains); DRMP3_MOVE_MEMORY(h->reserv_buf, s->maindata + pos, remains);
} }
h->reserv = remains; h->reserv = remains;
} }
...@@ -85293,8 +85293,8 @@ static int drmp3_L3_restore_reservoir(drmp3dec *h, drmp3_bs *bs, drmp3dec_scratc ...@@ -85293,8 +85293,8 @@ static int drmp3_L3_restore_reservoir(drmp3dec *h, drmp3_bs *bs, drmp3dec_scratc
{ {
int frame_bytes = (bs->limit - bs->pos)/8; int frame_bytes = (bs->limit - bs->pos)/8;
int bytes_have = DRMP3_MIN(h->reserv, main_data_begin); int bytes_have = DRMP3_MIN(h->reserv, main_data_begin);
DRMP3_COPY_MEMORY(s->maindata, h->reserv_buf + DRMP3_MAX(0, h->reserv - main_data_begin), DRMP3_MIN(h->reserv, main_data_begin)); DRMP3_COPY_MEMORY(s->maindata, h->reserv_buf + DRMP3_MAX(0, h->reserv - main_data_begin), DRMP3_MIN(h->reserv, main_data_begin));
DRMP3_COPY_MEMORY(s->maindata + bytes_have, bs->buf + bs->pos/8, frame_bytes); DRMP3_COPY_MEMORY(s->maindata + bytes_have, bs->buf + bs->pos/8, frame_bytes);
drmp3_bs_init(&s->bs, s->maindata, bytes_have + frame_bytes); drmp3_bs_init(&s->bs, s->maindata, bytes_have + frame_bytes);
return h->reserv >= main_data_begin; return h->reserv >= main_data_begin;
} }
...@@ -85672,7 +85672,7 @@ static void drmp3d_synth_granule(float *qmf_state, float *grbuf, int nbands, int ...@@ -85672,7 +85672,7 @@ static void drmp3d_synth_granule(float *qmf_state, float *grbuf, int nbands, int
{ {
drmp3d_DCT_II(grbuf + 576*i, nbands); drmp3d_DCT_II(grbuf + 576*i, nbands);
} }
DRMP3_COPY_MEMORY(lins, qmf_state, sizeof(float)*15*64); DRMP3_COPY_MEMORY(lins, qmf_state, sizeof(float)*15*64);
for (i = 0; i < nbands; i += 2) for (i = 0; i < nbands; i += 2)
{ {
drmp3d_synth(grbuf + i, pcm + 32*nch*i, nch, lins + i*64); drmp3d_synth(grbuf + i, pcm + 32*nch*i, nch, lins + i*64);
...@@ -85687,7 +85687,7 @@ static void drmp3d_synth_granule(float *qmf_state, float *grbuf, int nbands, int ...@@ -85687,7 +85687,7 @@ static void drmp3d_synth_granule(float *qmf_state, float *grbuf, int nbands, int
} else } else
#endif #endif
{ {
DRMP3_COPY_MEMORY(qmf_state, lins + nbands*64, sizeof(float)*15*64); DRMP3_COPY_MEMORY(qmf_state, lins + nbands*64, sizeof(float)*15*64);
} }
} }
static int drmp3d_match_frame(const drmp3_uint8 *hdr, int mp3_bytes, int frame_bytes) static int drmp3d_match_frame(const drmp3_uint8 *hdr, int mp3_bytes, int frame_bytes)
...@@ -85758,7 +85758,7 @@ DRMP3_API int drmp3dec_decode_frame(drmp3dec *dec, const drmp3_uint8 *mp3, int m ...@@ -85758,7 +85758,7 @@ DRMP3_API int drmp3dec_decode_frame(drmp3dec *dec, const drmp3_uint8 *mp3, int m
} }
if (!frame_size) if (!frame_size)
{ {
DRMP3_ZERO_MEMORY(dec, sizeof(drmp3dec)); DRMP3_ZERO_MEMORY(dec, sizeof(drmp3dec));
i = drmp3d_find_frame(mp3, mp3_bytes, &dec->free_format_bytes, &frame_size); i = drmp3d_find_frame(mp3, mp3_bytes, &dec->free_format_bytes, &frame_size);
if (!frame_size || i + frame_size > mp3_bytes) if (!frame_size || i + frame_size > mp3_bytes)
{ {
...@@ -85767,7 +85767,7 @@ DRMP3_API int drmp3dec_decode_frame(drmp3dec *dec, const drmp3_uint8 *mp3, int m ...@@ -85767,7 +85767,7 @@ DRMP3_API int drmp3dec_decode_frame(drmp3dec *dec, const drmp3_uint8 *mp3, int m
} }
} }
hdr = mp3 + i; hdr = mp3 + i;
DRMP3_COPY_MEMORY(dec->header, hdr, DRMP3_HDR_SIZE); DRMP3_COPY_MEMORY(dec->header, hdr, DRMP3_HDR_SIZE);
info->frame_bytes = i + frame_size; info->frame_bytes = i + frame_size;
info->channels = DRMP3_HDR_IS_MONO(hdr) ? 1 : 2; info->channels = DRMP3_HDR_IS_MONO(hdr) ? 1 : 2;
info->hz = drmp3_hdr_sample_rate_hz(hdr); info->hz = drmp3_hdr_sample_rate_hz(hdr);
...@@ -85791,7 +85791,7 @@ DRMP3_API int drmp3dec_decode_frame(drmp3dec *dec, const drmp3_uint8 *mp3, int m ...@@ -85791,7 +85791,7 @@ DRMP3_API int drmp3dec_decode_frame(drmp3dec *dec, const drmp3_uint8 *mp3, int m
{ {
for (igr = 0; igr < (DRMP3_HDR_TEST_MPEG1(hdr) ? 2 : 1); igr++, pcm = DRMP3_OFFSET_PTR(pcm, sizeof(drmp3d_sample_t)*576*info->channels)) for (igr = 0; igr < (DRMP3_HDR_TEST_MPEG1(hdr) ? 2 : 1); igr++, pcm = DRMP3_OFFSET_PTR(pcm, sizeof(drmp3d_sample_t)*576*info->channels))
{ {
DRMP3_ZERO_MEMORY(scratch.grbuf[0], 576*2*sizeof(float)); DRMP3_ZERO_MEMORY(scratch.grbuf[0], 576*2*sizeof(float));
drmp3_L3_decode(dec, &scratch, scratch.gr_info + igr*info->channels, info->channels); drmp3_L3_decode(dec, &scratch, scratch.gr_info + igr*info->channels, info->channels);
drmp3d_synth_granule(dec->qmf_state, scratch.grbuf[0], 18, info->channels, (drmp3d_sample_t*)pcm, scratch.syn[0]); drmp3d_synth_granule(dec->qmf_state, scratch.grbuf[0], 18, info->channels, (drmp3d_sample_t*)pcm, scratch.syn[0]);
} }
...@@ -85807,7 +85807,7 @@ DRMP3_API int drmp3dec_decode_frame(drmp3dec *dec, const drmp3_uint8 *mp3, int m ...@@ -85807,7 +85807,7 @@ DRMP3_API int drmp3dec_decode_frame(drmp3dec *dec, const drmp3_uint8 *mp3, int m
return drmp3_hdr_frame_samples(hdr); return drmp3_hdr_frame_samples(hdr);
} }
drmp3_L12_read_scale_info(hdr, bs_frame, sci); drmp3_L12_read_scale_info(hdr, bs_frame, sci);
DRMP3_ZERO_MEMORY(scratch.grbuf[0], 576*2*sizeof(float)); DRMP3_ZERO_MEMORY(scratch.grbuf[0], 576*2*sizeof(float));
for (i = 0, igr = 0; igr < 3; igr++) for (i = 0, igr = 0; igr < 3; igr++)
{ {
if (12 == (i += drmp3_L12_dequantize_granule(scratch.grbuf[0] + i, bs_frame, sci, info->layer | 1))) if (12 == (i += drmp3_L12_dequantize_granule(scratch.grbuf[0] + i, bs_frame, sci, info->layer | 1)))
...@@ -85815,7 +85815,7 @@ DRMP3_API int drmp3dec_decode_frame(drmp3dec *dec, const drmp3_uint8 *mp3, int m ...@@ -85815,7 +85815,7 @@ DRMP3_API int drmp3dec_decode_frame(drmp3dec *dec, const drmp3_uint8 *mp3, int m
i = 0; i = 0;
drmp3_L12_apply_scf_384(sci, sci->scf + igr, scratch.grbuf[0]); drmp3_L12_apply_scf_384(sci, sci->scf + igr, scratch.grbuf[0]);
drmp3d_synth_granule(dec->qmf_state, scratch.grbuf[0], 12, info->channels, (drmp3d_sample_t*)pcm, scratch.syn[0]); drmp3d_synth_granule(dec->qmf_state, scratch.grbuf[0], 12, info->channels, (drmp3d_sample_t*)pcm, scratch.syn[0]);
DRMP3_ZERO_MEMORY(scratch.grbuf[0], 576*2*sizeof(float)); DRMP3_ZERO_MEMORY(scratch.grbuf[0], 576*2*sizeof(float));
pcm = DRMP3_OFFSET_PTR(pcm, sizeof(drmp3d_sample_t)*384*info->channels); pcm = DRMP3_OFFSET_PTR(pcm, sizeof(drmp3d_sample_t)*384*info->channels);
} }
if (bs_frame->pos > bs_frame->limit) if (bs_frame->pos > bs_frame->limit)
...@@ -86069,7 +86069,7 @@ static drmp3_uint32 drmp3_decode_next_frame_ex__callbacks(drmp3* pMP3, drmp3d_sa ...@@ -86069,7 +86069,7 @@ static drmp3_uint32 drmp3_decode_next_frame_ex__callbacks(drmp3* pMP3, drmp3d_sa
if (pMP3->dataSize < DRMP3_MIN_DATA_CHUNK_SIZE) { if (pMP3->dataSize < DRMP3_MIN_DATA_CHUNK_SIZE) {
size_t bytesRead; size_t bytesRead;
if (pMP3->pData != NULL) { if (pMP3->pData != NULL) {
DRMP3_MOVE_MEMORY(pMP3->pData, pMP3->pData + pMP3->dataConsumed, pMP3->dataSize); DRMP3_MOVE_MEMORY(pMP3->pData, pMP3->pData + pMP3->dataConsumed, pMP3->dataSize);
} }
pMP3->dataConsumed = 0; pMP3->dataConsumed = 0;
if (pMP3->dataCapacity < DRMP3_DATA_CHUNK_SIZE) { if (pMP3->dataCapacity < DRMP3_DATA_CHUNK_SIZE) {
...@@ -86112,7 +86112,7 @@ static drmp3_uint32 drmp3_decode_next_frame_ex__callbacks(drmp3* pMP3, drmp3d_sa ...@@ -86112,7 +86112,7 @@ static drmp3_uint32 drmp3_decode_next_frame_ex__callbacks(drmp3* pMP3, drmp3d_sa
break; break;
} else if (info.frame_bytes == 0) { } else if (info.frame_bytes == 0) {
size_t bytesRead; size_t bytesRead;
DRMP3_MOVE_MEMORY(pMP3->pData, pMP3->pData + pMP3->dataConsumed, pMP3->dataSize); DRMP3_MOVE_MEMORY(pMP3->pData, pMP3->pData + pMP3->dataConsumed, pMP3->dataSize);
pMP3->dataConsumed = 0; pMP3->dataConsumed = 0;
if (pMP3->dataCapacity == pMP3->dataSize) { if (pMP3->dataCapacity == pMP3->dataSize) {
drmp3_uint8* pNewData; drmp3_uint8* pNewData;
...@@ -86144,20 +86144,20 @@ static drmp3_uint32 drmp3_decode_next_frame_ex__memory(drmp3* pMP3, drmp3d_sampl ...@@ -86144,20 +86144,20 @@ static drmp3_uint32 drmp3_decode_next_frame_ex__memory(drmp3* pMP3, drmp3d_sampl
if (pMP3->atEnd) { if (pMP3->atEnd) {
return 0; return 0;
} }
for (;;) { for (;;) {
pcmFramesRead = drmp3dec_decode_frame(&pMP3->decoder, pMP3->memory.pData + pMP3->memory.currentReadPos, (int)(pMP3->memory.dataSize - pMP3->memory.currentReadPos), pPCMFrames, &info); pcmFramesRead = drmp3dec_decode_frame(&pMP3->decoder, pMP3->memory.pData + pMP3->memory.currentReadPos, (int)(pMP3->memory.dataSize - pMP3->memory.currentReadPos), pPCMFrames, &info);
if (pcmFramesRead > 0) { if (pcmFramesRead > 0) {
pcmFramesRead = drmp3_hdr_frame_samples(pMP3->decoder.header); pcmFramesRead = drmp3_hdr_frame_samples(pMP3->decoder.header);
pMP3->pcmFramesConsumedInMP3Frame = 0; pMP3->pcmFramesConsumedInMP3Frame = 0;
pMP3->pcmFramesRemainingInMP3Frame = pcmFramesRead; pMP3->pcmFramesRemainingInMP3Frame = pcmFramesRead;
pMP3->mp3FrameChannels = info.channels; pMP3->mp3FrameChannels = info.channels;
pMP3->mp3FrameSampleRate = info.hz; pMP3->mp3FrameSampleRate = info.hz;
break; break;
} else if (info.frame_bytes > 0) { } else if (info.frame_bytes > 0) {
pMP3->memory.currentReadPos += (size_t)info.frame_bytes; pMP3->memory.currentReadPos += (size_t)info.frame_bytes;
} else { } else {
break; break;
} }
} }
pMP3->memory.currentReadPos += (size_t)info.frame_bytes; pMP3->memory.currentReadPos += (size_t)info.frame_bytes;
return pcmFramesRead; return pcmFramesRead;
...@@ -86202,7 +86202,7 @@ static drmp3_bool32 drmp3_init_internal(drmp3* pMP3, drmp3_read_proc onRead, drm ...@@ -86202,7 +86202,7 @@ static drmp3_bool32 drmp3_init_internal(drmp3* pMP3, drmp3_read_proc onRead, drm
if (pMP3->allocationCallbacks.onFree == NULL || (pMP3->allocationCallbacks.onMalloc == NULL && pMP3->allocationCallbacks.onRealloc == NULL)) { if (pMP3->allocationCallbacks.onFree == NULL || (pMP3->allocationCallbacks.onMalloc == NULL && pMP3->allocationCallbacks.onRealloc == NULL)) {
return DRMP3_FALSE; return DRMP3_FALSE;
} }
if (drmp3_decode_next_frame(pMP3) == 0) { if (drmp3_decode_next_frame(pMP3) == 0) {
drmp3__free_from_callbacks(pMP3->pData, &pMP3->allocationCallbacks); drmp3__free_from_callbacks(pMP3->pData, &pMP3->allocationCallbacks);
return DRMP3_FALSE; return DRMP3_FALSE;
} }
...@@ -87284,7 +87284,7 @@ static float* drmp3__full_read_and_close_f32(drmp3* pMP3, drmp3_config* pConfig, ...@@ -87284,7 +87284,7 @@ static float* drmp3__full_read_and_close_f32(drmp3* pMP3, drmp3_config* pConfig,
} }
oldFramesBufferSize = framesCapacity * pMP3->channels * sizeof(float); oldFramesBufferSize = framesCapacity * pMP3->channels * sizeof(float);
newFramesBufferSize = newFramesCap * pMP3->channels * sizeof(float); newFramesBufferSize = newFramesCap * pMP3->channels * sizeof(float);
if (newFramesBufferSize > (drmp3_uint64)DRMP3_SIZE_MAX) { if (newFramesBufferSize > (drmp3_uint64)DRMP3_SIZE_MAX) {
break; break;
} }
pNewFrames = (float*)drmp3__realloc_from_callbacks(pFrames, (size_t)newFramesBufferSize, (size_t)oldFramesBufferSize, &pMP3->allocationCallbacks); pNewFrames = (float*)drmp3__realloc_from_callbacks(pFrames, (size_t)newFramesBufferSize, (size_t)oldFramesBufferSize, &pMP3->allocationCallbacks);
...@@ -87335,7 +87335,7 @@ static drmp3_int16* drmp3__full_read_and_close_s16(drmp3* pMP3, drmp3_config* pC ...@@ -87335,7 +87335,7 @@ static drmp3_int16* drmp3__full_read_and_close_s16(drmp3* pMP3, drmp3_config* pC
} }
oldFramesBufferSize = framesCapacity * pMP3->channels * sizeof(drmp3_int16); oldFramesBufferSize = framesCapacity * pMP3->channels * sizeof(drmp3_int16);
newFramesBufferSize = newFramesCap * pMP3->channels * sizeof(drmp3_int16); newFramesBufferSize = newFramesCap * pMP3->channels * sizeof(drmp3_int16);
if (newFramesBufferSize > (drmp3_uint64)DRMP3_SIZE_MAX) { if (newFramesBufferSize > (drmp3_uint64)DRMP3_SIZE_MAX) {
break; break;
} }
pNewFrames = (drmp3_int16*)drmp3__realloc_from_callbacks(pFrames, (size_t)newFramesBufferSize, (size_t)oldFramesBufferSize, &pMP3->allocationCallbacks); pNewFrames = (drmp3_int16*)drmp3__realloc_from_callbacks(pFrames, (size_t)newFramesBufferSize, (size_t)oldFramesBufferSize, &pMP3->allocationCallbacks);
...@@ -87759,9 +87759,9 @@ issues with certain devices and configurations. These can be individually enable ...@@ -87759,9 +87759,9 @@ issues with certain devices and configurations. These can be individually enable
/* /*
REVISION HISTORY REVISION HISTORY
================ ================
v0.10.42 - 2021-08-22 v0.10.42 - 2021-08-22
- Fix a possible deadlock when stopping devices. - Fix a possible deadlock when stopping devices.
v0.10.41 - 2021-08-15 v0.10.41 - 2021-08-15
- Core Audio: Fix some deadlock errors. - Core Audio: Fix some deadlock errors.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment