From 520f98a6b36de49c70026f14dbb8ad068b087088 Mon Sep 17 00:00:00 2001 From: kampfgnu Date: Tue, 10 Nov 2015 11:02:57 +0100 Subject: [PATCH 1/3] fix reconnect to live streams seeking to a non-zero offset works only if seek is supported (accept-ranges header) --- StreamingKit/StreamingKit/STKHTTPDataSource.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StreamingKit/StreamingKit/STKHTTPDataSource.m b/StreamingKit/StreamingKit/STKHTTPDataSource.m index bd66ab5..77e6f3e 100755 --- a/StreamingKit/StreamingKit/STKHTTPDataSource.m +++ b/StreamingKit/StreamingKit/STKHTTPDataSource.m @@ -411,7 +411,7 @@ eventsRunLoop = savedEventsRunLoop; - [self seekToOffset:self.position]; + [self seekToOffset:self->supportsSeek ? self.position : 0]; } -(void) seekToOffset:(SInt64)offset From 3bc3a85df38b3ec0aff8aabf516b469b0e26e8c2 Mon Sep 17 00:00:00 2001 From: kampfgnu Date: Thu, 26 Nov 2015 11:41:07 +0100 Subject: [PATCH 2/3] fix mono streams by removing a line that is already removed in v 0.1.25, but not in master... --- StreamingKit/StreamingKit/STKAudioPlayer.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StreamingKit/StreamingKit/STKAudioPlayer.m b/StreamingKit/StreamingKit/STKAudioPlayer.m index c5fa73b..42ec4b5 100755 --- a/StreamingKit/StreamingKit/STKAudioPlayer.m +++ b/StreamingKit/StreamingKit/STKAudioPlayer.m @@ -1947,7 +1947,7 @@ static BOOL GetHardwareCodecClassDesc(UInt32 formatId, AudioClassDescription* cl [self destroyAudioConverter]; - canonicalAudioStreamBasicDescription.mChannelsPerFrame = asbd->mChannelsPerFrame; + //canonicalAudioStreamBasicDescription.mChannelsPerFrame = asbd->mChannelsPerFrame; BOOL isRecording = currentlyReadingEntry.dataSource.recordToFileUrl != nil; if (isRecording) From f84f1ef0bd7d584b741b4cb336aef2958af2e5c5 Mon Sep 17 00:00:00 2001 From: kampfgnu Date: Thu, 26 Nov 2015 11:43:41 +0100 Subject: [PATCH 3/3] use brackets to test for formatID --- StreamingKit/StreamingKit/STKAudioPlayer.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StreamingKit/StreamingKit/STKAudioPlayer.m b/StreamingKit/StreamingKit/STKAudioPlayer.m index 42ec4b5..9d69262 100755 --- a/StreamingKit/StreamingKit/STKAudioPlayer.m +++ b/StreamingKit/StreamingKit/STKAudioPlayer.m @@ -877,7 +877,7 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn } case kAudioFileStreamProperty_ReadyToProducePackets: { - if (!audioConverterAudioStreamBasicDescription.mFormatID == kAudioFormatLinearPCM) + if (!(audioConverterAudioStreamBasicDescription.mFormatID == kAudioFormatLinearPCM)) { discontinuous = YES; }