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

Fix an error in the simple_mixing example.

Browse Source 
Public issue https://github.com/mackron/miniaudio/issues/388
This commit is contained in:
David Reid
2022-01-01 07:42:42 +10:00
parent 42abbbea46
commit cf024cb71f
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/simple_mixing.c
+7 -6
View File
@@ -48,21 +48,22 @@ ma_uint32 read_and_mix_pcm_frames_f32(ma_decoder* pDecoder, float* pOutputF32, m
contents of the output buffer by simply adding the samples together. You could also clip the samples to -1..+1, but I'm not contents of the output buffer by simply adding the samples together. You could also clip the samples to -1..+1, but I'm not
doing that in this example. doing that in this example.
*/ */
ma_result result;
float temp[4096]; float temp[4096];
ma_uint32 tempCapInFrames = ma_countof(temp) / CHANNEL_COUNT; ma_uint32 tempCapInFrames = ma_countof(temp) / CHANNEL_COUNT;
ma_uint32 totalFramesRead = 0; ma_uint32 totalFramesRead = 0;
while (totalFramesRead < frameCount) { while (totalFramesRead < frameCount) {
ma_uint32 iSample; ma_uint64 iSample;
ma_uint32 framesReadThisIteration; ma_uint64 framesReadThisIteration;
ma_uint32 totalFramesRemaining = frameCount - totalFramesRead; ma_uint32 totalFramesRemaining = frameCount - totalFramesRead;
ma_uint32 framesToReadThisIteration = tempCapInFrames; ma_uint32 framesToReadThisIteration = tempCapInFrames;
if (framesToReadThisIteration > totalFramesRemaining) { if (framesToReadThisIteration > totalFramesRemaining) {
framesToReadThisIteration = totalFramesRemaining; framesToReadThisIteration = totalFramesRemaining;
} }
framesReadThisIteration = (ma_uint32)ma_decoder_read_pcm_frames(pDecoder, temp, framesToReadThisIteration, NULL); result = ma_decoder_read_pcm_frames(pDecoder, temp, framesToReadThisIteration, &framesReadThisIteration);
if (framesReadThisIteration == 0) { if (result != MA_SUCCESS || framesReadThisIteration == 0) {
break; break;
} }
@@ -71,9 +72,9 @@ ma_uint32 read_and_mix_pcm_frames_f32(ma_decoder* pDecoder, float* pOutputF32, m
pOutputF32[totalFramesRead*CHANNEL_COUNT + iSample] += temp[iSample]; pOutputF32[totalFramesRead*CHANNEL_COUNT + iSample] += temp[iSample];
} }
totalFramesRead += framesReadThisIteration; totalFramesRead += (ma_uint32)framesReadThisIteration;
if (framesReadThisIteration < framesToReadThisIteration) { if (framesReadThisIteration < (ma_uint32)framesToReadThisIteration) {
break; /* Reached EOF. */ break; /* Reached EOF. */
} }
} }