kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Core Audio output: Fix output stopping properly

CQTexperiment
Christopher Snowhill 2022-01-11 07:52:44 -08:00
parent 72210c67e4
commit 4dd46a1b5b
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Audio/Output/OutputCoreAudio.h
View File

@ -23,6 +23,8 @@
BOOL stopping; BOOL stopping;
BOOL stopped; BOOL stopped;
size_t outputSilenceBlocks;
BOOL listenerapplied; BOOL listenerapplied;
float volume; float volume;

13
Audio/Output/OutputCoreAudio.m
View File

@ -26,6 +26,7 @@ extern void scale_by_volume(float * buffer, size_t count, float volume);
volume = 1.0; volume = 1.0;
outputDeviceID = -1; outputDeviceID = -1;
listenerapplied = NO; listenerapplied = NO;
outputSilenceBlocks = 0;
[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.outputDevice" options:0 context:NULL]; [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.outputDevice" options:0 context:NULL];
} }
@ -225,6 +226,7 @@ default_device_changed(AudioObjectID inObjectID, UInt32 inNumberAddresses, const
stopping = NO; stopping = NO;
stopped = NO; stopped = NO;
outputDeviceID = -1; outputDeviceID = -1;
outputSilenceBlocks = 0;
AVAudioFormat *format, *renderFormat; AVAudioFormat *format, *renderFormat;
AudioComponentDescription desc; AudioComponentDescription desc;
@ -307,7 +309,7 @@ default_device_changed(AudioObjectID inObjectID, UInt32 inNumberAddresses, const
if (err != nil) if (err != nil)
return NO; return NO;
float * volume = &self->volume; __unsafe_unretained typeof(self) weakSelf = self;
_au.outputProvider = ^AUAudioUnitStatus(AudioUnitRenderActionFlags * actionFlags, const AudioTimeStamp * timestamp, AUAudioFrameCount frameCount, NSInteger inputBusNumber, AudioBufferList * inputData) _au.outputProvider = ^AUAudioUnitStatus(AudioUnitRenderActionFlags * actionFlags, const AudioTimeStamp * timestamp, AUAudioFrameCount frameCount, NSInteger inputBusNumber, AudioBufferList * inputData)
{ {
@ -319,11 +321,13 @@ default_device_changed(AudioObjectID inObjectID, UInt32 inNumberAddresses, const
amountToRead = framesToRead * (self->deviceFormat.mBytesPerPacket); amountToRead = framesToRead * (self->deviceFormat.mBytesPerPacket);
if (self->stopping == YES) if (self->outputSilenceBlocks || self->stopping == YES)
{ {
self->stopped = YES;
memset(readPointer, 0, amountToRead); memset(readPointer, 0, amountToRead);
inputData->mBuffers[0].mDataByteSize = amountToRead; inputData->mBuffers[0].mDataByteSize = amountToRead;
if (self->outputSilenceBlocks &&
--self->outputSilenceBlocks == 0)
[weakSelf stop];
return 0; return 0;
} }
@ -331,6 +335,7 @@ default_device_changed(AudioObjectID inObjectID, UInt32 inNumberAddresses, const
{ {
memset(readPointer, 0, amountToRead); memset(readPointer, 0, amountToRead);
inputData->mBuffers[0].mDataByteSize = amountToRead; inputData->mBuffers[0].mDataByteSize = amountToRead;
self->outputSilenceBlocks = 48;
return 0; return 0;
} }
@ -344,7 +349,7 @@ default_device_changed(AudioObjectID inObjectID, UInt32 inNumberAddresses, const
} }
int framesRead = amountRead / sizeof(float); int framesRead = amountRead / sizeof(float);
scale_by_volume((float*)readPointer, framesRead, *volume); scale_by_volume((float*)readPointer, framesRead, weakSelf->volume);
if (amountRead < amountToRead) if (amountRead < amountToRead)
{ {