mirror/miniaudio
1
0
Fork 0
mirror of https://github.com/mackron/miniaudio.git synced 2026-04-22 00:06:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update dr_wav.

Browse Source
This commit is contained in:
David Reid
2019-10-07 07:24:03 +10:00
parent 25b8d2e47c
commit 154bb46bab
2 changed files with 1359 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extras/dr_wav.h
+1346 -728
View File
File diff suppressed because it is too large Load Diff
miniaudio.h
+13 -4
View File
@@ -33576,7 +33576,8 @@ ma_result ma_decoder_internal_on_seek_to_pcm_frame__wav(ma_decoder* pDecoder, ma
ma_result ma_decoder_internal_on_uninit__wav(ma_decoder* pDecoder) ma_result ma_decoder_internal_on_uninit__wav(ma_decoder* pDecoder)
{ {
drwav_close((drwav*)pDecoder->pInternalDecoder); drwav_uninit((drwav*)pDecoder->pInternalDecoder);
ma_free(pDecoder->pInternalDecoder);
return MA_SUCCESS; return MA_SUCCESS;
} }
@@ -33593,9 +33594,14 @@ ma_result ma_decoder_init_wav__internal(const ma_decoder_config* pConfig, ma_dec
ma_assert(pConfig != NULL); ma_assert(pConfig != NULL);
ma_assert(pDecoder != NULL); ma_assert(pDecoder != NULL);
/* Try opening the decoder first. */ pWav = (drwav*)ma_malloc(sizeof(*pWav));
pWav = drwav_open(ma_decoder_internal_on_read__wav, ma_decoder_internal_on_seek__wav, pDecoder);
if (pWav == NULL) { if (pWav == NULL) {
return MA_OUT_OF_MEMORY;
}
/* Try opening the decoder first. */
if (!drwav_init(pWav, ma_decoder_internal_on_read__wav, ma_decoder_internal_on_seek__wav, pDecoder, NULL)) {
ma_free(pWav);
return MA_ERROR; return MA_ERROR;
} }
@@ -33645,7 +33651,8 @@ ma_result ma_decoder_init_wav__internal(const ma_decoder_config* pConfig, ma_dec
result = ma_decoder__init_dsp(pDecoder, pConfig, ma_decoder_internal_on_read_pcm_frames__wav); result = ma_decoder__init_dsp(pDecoder, pConfig, ma_decoder_internal_on_read_pcm_frames__wav);
if (result != MA_SUCCESS) { if (result != MA_SUCCESS) {
drwav_close(pWav); drwav_uninit(pWav);
ma_free(pWav);
return result; return result;
} }
@@ -34166,6 +34173,7 @@ ma_result ma_decoder_init_mp3__internal(const ma_decoder_config* pConfig, ma_dec
mp3Config.outputChannels = 2; mp3Config.outputChannels = 2;
mp3Config.outputSampleRate = (pConfig->sampleRate != 0) ? pConfig->sampleRate : 44100; mp3Config.outputSampleRate = (pConfig->sampleRate != 0) ? pConfig->sampleRate : 44100;
if (!drmp3_init(pMP3, ma_decoder_internal_on_read__mp3, ma_decoder_internal_on_seek__mp3, pDecoder, &mp3Config)) { if (!drmp3_init(pMP3, ma_decoder_internal_on_read__mp3, ma_decoder_internal_on_seek__mp3, pDecoder, &mp3Config)) {
ma_free(pMP3);
return MA_ERROR; return MA_ERROR;
} }
@@ -34183,6 +34191,7 @@ ma_result ma_decoder_init_mp3__internal(const ma_decoder_config* pConfig, ma_dec
result = ma_decoder__init_dsp(pDecoder, pConfig, ma_decoder_internal_on_read_pcm_frames__mp3); result = ma_decoder__init_dsp(pDecoder, pConfig, ma_decoder_internal_on_read_pcm_frames__mp3);
if (result != MA_SUCCESS) { if (result != MA_SUCCESS) {
drmp3_uninit(pMP3);
ma_free(pMP3); ma_free(pMP3);
return result; return result;
} }