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

Bug Fix: Greatly improve audio buffer handling

Browse source 
Buffers were being treated as empty before they were actually processed,
due to races between the current node's end of stream marker and
actually feeding the output buffer.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
This commit is contained in:
Christopher Snowhill 2025-03-04 00:15:47 -08:00
parent 915e212ae5
commit bce00aff2e
9 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Audio/Chain/ConverterNode.m
View file

@ -110,7 +110,8 @@ void scale_by_volume(float *buffer, size_t count, float volume) {
AudioChunk *chunk = nil; AudioChunk *chunk = nil;
chunk = [self convert]; chunk = [self convert];
if(!chunk || ![chunk frameCount]) { if(!chunk || ![chunk frameCount]) {
if([self endOfStream] == YES) { if([previousNode endOfStream] == YES) {
endOfStream = YES;
break; break;
} }
if(paused || !streamFormatChanged) { if(paused || !streamFormatChanged) {
@ -127,6 +128,7 @@ void scale_by_volume(float *buffer, size_t count, float volume) {
} }
} }
} }
endOfStream = YES;
} }
- (AudioChunk *)convert { - (AudioChunk *)convert {
@ -163,7 +165,7 @@ void scale_by_volume(float *buffer, size_t count, float volume) {
ssize_t bytesReadFromInput = 0; ssize_t bytesReadFromInput = 0;
while(bytesReadFromInput < amountToWrite && !stopping && !paused && !streamFormatChanged && [self shouldContinue] == YES && [self endOfStream] == NO) { while(bytesReadFromInput < amountToWrite && !stopping && !paused && !streamFormatChanged && [self shouldContinue] == YES && !([[previousNode buffer] isEmpty] && [previousNode endOfStream] == YES)) {
AudioStreamBasicDescription inf; AudioStreamBasicDescription inf;
uint32_t config; uint32_t config;
if([self peekFormat:&inf channelConfig:&config]) { if([self peekFormat:&inf channelConfig:&config]) {
@ -203,7 +205,7 @@ void scale_by_volume(float *buffer, size_t count, float volume) {
return nil; return nil;
} }
if(stopping || paused || streamFormatChanged || [self shouldContinue] == NO || [self endOfStream] == YES) { if(stopping || paused || streamFormatChanged || [self shouldContinue] == NO || ([[previousNode buffer] isEmpty] && [previousNode endOfStream] == YES)) {
if(!skipResampler) { if(!skipResampler) {
if(!is_postextrapolated_) { if(!is_postextrapolated_) {
is_postextrapolated_ = 1; is_postextrapolated_ = 1;

5
Audio/Chain/DSP/DSPDownmixNode.m
View file

@ -110,7 +110,7 @@
AudioChunk *chunk = nil; AudioChunk *chunk = nil;
chunk = [self convert]; chunk = [self convert];
if(!chunk || ![chunk frameCount]) { if(!chunk || ![chunk frameCount]) {
if([self endOfStream] == YES) { if([previousNode endOfStream] == YES) {
break; break;
} }
if(paused) { if(paused) {
@ -123,6 +123,7 @@
} }
} }
} }
endOfStream = YES;
} }
- (AudioChunk *)convert { - (AudioChunk *)convert {
@ -131,7 +132,7 @@
processEntered = YES; processEntered = YES;
if(stopping || [self endOfStream] == YES || [self shouldContinue] == NO) { if(stopping || ([[previousNode buffer] isEmpty] && [previousNode endOfStream] == YES) || [self shouldContinue] == NO) {
processEntered = NO; processEntered = NO;
return nil; return nil;
} }

5
Audio/Chain/DSP/DSPEqualizerNode.m
View file

@ -350,7 +350,7 @@ static OSStatus eqRenderCallback(void *inRefCon, AudioUnitRenderActionFlags *ioA
AudioChunk *chunk = nil; AudioChunk *chunk = nil;
chunk = [self convert]; chunk = [self convert];
if(!chunk || ![chunk frameCount]) { if(!chunk || ![chunk frameCount]) {
if([self endOfStream] == YES) { if([previousNode endOfStream] == YES) {
break; break;
} }
if(paused) { if(paused) {
@ -366,6 +366,7 @@ static OSStatus eqRenderCallback(void *inRefCon, AudioUnitRenderActionFlags *ioA
} }
} }
} }
endOfStream = YES;
} }
- (AudioChunk *)convert { - (AudioChunk *)convert {
@ -374,7 +375,7 @@ static OSStatus eqRenderCallback(void *inRefCon, AudioUnitRenderActionFlags *ioA
processEntered = YES; processEntered = YES;
if(stopping || [self endOfStream] == YES || [self shouldContinue] == NO) { if(stopping || ([[previousNode buffer] isEmpty] && [previousNode endOfStream] == YES) || [self shouldContinue] == NO) {
processEntered = NO; processEntered = NO;
return nil; return nil;
} }

5
Audio/Chain/DSP/DSPFSurroundNode.m
View file

@ -146,7 +146,7 @@ static void * kDSPFSurroundNodeContext = &kDSPFSurroundNodeContext;
AudioChunk *chunk = nil; AudioChunk *chunk = nil;
chunk = [self convert]; chunk = [self convert];
if(!chunk || ![chunk frameCount]) { if(!chunk || ![chunk frameCount]) {
if([self endOfStream] == YES) { if([previousNode endOfStream] == YES) {
break; break;
} }
if(paused) { if(paused) {
@ -162,6 +162,7 @@ static void * kDSPFSurroundNodeContext = &kDSPFSurroundNodeContext;
} }
} }
} }
endOfStream = YES;
} }
- (AudioChunk *)convert { - (AudioChunk *)convert {
@ -170,7 +171,7 @@ static void * kDSPFSurroundNodeContext = &kDSPFSurroundNodeContext;
processEntered = YES; processEntered = YES;
if(stopping || [self endOfStream] == YES || [self shouldContinue] == NO) { if(stopping || ([[previousNode buffer] isEmpty] && [previousNode endOfStream] == YES) || [self shouldContinue] == NO) {
processEntered = NO; processEntered = NO;
return nil; return nil;
} }

5
Audio/Chain/DSP/DSPHRTFNode.m
View file

@ -271,7 +271,7 @@ static void unregisterMotionListener(void) {
AudioChunk *chunk = nil; AudioChunk *chunk = nil;
chunk = [self convert]; chunk = [self convert];
if(!chunk || ![chunk frameCount]) { if(!chunk || ![chunk frameCount]) {
if([self endOfStream] == YES) { if([previousNode endOfStream] == YES) {
break; break;
} }
if(paused) { if(paused) {
@ -287,6 +287,7 @@ static void unregisterMotionListener(void) {
} }
} }
} }
endOfStream = YES;
} }
- (AudioChunk *)convert { - (AudioChunk *)convert {
@ -295,7 +296,7 @@ static void unregisterMotionListener(void) {
processEntered = YES; processEntered = YES;
if(stopping || [self endOfStream] == YES || [self shouldContinue] == NO) { if(stopping || ([[previousNode buffer] isEmpty] && [previousNode endOfStream] == YES) || [self shouldContinue] == NO) {
processEntered = NO; processEntered = NO;
return nil; return nil;
} }

4
Audio/Chain/DSP/DSPRubberbandNode.m
View file

@ -361,7 +361,6 @@ static void * kDSPRubberbandNodeContext = &kDSPRubberbandNodeContext;
chunk = [self convert]; chunk = [self convert];
if(!chunk || ![chunk frameCount]) { if(!chunk || ![chunk frameCount]) {
if(flushed) { if(flushed) {
endOfStream = YES;
break; break;
} }
if(paused) { if(paused) {
@ -381,6 +380,7 @@ static void * kDSPRubberbandNodeContext = &kDSPRubberbandNodeContext;
} }
} }
} }
endOfStream = YES;
} }
- (AudioChunk *)convert { - (AudioChunk *)convert {
@ -389,7 +389,7 @@ static void * kDSPRubberbandNodeContext = &kDSPRubberbandNodeContext;
processEntered = YES; processEntered = YES;
if(stopping || flushed || [self endOfStream] == YES || [self shouldContinue] == NO) { if(stopping || flushed || ([[previousNode buffer] isEmpty] && [previousNode endOfStream] == YES) || [self shouldContinue] == NO) {
processEntered = NO; processEntered = NO;
return nil; return nil;
} }

6
Audio/Chain/Node.m
View file

@ -257,7 +257,6 @@ static uint64_t _Node_serial;
} }
if([[previousNode buffer] isEmpty] && [previousNode endOfStream] == YES) { if([[previousNode buffer] isEmpty] && [previousNode endOfStream] == YES) {
endOfStream = YES;
[accessLock unlock]; [accessLock unlock];
inPeek = NO; inPeek = NO;
return NO; return NO;
@ -296,7 +295,6 @@ static uint64_t _Node_serial;
} }
if([[previousNode buffer] isEmpty] && [previousNode endOfStream] == YES) { if([[previousNode buffer] isEmpty] && [previousNode endOfStream] == YES) {
endOfStream = YES;
[accessLock unlock]; [accessLock unlock];
inPeek = NO; inPeek = NO;
return NO; return NO;
@ -338,7 +336,6 @@ static uint64_t _Node_serial;
} }
if([[previousNode buffer] isEmpty] && [previousNode endOfStream] == YES) { if([[previousNode buffer] isEmpty] && [previousNode endOfStream] == YES) {
endOfStream = YES;
[accessLock unlock]; [accessLock unlock];
inRead = NO; inRead = NO;
return [[AudioChunk alloc] init]; return [[AudioChunk alloc] init];
@ -408,7 +405,6 @@ static uint64_t _Node_serial;
} }
if([[previousNode buffer] isEmpty] && [previousNode endOfStream] == YES) { if([[previousNode buffer] isEmpty] && [previousNode endOfStream] == YES) {
endOfStream = YES;
[accessLock unlock]; [accessLock unlock];
inRead = NO; inRead = NO;
return [[AudioChunk alloc] init]; return [[AudioChunk alloc] init];
@ -461,7 +457,6 @@ static uint64_t _Node_serial;
[accessLock lock]; [accessLock lock];
if([[previousNode buffer] isEmpty] && [previousNode endOfStream] == YES) { if([[previousNode buffer] isEmpty] && [previousNode endOfStream] == YES) {
endOfStream = YES;
[accessLock unlock]; [accessLock unlock];
inMerge = NO; inMerge = NO;
return [[AudioChunk alloc] init]; return [[AudioChunk alloc] init];
@ -519,7 +514,6 @@ static uint64_t _Node_serial;
[accessLock lock]; [accessLock lock];
if([[previousNode buffer] isEmpty] && [previousNode endOfStream] == YES) { if([[previousNode buffer] isEmpty] && [previousNode endOfStream] == YES) {
endOfStream = YES;
[accessLock unlock]; [accessLock unlock];
inMerge = NO; inMerge = NO;
return [[AudioChunk alloc] init]; return [[AudioChunk alloc] init];

14
Audio/Chain/OutputNode.m
View file

@ -112,10 +112,10 @@
if(finalNode) { if(finalNode) {
AudioChunk *ret = [super readChunk:amount]; AudioChunk *ret = [super readChunk:amount];
/* if (n == 0) { if((!ret || ![ret frameCount]) && [previousNode endOfStream]) {
DLog(@"Output Buffer dry!"); endOfStream = YES;
} }
*/
return ret; return ret;
} else { } else {
return [[AudioChunk alloc] init]; return [[AudioChunk alloc] init];
@ -127,7 +127,11 @@
@autoreleasepool { @autoreleasepool {
[self setPreviousNode:[[controller bufferChain] finalNode]]; [self setPreviousNode:[[controller bufferChain] finalNode]];
return [super peekFormat:format channelConfig:config]; BOOL ret = [super peekFormat:format channelConfig:config];
if(!ret && [previousNode endOfStream]) {
endOfStream = YES;
}
return ret;
} }
} }

3
Audio/Chain/VisualizationNode.m
View file

@ -245,7 +245,7 @@ static VisualizationCollection *theCollection = nil;
AudioChunk *chunk = nil; AudioChunk *chunk = nil;
chunk = [self readAndMergeChunksAsFloat32:512]; chunk = [self readAndMergeChunksAsFloat32:512];
if(!chunk || ![chunk frameCount]) { if(!chunk || ![chunk frameCount]) {
if([self endOfStream] == YES) { if([previousNode endOfStream] == YES) {
break; break;
} }
} else { } else {
@ -255,6 +255,7 @@ static VisualizationCollection *theCollection = nil;
} }
} }
} }
endOfStream = YES;
} }
- (void)postVisPCM:(const float *)visTemp amount:(size_t)samples { - (void)postVisPCM:(const float *)visTemp amount:(size_t)samples {