chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Bug Fix: Add more guards to sound output block

Browse source 
These guards should prevent the one crash we saw logged.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
This commit is contained in:
Christopher Snowhill 2025-03-05 15:24:54 -08:00
parent 3d574ba187
commit 00e18da683
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Audio/Output/OutputCoreAudio.m
View file

@ -616,22 +616,24 @@ current_device_listener(AudioObjectID inObjectID, UInt32 inNumberAddresses, cons
const int channels = format->mChannelsPerFrame; const int channels = format->mChannelsPerFrame;
if(!channels) return 0; if(!channels) return 0;
if(!inputData->mNumberBuffers || !inputData->mBuffers[0].mData) return 0;
OutputCoreAudio *_self = (__bridge OutputCoreAudio *)refCon; OutputCoreAudio *_self = (__bridge OutputCoreAudio *)refCon;
int renderedSamples = 0; int renderedSamples = 0;
@autoreleasepool { @autoreleasepool {
while(renderedSamples < frameCount) { while(renderedSamples < frameCount) {
int inputRemain = _self->inputRemain; int inputRemain = _self->inputRemain;
while(!inputRemain) { while(!inputRemain || !_self->samplePtr) {
inputRemain = [_self renderAndConvert]; inputRemain = [_self renderAndConvert];
if(_self->stopping) { if(_self->stopping || !_self->samplePtr) {
inputData->mBuffers[0].mDataByteSize = frameCount * format->mBytesPerPacket; inputData->mBuffers[0].mDataByteSize = frameCount * format->mBytesPerPacket;
inputData->mBuffers[0].mNumberChannels = channels; inputData->mBuffers[0].mNumberChannels = channels;
bzero(inputData->mBuffers[0].mData, inputData->mBuffers[0].mDataByteSize); bzero(inputData->mBuffers[0].mData, inputData->mBuffers[0].mDataByteSize);
return 0; return 0;
} }
} }
if(inputRemain) { if(inputRemain && _self->samplePtr) {
int inputTodo = MIN(inputRemain, frameCount - renderedSamples); int inputTodo = MIN(inputRemain, frameCount - renderedSamples);
cblas_scopy(inputTodo * channels, _self->samplePtr, 1, ((float *)inputData->mBuffers[0].mData) + renderedSamples * channels, 1); cblas_scopy(inputTodo * channels, _self->samplePtr, 1, ((float *)inputData->mBuffers[0].mData) + renderedSamples * channels, 1);
_self->samplePtr += inputTodo * channels; _self->samplePtr += inputTodo * channels;