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

Initialize some pointers properly, and redesign to reallocate the converter buffer instead of freeing it every time

Browse source
This commit is contained in:
Chris Moeller 2013-10-13 05:14:57 -07:00
parent 2997033e6b
commit a52c54a12c
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Audio/Chain/ConverterNode.m
View file

@ -37,6 +37,11 @@ void PrintStreamDesc (AudioStreamBasicDescription *inDesc)
{ {
rgInfo = nil; rgInfo = nil;
converterFloat = NULL;
converter = NULL;
floatBuffer = NULL;
callbackBuffer = NULL;
[[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.volumeScaling" options:0 context:nil]; [[NSUserDefaultsController sharedUserDefaultsController] addObserver:self forKeyPath:@"values.volumeScaling" options:0 context:nil];
} }
@ -119,11 +124,7 @@ static OSStatus ACInputProc(AudioConverterRef inAudioConverter,
amountToWrite = (*ioNumberDataPackets)*(converter->inputFormat.mBytesPerPacket); amountToWrite = (*ioNumberDataPackets)*(converter->inputFormat.mBytesPerPacket);
if (converter->callbackBuffer != NULL) converter->callbackBuffer = realloc(converter->callbackBuffer, amountToWrite);
{
free(converter->callbackBuffer);
}
converter->callbackBuffer = malloc(amountToWrite);
amountRead = [converter readData:converter->callbackBuffer amount:amountToWrite]; amountRead = [converter readData:converter->callbackBuffer amount:amountToWrite];
if (amountRead == 0 && [converter endOfStream] == NO) if (amountRead == 0 && [converter endOfStream] == NO)
@ -330,6 +331,9 @@ static float db_to_scale(float db)
floatFormat.mBytesPerFrame = (32/8)*floatFormat.mChannelsPerFrame; floatFormat.mBytesPerFrame = (32/8)*floatFormat.mChannelsPerFrame;
floatFormat.mBytesPerPacket = floatFormat.mBytesPerFrame * floatFormat.mFramesPerPacket; floatFormat.mBytesPerPacket = floatFormat.mBytesPerFrame * floatFormat.mFramesPerPacket;
floatOffset = 0;
floatSize = 0;
stat = AudioConverterNew( &inputFormat, &floatFormat, &converterFloat ); stat = AudioConverterNew( &inputFormat, &floatFormat, &converterFloat );
if (stat != noErr) if (stat != noErr)
{ {