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_mp3.

Browse Source
This commit is contained in:
David Reid
2018-04-28 16:07:39 +10:00
parent fcda380f85
commit d50c5d2263
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extras/dr_mp3.h
+25 -8
View File
@@ -1,5 +1,5 @@
// MP3 audio decoder. Public domain. See "unlicense" statement at the end of this file. // MP3 audio decoder. Public domain. See "unlicense" statement at the end of this file.
// dr_mp3 - v0.2.1 - 2018-04-27 // dr_mp3 - v0.2.2 - 2018-04-28
// //
// David Reid - mackron@gmail.com // David Reid - mackron@gmail.com
// //
@@ -2423,9 +2423,13 @@ static drmp3_uint64 drmp3_read_src(drmp3_src* pSRC, drmp3_uint64 frameCount, voi
return totalFramesRead; return totalFramesRead;
} }
drmp3_bool32 drmp3_init(drmp3* pMP3, drmp3_read_proc onRead, drmp3_seek_proc onSeek, void* pUserData, const drmp3_config* pConfig) drmp3_bool32 drmp3_init_internal(drmp3* pMP3, drmp3_read_proc onRead, drmp3_seek_proc onSeek, void* pUserData, const drmp3_config* pConfig)
{ {
if (pMP3 == NULL || onRead == NULL) return DRMP3_FALSE; drmp3_assert(pMP3 != NULL);
drmp3_assert(onRead != NULL);
// This function assumes the output object has already been reset to 0. Do not do that here, otherwise things will break.
drmp3dec_init(&pMP3->decoder);
// The config can be null in which case we use defaults. // The config can be null in which case we use defaults.
drmp3_config config; drmp3_config config;
@@ -2435,9 +2439,6 @@ drmp3_bool32 drmp3_init(drmp3* pMP3, drmp3_read_proc onRead, drmp3_seek_proc onS
drmp3_zero_object(&config); drmp3_zero_object(&config);
} }
drmp3_zero_object(pMP3);
drmp3dec_init(&pMP3->decoder);
pMP3->channels = config.outputChannels; pMP3->channels = config.outputChannels;
if (pMP3->channels == 0) { if (pMP3->channels == 0) {
pMP3->channels = DR_MP3_DEFAULT_CHANNELS; pMP3->channels = DR_MP3_DEFAULT_CHANNELS;
@@ -2476,6 +2477,16 @@ drmp3_bool32 drmp3_init(drmp3* pMP3, drmp3_read_proc onRead, drmp3_seek_proc onS
return DRMP3_TRUE; return DRMP3_TRUE;
} }
drmp3_bool32 drmp3_init(drmp3* pMP3, drmp3_read_proc onRead, drmp3_seek_proc onSeek, void* pUserData, const drmp3_config* pConfig)
{
if (pMP3 == NULL || onRead == NULL) {
return DRMP3_FALSE;
}
drmp3_zero_object(pMP3);
return drmp3_init_internal(pMP3, onRead, onSeek, pUserData, pConfig);
}
static size_t drmp3__on_read_memory(void* pUserData, void* pBufferOut, size_t bytesToRead) static size_t drmp3__on_read_memory(void* pUserData, void* pBufferOut, size_t bytesToRead)
{ {
@@ -2527,7 +2538,10 @@ static drmp3_bool32 drmp3__on_seek_memory(void* pUserData, int byteOffset, drmp3
drmp3_bool32 drmp3_init_memory(drmp3* pMP3, const void* pData, size_t dataSize, const drmp3_config* pConfig) drmp3_bool32 drmp3_init_memory(drmp3* pMP3, const void* pData, size_t dataSize, const drmp3_config* pConfig)
{ {
if (pMP3 == NULL) return DRMP3_FALSE; if (pMP3 == NULL) {
return DRMP3_FALSE;
}
drmp3_zero_object(pMP3); drmp3_zero_object(pMP3);
if (pData == NULL || dataSize == 0) { if (pData == NULL || dataSize == 0) {
@@ -2538,7 +2552,7 @@ drmp3_bool32 drmp3_init_memory(drmp3* pMP3, const void* pData, size_t dataSize,
pMP3->memory.dataSize = dataSize; pMP3->memory.dataSize = dataSize;
pMP3->memory.currentReadPos = 0; pMP3->memory.currentReadPos = 0;
return drmp3_init(pMP3, drmp3__on_read_memory, drmp3__on_seek_memory, pMP3, pConfig); return drmp3_init_internal(pMP3, drmp3__on_read_memory, drmp3__on_seek_memory, pMP3, pConfig);
} }
@@ -2757,6 +2771,9 @@ void drmp3_free(void* p)
// REVISION HISTORY // REVISION HISTORY
// =============== // ===============
// //
// v0.2.2 - 2018-04-28
// - Fix bug when opening a decoder from memory.
//
// v0.2.1 - 2018-04-27 // v0.2.1 - 2018-04-27
// - Efficiency improvements when the decoder reaches the end of the stream. // - Efficiency improvements when the decoder reaches the end of the stream.
// //