TouchInstinct
/
StreamingKit
310
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed async AudioQueue stop method for determing if a queued item has finished not taking into account upcoming queued items that aren't being decoded because they're incompatible

This commit is contained in:
Thong Nguyen 2014-01-22 22:52:51 +00:00
parent c100cb7202
commit b4948882e4
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
StreamingKit/StreamingKit/STKAudioPlayer.m
View File

@ -246,6 +246,19 @@ AudioQueueBufferRefLookupEntry;
}
}
-(BOOL) couldBeIncompatible:(AudioStreamBasicDescription*)basicDescription
{
if (self->audioStreamBasicDescription.mSampleRate != 0)
{
if (memcmp(&(self->audioStreamBasicDescription), basicDescription, sizeof(*basicDescription)) != 0)
{
return YES;
}
}
return NO;
}
-(NSString*) description
{
return [[self queueItemId] description];
@ -1090,7 +1103,15 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
}
}
if ([upcomingQueue peek] == nil && everythingInBufferingQueueBuffered)
BOOL upcomingExistsAndIsIncompatible = NO;
STKQueueEntry* upcoming = [upcomingQueue peek];
if (upcoming != nil)
{
upcomingExistsAndIsIncompatible = [upcoming couldBeIncompatible:&currentAudioStreamBasicDescription];
}
if ((upcoming == nil || upcomingExistsAndIsIncompatible) && everythingInBufferingQueueBuffered)
{
if (self.internalState != AudioPlayerInternalStateFlushingAndStoppingButStillPlaying)
{
@ -1834,12 +1855,9 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
if (next)
{
if (next->audioStreamBasicDescription.mSampleRate != 0)
if ([next couldBeIncompatible:&currentAudioStreamBasicDescription])
{
if (memcmp(&next->audioStreamBasicDescription, &currentAudioStreamBasicDescription, sizeof(currentAudioStreamBasicDescription)) != 0)
{
nextIsIncompatible = YES;
}
nextIsIncompatible = YES;
}
}
}