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

Explicitly wakeup playback thread if a delayed seek was queued

This commit is contained in:
Thong Nguyen 2014-02-16 17:07:10 +00:00
parent 44b9e7d2d1
commit f99201f54d
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
StreamingKit/StreamingKit/STKAudioPlayer.m
View File

@ -977,6 +977,11 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn
double retval = entry->seekTime + (entry->framesPlayed / canonicalAudioStreamBasicDescription.mSampleRate);
OSSpinLockUnlock(&entry->spinLock);
if (retval == 0)
{
NSLog(@"");
}
return retval;
}
@ -2291,17 +2296,24 @@ OSStatus AudioConverterCallback(AudioConverterRef inAudioConverter, UInt32* ioNu
{
return;
}
if ((seekToTimeWasRequested && [currentlyPlayingEntry calculatedBitRate] > 0.0) || disposeWasRequested)
{
return;
}
if (disposeWasRequested)
{
return;
}
if (audioConverterRef == nil)
{
return;
}
if ((seekToTimeWasRequested && [currentlyPlayingEntry calculatedBitRate] > 0.0))
{
[self wakeupPlaybackThread];
return;
}
discontinuous = NO;
OSStatus status;
@ -2358,7 +2370,6 @@ OSStatus AudioConverterCallback(AudioConverterRef inAudioConverter, UInt32* ioNu
}
if (disposeWasRequested
|| (seekToTimeWasRequested && [currentlyPlayingEntry calculatedBitRate] > 0.0)
|| self.internalState == STKAudioPlayerInternalStateStopped
|| self.internalState == STKAudioPlayerInternalStateDisposed
|| self.internalState == STKAudioPlayerInternalStatePendingNext)
@ -2367,6 +2378,15 @@ OSStatus AudioConverterCallback(AudioConverterRef inAudioConverter, UInt32* ioNu
return;
}
if (seekToTimeWasRequested && [currentlyPlayingEntry calculatedBitRate] > 0.0)
{
pthread_mutex_unlock(&playerMutex);
[self wakeupPlaybackThread];
return;
}
waiting = YES;