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

Fix some bugs in ma_data_source_read_pcm_frames()

Browse Source 
* A crash when the pFramesRead parameter is null
  * Looping not working due to MA_AT_END now being returned.

Public issue https://github.com/dr-soft/miniaudio/issues/185
This commit is contained in:
David Reid
2020-08-01 11:39:58 +10:00
parent 0a9f0c625c
commit 54fe965bc0
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+7 -2
View File
@@ -41230,7 +41230,7 @@ MA_API ma_result ma_data_source_read_pcm_frames(ma_data_source* pDataSource, voi
If we encounted an error from the read callback, make sure it's propagated to the caller. The caller may need to know whether or not MA_BUSY is returned which is If we encounted an error from the read callback, make sure it's propagated to the caller. The caller may need to know whether or not MA_BUSY is returned which is
not necessarily considered an error. not necessarily considered an error.
*/ */
if (result != MA_SUCCESS) { if (result != MA_SUCCESS && result != MA_AT_END) {
break; break;
} }
@@ -41238,7 +41238,7 @@ MA_API ma_result ma_data_source_read_pcm_frames(ma_data_source* pDataSource, voi
We can determine if we've reached the end by checking the return value of the onRead() callback. If it's less than what we requested it means We can determine if we've reached the end by checking the return value of the onRead() callback. If it's less than what we requested it means
we've reached the end. To loop back to the start, all we need to do is seek back to the first frame. we've reached the end. To loop back to the start, all we need to do is seek back to the first frame.
*/ */
if (framesProcessed < framesRemaining) { if (framesProcessed < framesRemaining || result == MA_AT_END) {
if (ma_data_source_seek_to_pcm_frame(pDataSource, 0) != MA_SUCCESS) { if (ma_data_source_seek_to_pcm_frame(pDataSource, 0) != MA_SUCCESS) {
break; break;
} }
@@ -41249,7 +41249,10 @@ MA_API ma_result ma_data_source_read_pcm_frames(ma_data_source* pDataSource, voi
} }
} }
if (pFramesRead != NULL) {
*pFramesRead = totalFramesProcessed; *pFramesRead = totalFramesProcessed;
}
return result; return result;
} }
} }
@@ -62309,6 +62312,8 @@ v0.10.16 - TBD
- OpenSL: Enable runtime linking. - OpenSL: Enable runtime linking.
- OpenSL: Fix a multithreading bug when initializing and uninitializing multiple contexts at the same time. - OpenSL: Fix a multithreading bug when initializing and uninitializing multiple contexts at the same time.
- iOS: Improvements to device enumeration. - iOS: Improvements to device enumeration.
- Fix a crash in ma_data_source_read_pcm_frames() when the output frame count parameter is NULL.
- Fix a bug in ma_data_source_read_pcm_frames() where looping doesn't work.
- Fix some compilation warnings on Windows when both DirectSound and WinMM are disabled. - Fix some compilation warnings on Windows when both DirectSound and WinMM are disabled.
- Fix some compilation warnings when no decoders are enabled. - Fix some compilation warnings when no decoders are enabled.
- Updates to documentation. - Updates to documentation.