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

Fixed some synchronization problems.

CQTexperiment
vspader 2007-10-20 03:24:27 +00:00
parent e78a961fa3
commit 2e44b9833e
2 changed files with 57 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Audio/AudioPlayer.m
View File

@ -209,6 +209,7 @@
[self requestNextStream: nextStreamUserInfo]; [self requestNextStream: nextStreamUserInfo];
newChain = [[BufferChain alloc] initWithController:self]; newChain = [[BufferChain alloc] initWithController:self];
@synchronized (chainQueue) {
BufferChain *lastChain = [chainQueue lastObject]; BufferChain *lastChain = [chainQueue lastObject];
if (lastChain == nil) { if (lastChain == nil) {
lastChain = bufferChain; lastChain = bufferChain;
@ -247,7 +248,7 @@
} }
[self addChainToQueue:newChain]; [self addChainToQueue:newChain];
}
[newChain release]; [newChain release];
return YES; return YES;
@ -255,6 +256,7 @@
- (void)endOfInputPlayed - (void)endOfInputPlayed
{ {
@synchronized(chainQueue) {
if ([chainQueue count] <= 0) if ([chainQueue count] <= 0)
{ {
//End of playlist //End of playlist
@ -268,7 +270,6 @@
[bufferChain release]; [bufferChain release];
@synchronized(chainQueue) {
bufferChain = [chainQueue objectAtIndex:0]; bufferChain = [chainQueue objectAtIndex:0];
[bufferChain retain]; [bufferChain retain];

24
Audio/Chain/ConverterNode.m
View File

@ -51,7 +51,7 @@ static OSStatus ACInputProc(AudioConverterRef inAudioConverter, UInt32* ioNumber
converter->callbackBuffer = malloc(amountToWrite); converter->callbackBuffer = malloc(amountToWrite);
amountRead = [converter readData:converter->callbackBuffer amount:amountToWrite]; amountRead = [converter readData:converter->callbackBuffer amount:amountToWrite];
if (amountRead == 0) if (amountRead == 0 && [converter endOfStream] == NO)
{ {
ioData->mBuffers[0].mDataByteSize = 0; ioData->mBuffers[0].mDataByteSize = 0;
*ioNumberDataPackets = 0; *ioNumberDataPackets = 0;
@ -70,20 +70,10 @@ static OSStatus ACInputProc(AudioConverterRef inAudioConverter, UInt32* ioNumber
-(void)process -(void)process
{ {
char writeBuf[CHUNK_SIZE]; char writeBuf[CHUNK_SIZE];
int amountConverted;
while ([self shouldContinue] == YES && [self endOfStream] == NO) //Need to watch EOS somehow....
while ([self shouldContinue] == YES) //Need to watch EOS somehow....
{ {
amountConverted = [self convert:writeBuf amount:CHUNK_SIZE]; int amountConverted = [self convert:writeBuf amount:CHUNK_SIZE];
// NSLog(@"Amount converted %@: %i %i", self, amountConverted, [self endOfStream]);
if (amountConverted == 0 && [self endOfStream] == YES)
{
// NSLog(@"END OF STREAM FOR ZINE DINNER!!!!");
return;
}
[self writeData:writeBuf amount:amountConverted]; [self writeData:writeBuf amount:amountConverted];
} }
} }
@ -101,12 +91,16 @@ static OSStatus ACInputProc(AudioConverterRef inAudioConverter, UInt32* ioNumber
ioData.mNumberBuffers = 1; ioData.mNumberBuffers = 1;
err = AudioConverterFillComplexBuffer(converter, ACInputProc, self, &ioNumberFrames, &ioData, NULL); err = AudioConverterFillComplexBuffer(converter, ACInputProc, self, &ioNumberFrames, &ioData, NULL);
int amountRead = ioData.mBuffers[0].mDataByteSize;
if (err == kAudioConverterErr_InvalidInputSize) //It returns insz at EOS at times...so run it again to make sure all data is converted if (err == kAudioConverterErr_InvalidInputSize) //It returns insz at EOS at times...so run it again to make sure all data is converted
{ {
return [self convert:dest amount:amount]; NSLog(@"INSIZE: %i", amountRead);
amountRead += [self convert:dest + amountRead amount:amount - amountRead];
} }
return ioData.mBuffers[0].mDataByteSize; NSLog(@"Amount read: %i/%i", amountRead, amount);
return amountRead;
} }
- (BOOL)setupWithInputFormat:(AudioStreamBasicDescription)inf outputFormat:(AudioStreamBasicDescription)outf - (BOOL)setupWithInputFormat:(AudioStreamBasicDescription)inf outputFormat:(AudioStreamBasicDescription)outf