Update mini_al.
This commit is contained in:
parent
24cab8f920
commit
af4d23aa82
1 changed files with 40 additions and 4 deletions
44
src/external/mini_al.h
vendored
44
src/external/mini_al.h
vendored
|
@ -17343,6 +17343,10 @@ mal_uint64 mal_format_converter_read(mal_format_converter* pConverter, mal_uint6
|
||||||
|
|
||||||
totalFramesRead += framesJustRead;
|
totalFramesRead += framesJustRead;
|
||||||
pNextFramesOut += framesJustRead * frameSizeOut;
|
pNextFramesOut += framesJustRead * frameSizeOut;
|
||||||
|
|
||||||
|
if (framesJustRead < framesToReadRightNow) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Conversion required.
|
// Conversion required.
|
||||||
|
@ -17367,6 +17371,10 @@ mal_uint64 mal_format_converter_read(mal_format_converter* pConverter, mal_uint6
|
||||||
|
|
||||||
totalFramesRead += framesJustRead;
|
totalFramesRead += framesJustRead;
|
||||||
pNextFramesOut += framesJustRead * frameSizeOut;
|
pNextFramesOut += framesJustRead * frameSizeOut;
|
||||||
|
|
||||||
|
if (framesJustRead < framesToReadRightNow) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -17421,6 +17429,10 @@ mal_uint64 mal_format_converter_read(mal_format_converter* pConverter, mal_uint6
|
||||||
|
|
||||||
totalFramesRead += framesJustRead;
|
totalFramesRead += framesJustRead;
|
||||||
pNextFramesOut += framesJustRead * frameSizeOut;
|
pNextFramesOut += framesJustRead * frameSizeOut;
|
||||||
|
|
||||||
|
if (framesJustRead < framesToReadRightNow) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17480,6 +17492,10 @@ mal_uint64 mal_format_converter_read_deinterleaved(mal_format_converter* pConver
|
||||||
for (mal_uint32 iChannel = 0; iChannel < pConverter->config.channels; ++iChannel) {
|
for (mal_uint32 iChannel = 0; iChannel < pConverter->config.channels; ++iChannel) {
|
||||||
ppNextSamplesOut[iChannel] += framesJustRead * sampleSizeOut;
|
ppNextSamplesOut[iChannel] += framesJustRead * sampleSizeOut;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (framesJustRead < framesToReadRightNow) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Input data is deinterleaved.
|
// Input data is deinterleaved.
|
||||||
|
@ -17501,6 +17517,10 @@ mal_uint64 mal_format_converter_read_deinterleaved(mal_format_converter* pConver
|
||||||
for (mal_uint32 iChannel = 0; iChannel < pConverter->config.channels; ++iChannel) {
|
for (mal_uint32 iChannel = 0; iChannel < pConverter->config.channels; ++iChannel) {
|
||||||
ppNextSamplesOut[iChannel] += framesJustRead * sampleSizeOut;
|
ppNextSamplesOut[iChannel] += framesJustRead * sampleSizeOut;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (framesJustRead < framesToReadRightNow) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Conversion required.
|
// Conversion required.
|
||||||
|
@ -17531,6 +17551,10 @@ mal_uint64 mal_format_converter_read_deinterleaved(mal_format_converter* pConver
|
||||||
}
|
}
|
||||||
|
|
||||||
totalFramesRead += framesJustRead;
|
totalFramesRead += framesJustRead;
|
||||||
|
|
||||||
|
if (framesJustRead < framesToReadRightNow) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -18114,6 +18138,10 @@ mal_uint64 mal_channel_router_read_deinterleaved(mal_channel_router* pRouter, ma
|
||||||
for (mal_uint32 iChannel = 0; iChannel < pRouter->config.channelsOut; ++iChannel) {
|
for (mal_uint32 iChannel = 0; iChannel < pRouter->config.channelsOut; ++iChannel) {
|
||||||
ppNextSamplesOut[iChannel] += framesJustRead;
|
ppNextSamplesOut[iChannel] += framesJustRead;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (framesJustRead < framesToReadRightNow) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -18152,6 +18180,10 @@ mal_uint64 mal_channel_router_read_deinterleaved(mal_channel_router* pRouter, ma
|
||||||
ppNextSamplesOut[iChannel] += framesJustRead;
|
ppNextSamplesOut[iChannel] += framesJustRead;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (framesJustRead < framesToReadRightNow) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return totalFramesRead;
|
return totalFramesRead;
|
||||||
|
@ -18303,14 +18335,18 @@ mal_uint64 mal_src_read_deinterleaved__passthrough(mal_src* pSRC, mal_uint64 fra
|
||||||
framesToReadRightNow = 0xFFFFFFFF;
|
framesToReadRightNow = 0xFFFFFFFF;
|
||||||
}
|
}
|
||||||
|
|
||||||
mal_uint32 framesRead = (mal_uint32)pSRC->config.onReadDeinterleaved(pSRC, (mal_uint32)framesToReadRightNow, (void**)ppNextSamplesOut, pUserData);
|
mal_uint32 framesJustRead = (mal_uint32)pSRC->config.onReadDeinterleaved(pSRC, (mal_uint32)framesToReadRightNow, (void**)ppNextSamplesOut, pUserData);
|
||||||
if (framesRead == 0) {
|
if (framesJustRead == 0) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
totalFramesRead += framesRead;
|
totalFramesRead += framesJustRead;
|
||||||
for (mal_uint32 iChannel = 0; iChannel < pSRC->config.channels; ++iChannel) {
|
for (mal_uint32 iChannel = 0; iChannel < pSRC->config.channels; ++iChannel) {
|
||||||
ppNextSamplesOut[iChannel] += framesRead;
|
ppNextSamplesOut[iChannel] += framesJustRead;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (framesJustRead < framesToReadRightNow) {
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue