Fixed seek not working with HTTP

Missing mime types

ExampleApp/ExampleApp.xcodeproj/project.pbxproj

@@ -365,7 +365,7 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../StreamingKit/StreamingKit",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -403,7 +403,7 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../StreamingKit/StreamingKit",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;

ExampleApp/ExampleApp/AppDelegate.m

@@ -38,6 +38,7 @@
 	audioPlayer = [[STKAudioPlayer alloc] initWithOptions:(STKAudioPlayerOptions){ .flushQueueOnSeek = YES, .enableVolumeMixer = NO, .equalizerBandFrequencies = {50, 100, 200, 400, 800, 1600, 2600, 16000} }];
 	audioPlayer.meteringEnabled = YES;
 	audioPlayer.volume = 1;
+    
 	
 	AudioPlayerView* audioPlayerView = [[AudioPlayerView alloc] initWithFrame:self.window.bounds andAudioPlayer:audioPlayer];
     
@@ -60,13 +61,22 @@
 
 -(void) audioPlayerViewPlayFromHTTPSelected:(AudioPlayerView*)audioPlayerView
 {
-	NSURL* url = [NSURL URLWithString:@"http://fs.bloom.fm/oss/audiosamples/sample.mp3"];
+    NSURL* url = [NSURL URLWithString:@"http://www.abstractpath.com/files/audiosamples/sample.mp3"];
     
     STKDataSource* dataSource = [STKAudioPlayer dataSourceFromURL:url];
     
 	[audioPlayer setDataSource:dataSource withQueueItemId:[[SampleQueueId alloc] initWithUrl:url andCount:0]];
 }
 
+-(void) audioPlayerViewPlayFromIcecastSelected:(AudioPlayerView *)audioPlayerView
+{
+    NSURL* url = [NSURL URLWithString:@"http://shoutmedia.abc.net.au:10326"];
+    
+    STKDataSource* dataSource = [STKAudioPlayer dataSourceFromURL:url];
+    
+    [audioPlayer setDataSource:dataSource withQueueItemId:[[SampleQueueId alloc] initWithUrl:url andCount:0]];
+}
+
 -(void) audioPlayerViewQueueShortFileSelected:(AudioPlayerView*)audioPlayerView
 {
     NSString* path = [[NSBundle mainBundle] pathForResource:@"airplane" ofType:@"aac"];
@@ -89,7 +99,7 @@
 
 -(void) audioPlayerViewQueuePcmWaveFileSelected:(AudioPlayerView*)audioPlayerView
 {
-	NSURL* url = [NSURL URLWithString:@"http://fs.bloom.fm/oss/audiosamples/perfectly.wav"];
+	NSURL* url = [NSURL URLWithString:@"http://www.abstractpath.com/files/audiosamples/perfectly.wav"];
     
     STKDataSource* dataSource = [STKAudioPlayer dataSourceFromURL:url];
     

ExampleApp/ExampleApp/AudioPlayerView.h

@@ -39,6 +39,7 @@
 
 @protocol AudioPlayerViewDelegate<NSObject>
 -(void) audioPlayerViewPlayFromHTTPSelected:(AudioPlayerView*)audioPlayerView;
+-(void) audioPlayerViewPlayFromIcecastSelected:(AudioPlayerView*)audioPlayerView;
 -(void) audioPlayerViewQueueShortFileSelected:(AudioPlayerView*)audioPlayerView;
 -(void) audioPlayerViewPlayFromLocalFileSelected:(AudioPlayerView*)audioPlayerView;
 -(void) audioPlayerViewQueuePcmWaveFileSelected:(AudioPlayerView*)audioPlayerView;
@@ -57,6 +58,7 @@
 	UIButton* playButton;
     UIButton* stopButton;
 	UIButton* playFromHTTPButton;
+    UIButton* playFromIcecastButton;
     UIButton* queueShortFileButton;
 	UIButton* queuePcmWaveFileFromHTTPButton;
 	UIButton* playFromLocalFileButton;

ExampleApp/ExampleApp/AudioPlayerView.m

@@ -61,39 +61,44 @@
 		playFromHTTPButton.frame = CGRectMake((320 - size.width) / 2, frame.size.height * 0.10, size.width, size.height);
 		[playFromHTTPButton addTarget:self action:@selector(playFromHTTPButtonTouched) forControlEvents:UIControlEventTouchUpInside];
 		[playFromHTTPButton setTitle:@"Play from HTTP" forState:UIControlStateNormal];
+        
+        playFromIcecastButton = [UIButton buttonWithType:UIButtonTypeRoundedRect];
+        playFromIcecastButton.frame = CGRectMake((320 - size.width) / 2, frame.size.height * 0.10 + 35, size.width, size.height);
+        [playFromIcecastButton addTarget:self action:@selector(playFromIcecasButtonTouched) forControlEvents:UIControlEventTouchUpInside];
+        [playFromIcecastButton setTitle:@"Play from Icecast" forState:UIControlStateNormal];
 
 		playFromLocalFileButton = [UIButton buttonWithType:UIButtonTypeRoundedRect];
-		playFromLocalFileButton.frame = CGRectMake((320 - size.width) / 2, frame.size.height * 0.10 + 50, size.width, size.height);
+		playFromLocalFileButton.frame = CGRectMake((320 - size.width) / 2, frame.size.height * 0.10 + 70, size.width, size.height);
 		[playFromLocalFileButton addTarget:self action:@selector(playFromLocalFileButtonTouched) forControlEvents:UIControlEventTouchUpInside];
 		[playFromLocalFileButton setTitle:@"Play from Local File" forState:UIControlStateNormal];
         
         queueShortFileButton = [UIButton buttonWithType:UIButtonTypeRoundedRect];
-		queueShortFileButton.frame = CGRectMake((320 - size.width) / 2, frame.size.height * 0.10 + 100, size.width, size.height);
+		queueShortFileButton.frame = CGRectMake((320 - size.width) / 2, frame.size.height * 0.10 + 105, size.width, size.height);
 		[queueShortFileButton addTarget:self action:@selector(queueShortFileButtonTouched) forControlEvents:UIControlEventTouchUpInside];
 		[queueShortFileButton setTitle:@"Queue short file" forState:UIControlStateNormal];
 		
 		queuePcmWaveFileFromHTTPButton = [UIButton buttonWithType:UIButtonTypeRoundedRect];
-		queuePcmWaveFileFromHTTPButton.frame = CGRectMake((320 - size.width) / 2, frame.size.height * 0.10 + 150, size.width, size.height);
+		queuePcmWaveFileFromHTTPButton.frame = CGRectMake((320 - size.width) / 2, frame.size.height * 0.10 + 140, size.width, size.height);
 		[queuePcmWaveFileFromHTTPButton addTarget:self action:@selector(queuePcmWaveFileButtonTouched) forControlEvents:UIControlEventTouchUpInside];
 		[queuePcmWaveFileFromHTTPButton setTitle:@"Queue PCM/WAVE from HTTP" forState:UIControlStateNormal];
         
         size = CGSizeMake(90, 40);
         
 		playButton = [UIButton buttonWithType:UIButtonTypeRoundedRect];
-		playButton.frame = CGRectMake(30, 380, size.width, size.height);
+		playButton.frame = CGRectMake(30, 400, size.width, size.height);
 		[playButton addTarget:self action:@selector(playButtonPressed) forControlEvents:UIControlEventTouchUpInside];
         
         stopButton = [UIButton buttonWithType:UIButtonTypeRoundedRect];
-		stopButton.frame = CGRectMake((320 - size.width) - 30, 380, size.width, size.height);
+		stopButton.frame = CGRectMake((320 - size.width) - 30, 400, size.width, size.height);
 		[stopButton addTarget:self action:@selector(stopButtonPressed) forControlEvents:UIControlEventTouchUpInside];
         [stopButton setTitle:@"Stop" forState:UIControlStateNormal];
 		
 		muteButton = [UIButton buttonWithType:UIButtonTypeRoundedRect];
-		muteButton.frame = CGRectMake((320 - size.width) - 30, 410, size.width, size.height);
+		muteButton.frame = CGRectMake((320 - size.width) - 30, 430, size.width, size.height);
 		[muteButton addTarget:self action:@selector(muteButtonPressed) forControlEvents:UIControlEventTouchUpInside];
 		[muteButton setTitle:@"Mute" forState:UIControlStateNormal];
 		
-		slider = [[UISlider alloc] initWithFrame:CGRectMake(20, 320, 280, 20)];
+		slider = [[UISlider alloc] initWithFrame:CGRectMake(20, 320, queuePcmWaveFileFromHTTPButton.frame.origin.y + queuePcmWaveFileFromHTTPButton.frame.size.height + 20, 20)];
 		slider.continuous = YES;
 		[slider addTarget:self action:@selector(sliderChanged) forControlEvents:UIControlEventValueChanged];
         
@@ -106,11 +111,11 @@
         
         [enableEqSwitch addTarget:self action:@selector(onEnableEqSwitch) forControlEvents:UIControlEventAllTouchEvents];
 
-        label = [[UILabel alloc] initWithFrame:CGRectMake(0, slider.frame.origin.y + slider.frame.size.height + 10, frame.size.width, 25)];
+        label = [[UILabel alloc] initWithFrame:CGRectMake(0, slider.frame.origin.y + slider.frame.size.height + 40, frame.size.width, 25)];
 		
         label.textAlignment = NSTextAlignmentCenter;
         
-        statusLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, slider.frame.origin.y + slider.frame.size.height + label.frame.size.height + 8, frame.size.width, 50)];
+        statusLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, slider.frame.origin.y + slider.frame.size.height + label.frame.size.height + 50, frame.size.width, 50)];
 		
         statusLabel.textAlignment = NSTextAlignmentCenter;
 		
@@ -121,6 +126,7 @@
 		[self addSubview:slider];
 		[self addSubview:playButton];
 		[self addSubview:playFromHTTPButton];
+        [self addSubview:playFromIcecastButton];
 		[self addSubview:playFromLocalFileButton];
         [self addSubview:queueShortFileButton];
 		[self addSubview:queuePcmWaveFileFromHTTPButton];
@@ -174,6 +180,17 @@
 		return;
 	}
 	
+    if (audioPlayer.currentlyPlayingQueueItemId == nil)
+    {
+        slider.value = 0;
+        slider.minimumValue = 0;
+        slider.maximumValue = 0;
+        
+        label.text = @"";
+        
+        return;
+    }
+    
     if (audioPlayer.duration != 0)
     {
         slider.minimumValue = 0;
@@ -188,7 +205,7 @@
         slider.minimumValue = 0;
         slider.maximumValue = 0;
         
-        label.text =  @"";
+        label.text =  [NSString stringWithFormat:@"Live stream %@", [self formatTimeFromSeconds:audioPlayer.progress]];
     }
     
     statusLabel.text = audioPlayer.state == STKAudioPlayerStateBuffering ? @"buffering" : @"";
@@ -203,6 +220,11 @@
 	[self.delegate audioPlayerViewPlayFromHTTPSelected:self];
 }
 
+-(void) playFromIcecasButtonTouched
+{
+    [self.delegate audioPlayerViewPlayFromIcecastSelected:self];
+}
+
 -(void) playFromLocalFileButtonTouched
 {
 	[self.delegate audioPlayerViewPlayFromLocalFileSelected:self];

ExampleAppMac/ExampleAppMac/AppDelegate.m

@@ -58,7 +58,7 @@
 
 -(void) playFromHTTP
 {
-	[audioPlayer play:@"http://fs.bloom.fm/oss/audiosamples/sample.mp3"];
+	[audioPlayer play:@"http://www.abstractpath.com/files/audiosamples/sample.mp3"];
 }
 
 -(void) tick:(NSTimer*)timer
@@ -72,7 +72,7 @@
 	
 	CGFloat meterWidth = 0;
 	
-    if (audioPlayer.duration != 0)
+    if (audioPlayer.currentlyPlayingQueueItemId != nil)
     {
         slider.minValue = 0;
         slider.maxValue = audioPlayer.duration;

README.md

@@ -2,7 +2,7 @@
 
 StreamingKit (formally Audjustable) is an audio playback and streaming library for iOS and Mac OSX.  StreamingKit uses CoreAudio to decompress and playback audio (using hardware or software codecs) whilst providing a clean and simple object-oriented API.
 
-The primary motivation of this project was to decouple the input data sources from the actual player logic in order to allow advanced customizable input handling such as HTTP streaming, encryption/decryption, auto-recovery, dynamic-buffering. StreamingKit is the only streaming and playback library that supports dead-easy [gapless playback](https://github.com/tumtumtum/StreamingKit/wiki/Gapless-playback) between audio files of differing formats.
+The primary motivation of this project was to decouple the input data sources from the actual player logic in order to allow advanced customizable input handling such as HTTP progressive download based streaming, encryption/decryption, auto-recovery, dynamic-buffering. StreamingKit is the only streaming and playback library that supports dead-easy [gapless playback](https://github.com/tumtumtum/StreamingKit/wiki/Gapless-playback) between audio files of differing formats.
 
 ## Main Features
 
@@ -34,7 +34,7 @@ There are two main classes.  The `STKDataSource` class which is the abstract bas
 ```objective-c
 STKAudioPlayer* audioPlayer = [[STKAudioPlayer alloc] init];
 
-[audioPlayer play:@"http://fs.bloom.fm/oss/audiosamples/sample.mp3"];
+[audioPlayer play:@"http://www.abstractpath.com/files/audiosamples/sample.mp3"];
 ```
 
 ### Gapless playback
@@ -42,8 +42,8 @@ STKAudioPlayer* audioPlayer = [[STKAudioPlayer alloc] init];
 ```objective-c
 STKAudioPlayer* audioPlayer = [[STKAudioPlayer alloc] init];
 
-[audioPlayer queue:@"http://fs.bloom.fm/oss/audiosamples/sample.mp3"];
-[audioPlayer queue:@"http://fs.bloom.fm/oss/audiosamples/airplane.aac"];
+[audioPlayer queue:@"http://www.abstractpath.com/files/audiosamples/sample.mp3"];
+[audioPlayer queue:@"http://www.abstractpath.com/files/audiosamples/airplane.aac"];
 
 ```
 

StreamingKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "StreamingKit"
-  s.version      = "0.1.19"
+  s.version      = "0.1.25"
   s.summary      = "A fast and extensible audio streamer for iOS and OSX with support for gapless playback and custom (non-HTTP) sources."
   s.homepage     = "https://github.com/tumtumtum/StreamingKit/"
   s.license      = 'MIT'

StreamingKit.xcworkspace/xcshareddata/StreamingKit.xccheckout

@@ -10,29 +10,29 @@
 	<string>StreamingKit</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
-		<key>DD310C30-B3D0-4BD7-9565-9F29F09CC4F8</key>
+		<key>3E9414865BAE5433092B9D136FFC1F054EA505C2</key>
 		<string>https://github.com/tumtumtum/StreamingKit.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
 	<string>StreamingKit.xcworkspace</string>
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
-		<key>DD310C30-B3D0-4BD7-9565-9F29F09CC4F8</key>
+		<key>3E9414865BAE5433092B9D136FFC1F054EA505C2</key>
 		<string>..</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
 	<string>https://github.com/tumtumtum/StreamingKit.git</string>
 	<key>IDESourceControlProjectVersion</key>
-	<integer>110</integer>
+	<integer>111</integer>
 	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>DD310C30-B3D0-4BD7-9565-9F29F09CC4F8</string>
+	<string>3E9414865BAE5433092B9D136FFC1F054EA505C2</string>
 	<key>IDESourceControlProjectWCConfigurations</key>
 	<array>
 		<dict>
 			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
 			<string>public.vcs.git</string>
 			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>DD310C30-B3D0-4BD7-9565-9F29F09CC4F8</string>
+			<string>3E9414865BAE5433092B9D136FFC1F054EA505C2</string>
 			<key>IDESourceControlWCCName</key>
 			<string>StreamingKit</string>
 		</dict>

StreamingKit/StreamingKit.xcodeproj/project.pbxproj

@@ -7,8 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		A1682FA318B3903900F29FEC /* STKBufferingDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = A1682FA218B3903900F29FEC /* STKBufferingDataSource.m */; };
-		A168C6F118BB67DC003D170D /* STKBufferChunk.m in Sources */ = {isa = PBXBuildFile; fileRef = A168C6F018BB67DC003D170D /* STKBufferChunk.m */; };
 		A1A4996B189E744400E2A2E2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1A4996A189E744400E2A2E2 /* Cocoa.framework */; };
 		A1A49975189E744500E2A2E2 /* StreamingKitMac.m in Sources */ = {isa = PBXBuildFile; fileRef = A1A49974189E744500E2A2E2 /* StreamingKitMac.m */; };
 		A1A4997B189E744500E2A2E2 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1E7C4D9188D57F60010896F /* XCTest.framework */; };
@@ -85,10 +83,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		A1682FA118B3903900F29FEC /* STKBufferingDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = STKBufferingDataSource.h; sourceTree = "<group>"; };
-		A1682FA218B3903900F29FEC /* STKBufferingDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = STKBufferingDataSource.m; sourceTree = "<group>"; };
-		A168C6EF18BB67DC003D170D /* STKBufferChunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = STKBufferChunk.h; sourceTree = "<group>"; };
-		A168C6F018BB67DC003D170D /* STKBufferChunk.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = STKBufferChunk.m; sourceTree = "<group>"; };
 		A1A49969189E744400E2A2E2 /* libStreamingKitMac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libStreamingKitMac.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		A1A4996A189E744400E2A2E2 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; };
 		A1A4996D189E744500E2A2E2 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -272,10 +266,6 @@
 				A1E7C4F2188D5E550010896F /* STKAudioPlayer.m */,
 				A1E7C4F3188D5E550010896F /* STKAutoRecoveringHTTPDataSource.h */,
 				A1E7C4F4188D5E550010896F /* STKAutoRecoveringHTTPDataSource.m */,
-				A168C6EF18BB67DC003D170D /* STKBufferChunk.h */,
-				A168C6F018BB67DC003D170D /* STKBufferChunk.m */,
-				A1682FA118B3903900F29FEC /* STKBufferingDataSource.h */,
-				A1682FA218B3903900F29FEC /* STKBufferingDataSource.m */,
 				A1E7C4F5188D5E550010896F /* STKCoreFoundationDataSource.h */,
 				A1E7C4F6188D5E550010896F /* STKCoreFoundationDataSource.m */,
 				A1E7C4F7188D5E550010896F /* STKDataSource.h */,
@@ -411,7 +401,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = STK;
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0610;
 				ORGANIZATIONNAME = "Thong Nguyen";
 			};
 			buildConfigurationList = A1E7C4C3188D57F50010896F /* Build configuration list for PBXProject "StreamingKit" */;
@@ -512,9 +502,7 @@
 				A1BF65D2189A6582004DD08C /* STKQueueEntry.m in Sources */,
 				A1E7C504188D5E550010896F /* STKHTTPDataSource.m in Sources */,
 				A1E7C503188D5E550010896F /* STKDataSourceWrapper.m in Sources */,
-				A1682FA318B3903900F29FEC /* STKBufferingDataSource.m in Sources */,
 				A1E7C502188D5E550010896F /* STKDataSource.m in Sources */,
-				A168C6F118BB67DC003D170D /* STKBufferChunk.m in Sources */,
 				A1BF65D5189A65C6004DD08C /* NSMutableArray+STKAudioPlayer.m in Sources */,
 				A1E7C500188D5E550010896F /* STKAutoRecoveringHTTPDataSource.m in Sources */,
 			);
@@ -566,6 +554,7 @@
 		A1A49988189E744500E2A2E2 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(DEVELOPER_FRAMEWORKS_DIR)",
@@ -586,6 +575,7 @@
 		A1A49989189E744500E2A2E2 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -674,7 +664,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 			};
@@ -705,7 +695,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};

StreamingKit/StreamingKit/STKAudioPlayer.m

@@ -42,6 +42,10 @@
 #import "libkern/OSAtomic.h"
 #import <float.h>
 
+#ifndef DBL_MAX
+#define DBL_MAX 1.7976931348623157e+308
+#endif
+
 #pragma mark Defines
 
 #define kOutputBus 0
@@ -290,7 +294,7 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn
         .componentFlagsMask = 0
 	};
     
-    const int bytesPerSample = sizeof(AudioSampleType);
+    const int bytesPerSample = 2;
     
     canonicalAudioStreamBasicDescription = (AudioStreamBasicDescription)
     {
@@ -526,7 +530,12 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn
     {
         currentlyPlayingEntry.dataSource.delegate = nil;
         [currentlyReadingEntry.dataSource unregisterForEvents];
+        
+        OSSpinLockLock(&currentEntryReferencesLock);
+        
 		currentlyPlayingEntry = nil;
+        
+        OSSpinLockUnlock(&currentEntryReferencesLock);
     }
     
     [self stopAudioUnitWithReason:STKAudioPlayerStopReasonDisposed];
@@ -796,7 +805,11 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn
 
                 pthread_mutex_lock(&playerMutex);
                 
-                entryToUpdate->audioStreamBasicDescription = newBasicDescription;
+                if (entryToUpdate->audioStreamBasicDescription.mFormatID == 0)
+                {
+                    entryToUpdate->audioStreamBasicDescription = newBasicDescription;
+                }
+                
                 entryToUpdate->sampleRate = entryToUpdate->audioStreamBasicDescription.mSampleRate;
                 entryToUpdate->packetDuration = entryToUpdate->audioStreamBasicDescription.mFramesPerPacket / entryToUpdate->sampleRate;
 
@@ -877,13 +890,8 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn
                 
                 if (pasbd.mFormatID == kAudioFormatMPEG4AAC_HE || pasbd.mFormatID == kAudioFormatMPEG4AAC_HE_V2)
                 {
-                    //
-                    // We've found HE-AAC, remember this to tell the audio queue
-                    // when we construct it.
-                    //
-#if !TARGET_IPHONE_SIMULATOR
                     currentlyReadingEntry->audioStreamBasicDescription = pasbd;
-#endif
+
                     break;
                 }
             }
@@ -924,20 +932,15 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn
     }
     
     OSSpinLockLock(&currentEntryReferencesLock);
-    
     STKQueueEntry* entry = currentlyPlayingEntry;
+	OSSpinLockUnlock(&currentEntryReferencesLock);
     
     if (entry == nil)
     {
-		OSSpinLockUnlock(&currentEntryReferencesLock);
-        
-        return 0;
+		return 0;
     }
     
     double retval = [entry duration];
-    
-	OSSpinLockUnlock(&currentEntryReferencesLock);
-    
     double progress = [self progress];
     
     if (retval < progress && retval > 0)
@@ -960,7 +963,9 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn
         return 0;
     }
     
+    OSSpinLockLock(&currentEntryReferencesLock);
     STKQueueEntry* entry = currentlyPlayingEntry;
+    OSSpinLockUnlock(&currentEntryReferencesLock);
     
     if (entry == nil)
     {
@@ -1347,7 +1352,6 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn
         }
     }
     pthread_mutex_unlock(&playerMutex);
-
     
     return YES;
 }
@@ -1398,6 +1402,8 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn
 		
 		playbackThreadRunLoop = nil;
 
+		[self destroyAudioResources];
+		
 		[threadFinishedCondLock lock];
 		[threadFinishedCondLock unlockWithCondition:1];
 	}
@@ -1862,7 +1868,7 @@ static BOOL GetHardwareCodecClassDesc(UInt32 formatId, AudioClassDescription* cl
 {
     OSStatus status;
     Boolean writable;
-	UInt32 cookieSize;
+    UInt32 cookieSize = 0;
     
     if (memcmp(asbd, &audioConverterAudioStreamBasicDescription, sizeof(AudioStreamBasicDescription)) == 0)
     {
@@ -1894,11 +1900,16 @@ static BOOL GetHardwareCodecClassDesc(UInt32 formatId, AudioClassDescription* cl
 
     audioConverterAudioStreamBasicDescription = *asbd;
     
-	status = AudioFileStreamGetPropertyInfo(audioFileStream, kAudioFileStreamProperty_MagicCookieData, &cookieSize, &writable);
+    if (self->currentlyReadingEntry.dataSource.audioFileTypeHint != kAudioFileAAC_ADTSType)
+    {
+        status = AudioFileStreamGetPropertyInfo(audioFileStream, kAudioFileStreamProperty_MagicCookieData, &cookieSize, &writable);
     
-	if (!status)
-	{
-    	void* cookieData = alloca(cookieSize);
+        if (status)
+        {
+            return;
+        }
+        
+        void* cookieData = alloca(cookieSize);
         
         status = AudioFileStreamGetProperty(audioFileStream, kAudioFileStreamProperty_MagicCookieData, &cookieSize, cookieData);
         
@@ -1911,6 +1922,8 @@ static BOOL GetHardwareCodecClassDesc(UInt32 formatId, AudioClassDescription* cl
         
         if (status)
         {
+            [self unexpectedError:STKAudioPlayerErrorAudioSystemError];
+            
             return;
         }
     }
@@ -2530,11 +2543,15 @@ static OSStatus OutputRenderCallback(void* inRefCon, AudioUnitRenderActionFlags*
 {
     STKAudioPlayer* audioPlayer = (__bridge STKAudioPlayer*)inRefCon;
 
+    OSSpinLockLock(&audioPlayer->currentEntryReferencesLock);
+	STKQueueEntry* entry = audioPlayer->currentlyPlayingEntry;
+    STKQueueEntry* currentlyReadingEntry = audioPlayer->currentlyReadingEntry;
+    OSSpinLockUnlock(&audioPlayer->currentEntryReferencesLock);
+    
     OSSpinLockLock(&audioPlayer->pcmBufferSpinLock);
     
     BOOL waitForBuffer = NO;
 	BOOL muted = audioPlayer->muted;
-	STKQueueEntry* entry = audioPlayer->currentlyPlayingEntry;
     AudioBuffer* audioBuffer = audioPlayer->pcmAudioBuffer;
     UInt32 frameSizeInBytes = audioPlayer->pcmBufferFrameSizeInBytes;
     UInt32 used = audioPlayer->pcmBufferUsedFrameCount;
@@ -2552,10 +2569,10 @@ static OSStatus OutputRenderCallback(void* inRefCon, AudioUnitRenderActionFlags*
 			
 			if (entry->lastFrameQueued >= 0)
 			{
-				framesRequiredToStartPlaying = MIN(framesRequiredToStartPlaying, audioPlayer->currentlyPlayingEntry->lastFrameQueued);
+				framesRequiredToStartPlaying = MIN(framesRequiredToStartPlaying, entry->lastFrameQueued);
 			}
 			
-			if (entry && audioPlayer->currentlyReadingEntry == entry
+			if (entry && currentlyReadingEntry == entry
 				&& entry->framesQueued < framesRequiredToStartPlaying)
 			{
 				waitForBuffer = YES;
@@ -2765,13 +2782,19 @@ static OSStatus OutputRenderCallback(void* inRefCon, AudioUnitRenderActionFlags*
     {
         pthread_mutex_lock(&audioPlayer->playerMutex);
         
-        if (lastFramePlayed && entry == audioPlayer->currentlyPlayingEntry)
+        OSSpinLockLock(&audioPlayer->currentEntryReferencesLock);
+        STKQueueEntry* currentlyPlayingEntry = audioPlayer->currentlyPlayingEntry;
+        OSSpinLockUnlock(&audioPlayer->currentEntryReferencesLock);
+       
+        if (lastFramePlayed && entry == currentlyPlayingEntry)
         {
             [audioPlayer audioQueueFinishedPlaying:entry];
             
             while (extraFramesPlayedNotAssigned > 0)
             {
+                OSSpinLockLock(&audioPlayer->currentEntryReferencesLock);
                 STKQueueEntry* newEntry = audioPlayer->currentlyPlayingEntry;
+                OSSpinLockUnlock(&audioPlayer->currentEntryReferencesLock);
                 
                 if (newEntry != nil)
                 {

StreamingKit/StreamingKit/STKBufferChunk.h

@@ -1,25 +0,0 @@
-//
-//  STKBufferChunk.h
-//  StreamingKit
-//
-//  Created by Thong Nguyen on 24/02/2014.
-//  Copyright (c) 2014 Thong Nguyen. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface STKBufferChunk : NSObject
-{
-@public
-    UInt32 index;
-    UInt32 size;
-    UInt32 position;
-    UInt8* buffer;
-}
-
-@property (readonly) UInt32 absoluteStart;
-@property (readonly) UInt32 absolutePosition;
-
--(id) initWithBufferSize:(UInt32)sizeIn;
-
-@end

StreamingKit/StreamingKit/STKBufferChunk.m

@@ -1,40 +0,0 @@
-//
-//  STKBufferChunk.m
-//  StreamingKit
-//
-//  Created by Thong Nguyen on 24/02/2014.
-//  Copyright (c) 2014 Thong Nguyen. All rights reserved.
-//
-
-#import "STKBufferChunk.h"
-
-@implementation STKBufferChunk
-
--(id) initWithBufferSize:(UInt32)sizeIn
-{
-    if (self = [super init])
-    {
-        self->size = sizeIn;
-        
-        self->buffer = calloc(sizeof(UInt8), sizeIn);
-    }
-    
-    return self;
-}
-
--(void) dealloc
-{
-    free(self->buffer);
-}
-
--(UInt32) absoluteStart
-{
-	return self->index * self->size;
-}
-
--(UInt32) absolutePosition
-{
-	return self.absoluteStart + self->position;
-}
-
-@end

StreamingKit/StreamingKit/STKBufferingDataSource.h

@@ -1,44 +0,0 @@
-/**********************************************************************************
- STKBufferingDataSource.h
- 
- Created by Thong Nguyen on 16/10/2012.
- https://github.com/tumtumtum/audjustable
- 
- Copyright (c) 2012-2014 Thong Nguyen (tumtumtum@gmail.com). All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. All advertising materials mentioning features or use of this software
- must display the following acknowledgement:
- This product includes software developed by Thong Nguyen (tumtumtum@gmail.com)
- 4. Neither the name of Thong Nguyen nor the
- names of its contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY Thong Nguyen ''AS IS'' AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THONG NGUYEN BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- **********************************************************************************/
-
-#import "STKDataSource.h"
-
-@interface STKBufferingDataSource : STKDataSource
-
-@property (readonly) SInt64 position;
-@property (readonly) SInt64 length;
-
--(id) initWithDataSource:(STKDataSource*)dataSourceIn withMaxSize:(int)maxSizeIn;
-
-@end

StreamingKit/StreamingKit/STKBufferingDataSource.m

@@ -1,319 +0,0 @@
-/**********************************************************************************
- STKBufferingDataSource.m
- 
- Created by Thong Nguyen on 16/10/2012.
- https://github.com/tumtumtum/audjustable
- 
- Copyright (c) 2012-2014 Thong Nguyen (tumtumtum@gmail.com). All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. All advertising materials mentioning features or use of this software
- must display the following acknowledgement:
- This product includes software developed by Thong Nguyen (tumtumtum@gmail.com)
- 4. Neither the name of Thong Nguyen nor the
- names of its contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY Thong Nguyen ''AS IS'' AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THONG NGUYEN BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- **********************************************************************************/
-
-#import "STKBufferingDataSource.h"
-#import "STKBufferChunk.h"
-#import <pthread.h>
-
-#define STK_BUFFER_CHUNK_SIZE (128 * 1024)
-
-@interface STKBufferingDataSource()
-{
-@private
-    NSRunLoop* runLoop;
-    SInt32 maxSize;
-    UInt32 chunkSize;
-    UInt32 chunkCount;
-    SInt64 position;
-    pthread_mutex_t mutex;
-    pthread_cond_t condition;
-    STKBufferChunk* __strong * bufferChunks;
-    STKDataSource* dataSource;
-}
-@end
-
-@interface STKBufferingDataSourceThread : NSThread
-{
-@private
-    NSRunLoop* runLoop;
-    NSConditionLock* threadStartedLock;
-}
-@end
-
-@implementation STKBufferingDataSourceThread
-
--(id) init
-{
-    if (self = [super init])
-    {
-        threadStartedLock = [[NSConditionLock alloc] initWithCondition:0];
-	}
-    
-    return self;
-}
-
--(NSRunLoop*) runLoop
-{
-    [threadStartedLock lockWhenCondition:1];
-    [threadStartedLock unlockWithCondition:0];
-    
-    return self->runLoop;
-}
-
--(void) main
-{
-    runLoop = [NSRunLoop currentRunLoop];
-    
-    [threadStartedLock lockWhenCondition:0];
-    [threadStartedLock unlockWithCondition:1];
-    
-    [runLoop addPort:[NSPort port] forMode:NSDefaultRunLoopMode];
-    
-    while (true)
-    {
-        NSDate* date = [[NSDate alloc] initWithTimeIntervalSinceNow:10];
-        
-        [runLoop runMode:NSDefaultRunLoopMode beforeDate:date];
-    }
-}
-
-@end
-
-static STKBufferingDataSourceThread* thread;
-
-@implementation STKBufferingDataSource
-
-+(void) initialize
-{
-    thread = [[STKBufferingDataSourceThread alloc] init];
-    
-    [thread start];
-}
-
--(id) initWithDataSource:(STKDataSource*)dataSourceIn withMaxSize:(int)maxSizeIn
-{
-    if (self = [super init])
-    {
-        self->maxSize = maxSizeIn;
-        self->dataSource = dataSourceIn;
-        self->chunkSize = STK_BUFFER_CHUNK_SIZE;
-        
-        self->dataSource.delegate = self.delegate;
-        
-        [self->dataSource registerForEvents:[thread runLoop]];
-        
-        pthread_mutexattr_t attr;
-        
-        pthread_mutexattr_init(&attr);
-        pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-
-        pthread_mutex_init(&self->mutex, &attr);
-        pthread_cond_init(&self->condition, NULL);
-    }
-    
-    return self;
-}
-
--(void) dealloc
-{
-	self->dataSource.delegate = nil;
-    
-    for (int i = 0; i < self->chunkCount; i++)
-    {
-        self->bufferChunks[i] = nil;
-    }
-    
-    free(self->bufferChunks);
-    
-    pthread_mutex_destroy(&self->mutex);
-    pthread_cond_destroy(&self->condition);
-}
-
--(void) createBuffer
-{
-    if (self->bufferChunks == nil)
-    {
-        int length = (int)MIN(self.length == 0? 1024 * 1024 : self.length, self->maxSize);
-        
-        self->chunkCount = (int)((length / self->chunkSize) + 1);
-        self->bufferChunks = (__strong STKBufferChunk**)calloc(sizeof(STKBufferChunk*), self->chunkCount);
-    }
-}
-
--(STKBufferChunk*) chunkForPosition:(SInt64)positionIn createIfNotExist:(BOOL)createIfNotExist
-{
-    int chunkIndex = (int)(positionIn / chunkCount);
-    
-    if (self->bufferChunks[chunkIndex] == nil && createIfNotExist)
-    {
-        self->bufferChunks[chunkIndex] = [[STKBufferChunk alloc] initWithBufferSize:STK_BUFFER_CHUNK_SIZE];
-    }
-    
-    return self->bufferChunks[chunkIndex];
-}
-
--(SInt64) length
-{
-    return self->dataSource.length;
-}
-
--(void) seekToOffset:(SInt64)offset
-{
-    pthread_mutex_lock(&mutex);
-    
-    [self seekToNextGap];
-    
-    pthread_mutex_unlock(&mutex);
-}
-
--(BOOL) hasBytesAvailable
-{
-    return NO;
-}
-
--(int) readIntoBuffer:(UInt8*)bufferIn withSize:(int)size
-{
-    return 0;
-}
-
--(void) invokeBlockOnEventsRunLoop:(void(^)())block
-{
-    if (!runLoop)
-    {
-        return;
-    }
-    
-    block = [block copy];
-    
-    CFRunLoopPerformBlock(runLoop.getCFRunLoop, NSRunLoopCommonModes, ^
-    {
-        if ([self hasBytesAvailable])
-        {
-            block();
-        }
-    });
-    
-    CFRunLoopWakeUp(runLoop.getCFRunLoop);
-}
-
--(BOOL) registerForEvents:(NSRunLoop*)runLoopIn
-{
-    runLoop = runLoopIn;
-    
-    [dataSource registerForEvents:[thread runLoop]];
-    
-    return YES;
-}
-
--(void) unregisterForEvents
-{
-    runLoop = nil;
-    
-    [dataSource unregisterForEvents];
-}
-
--(void) close
-{
-    [dataSource unregisterForEvents];
-    [dataSource close];
-}
-
--(void) seekToNextGap
-{
-    int startChunkIndex = (int)(self->position / chunkCount);
-    
-    for (int i = 0; i < self->chunkCount; i++)
-    {
-        int chunkIndex = (i + startChunkIndex) % self->chunkCount;
-        
-        STKBufferChunk* chunk = self->bufferChunks[chunkIndex];
-        
-        if (chunk == nil)
-        {
-            chunk = [[STKBufferChunk alloc] initWithBufferSize:STK_BUFFER_CHUNK_SIZE];
-            
-            chunk->index = chunkIndex;
-            
-            self->bufferChunks[chunkIndex] = chunk;
-        }
-        
-        if (chunk->position < chunk->size)
-        {
-            [dataSource seekToOffset:(self->chunkSize * chunk->index) + chunk->position];
-        }
-    }
-}
-
--(void) dataSourceDataAvailable:(STKDataSource*)dataSourceIn
-{
-    if (![dataSourceIn hasBytesAvailable])
-    {
-        return;
-    }
-    
-    pthread_mutex_lock(&mutex);
-    
-    if (self->bufferChunks == nil)
-    {
-    	[self createBuffer];
-    }
-    
-    SInt64 sourcePosition = dataSourceIn.position;
-    
-    STKBufferChunk* chunk = [self chunkForPosition:sourcePosition createIfNotExist:YES];
-    
-    if (chunk->position >= chunk->size)
-    {
-        [self seekToNextGap];
-        
-        return;
-    }
-    
-    int offset = dataSourceIn.position % self->chunkSize;
-    
-    if (offset >= chunk->position)
-    {
-        [self seekToNextGap];
-        
-        return;
-    }
-    
-    int bytesToRead = self->chunkSize - offset;
-    int bytesRead = [dataSourceIn readIntoBuffer:(chunk->buffer + offset) withSize:bytesToRead];
-    
-    chunk->position = offset + bytesRead;
-    
-    pthread_mutex_unlock(&mutex);
-}
-
--(void) dataSourceErrorOccured:(STKDataSource*)dataSourceIn
-{
-    [self.delegate dataSourceErrorOccured:self];
-}
-
--(void) dataSourceEof:(STKDataSource*)dataSourceIn
-{
-}
-
-@end

StreamingKit/StreamingKit/STKCoreFoundationDataSource.h

@@ -43,9 +43,10 @@
 
 @interface STKCoreFoundationDataSource : STKDataSource
 {
+@public
+    CFReadStreamRef stream;
 @protected
     BOOL isInErrorState;
-    CFReadStreamRef stream;
     NSRunLoop* eventsRunLoop;
 }
 

StreamingKit/StreamingKit/STKCoreFoundationDataSource.m

@@ -41,8 +41,10 @@ static void ReadStreamCallbackProc(CFReadStreamRef stream, CFStreamEventType eve
     switch (eventType)
     {
         case kCFStreamEventErrorOccurred:
+        {
             [datasource errorOccured];
             break;
+        }
         case kCFStreamEventEndEncountered:
             [datasource eof];
             break;

StreamingKit/StreamingKit/STKDataSource.h

@@ -45,6 +45,7 @@
 
 @interface STKDataSource : NSObject
 
+@property (readonly) BOOL supportsSeek;
 @property (readonly) SInt64 position;
 @property (readonly) SInt64 length;
 @property (readonly) BOOL hasBytesAvailable;

StreamingKit/StreamingKit/STKDataSource.m

@@ -79,4 +79,9 @@
     return 0;
 }
 
+-(BOOL) supportsSeek
+{
+    return YES;
+}
+
 @end

StreamingKit/StreamingKit/STKHTTPDataSource.h

@@ -47,6 +47,7 @@ typedef void(^STKAsyncURLProvider)(STKHTTPDataSource* dataSource, BOOL forSeek,
 
 +(AudioFileTypeID) audioFileTypeHintFromMimeType:(NSString*)fileExtension;
 -(id) initWithURL:(NSURL*)url;
+-(id) initWithURL:(NSURL *)url httpRequestHeaders:(NSDictionary *)httpRequestHeaders;
 -(id) initWithURLProvider:(STKURLProvider)urlProvider;
 -(id) initWithAsyncURLProvider:(STKAsyncURLProvider)asyncUrlProvider;
 -(NSRunLoop*) eventsRunLoop;

StreamingKit/StreamingKit/STKHTTPDataSource.m

@@ -38,17 +38,25 @@
 @interface STKHTTPDataSource()
 {
 @private
+    BOOL supportsSeek;
     UInt32 httpStatusCode;
     SInt64 seekStart;
     SInt64 relativePosition;
     SInt64 fileLength;
     int discontinuous;
 	int requestSerialNumber;
+    int prefixBytesRead;
+    NSData* prefixBytes;
+    NSMutableData* iceHeaderData;
+    BOOL iceHeaderSearchComplete;
+    BOOL iceHeaderAvailable;
+    BOOL httpHeaderNotAvailable;
 
     NSURL* currentUrl;
     STKAsyncURLProvider asyncUrlProvider;
     NSDictionary* httpHeaders;
     AudioFileTypeID audioFileTypeHint;
+    NSDictionary* requestHeaders;
 }
 -(void) open;
 
@@ -61,6 +69,13 @@
     return [self initWithURLProvider:^NSURL* { return urlIn; }];
 }
 
+-(id) initWithURL:(NSURL *)urlIn httpRequestHeaders:(NSDictionary *)httpRequestHeaders
+{
+    self = [self initWithURLProvider:^NSURL* { return urlIn; }];
+    self->requestHeaders = httpRequestHeaders;
+    return self;
+}
+
 -(id) initWithURLProvider:(STKURLProvider)urlProviderIn
 {
 	urlProviderIn = [urlProviderIn copy];
@@ -110,6 +125,8 @@
             @"audio/mpg": @(kAudioFileMP3Type),
             @"audio/mpeg": @(kAudioFileMP3Type),
             @"audio/wav": @(kAudioFileWAVEType),
+            @"audio/x-wav": @(kAudioFileWAVEType),
+            @"audio/vnd.wav": @(kAudioFileWAVEType),
             @"audio/aifc": @(kAudioFileAIFCType),
             @"audio/aiff": @(kAudioFileAIFFType),
             @"audio/x-m4a": @(kAudioFileM4AType),
@@ -117,10 +134,18 @@
             @"audio/aacp": @(kAudioFileAAC_ADTSType),
             @"audio/m4a": @(kAudioFileM4AType),
             @"audio/mp4": @(kAudioFileMPEG4Type),
+            @"video/mp4": @(kAudioFileMPEG4Type),
             @"audio/caf": @(kAudioFileCAFType),
+            @"audio/x-caf": @(kAudioFileCAFType),
             @"audio/aac": @(kAudioFileAAC_ADTSType),
+            @"audio/aacp": @(kAudioFileAAC_ADTSType),
             @"audio/ac3": @(kAudioFileAC3Type),
-            @"audio/3gp": @(kAudioFile3GPType)
+            @"audio/3gp": @(kAudioFile3GPType),
+            @"video/3gp": @(kAudioFile3GPType),
+            @"audio/3gpp": @(kAudioFile3GPType),
+            @"video/3gpp": @(kAudioFile3GPType),
+            @"audio/3gp2": @(kAudioFile3GP2Type),
+            @"video/3gp2": @(kAudioFile3GP2Type)
         };
     });
     
@@ -139,70 +164,233 @@
     return audioFileTypeHint;
 }
 
--(void) dataAvailable
+-(NSDictionary*) parseIceHeader:(NSData*)headerData
 {
-    if (stream == NULL) {
-        return;
+    NSMutableDictionary* retval = [[NSMutableDictionary alloc] init];
+    NSCharacterSet* characterSet = [NSCharacterSet characterSetWithCharactersInString:@"\r\n"];
+    NSString* fullString = [[NSString alloc] initWithData:headerData encoding:NSUTF8StringEncoding];
+    NSArray* strings = [fullString componentsSeparatedByCharactersInSet:characterSet];
+    
+    httpHeaders = [NSMutableDictionary dictionary];
+    
+    for (NSString* s in strings)
+    {
+        if (s.length == 0)
+        {
+            continue;
+        }
+        
+        if ([s hasPrefix:@"ICY "])
+        {
+            NSArray* parts = [s componentsSeparatedByString:@" "];
+            
+            if (parts.count >= 2)
+            {
+                self->httpStatusCode = [parts[1] intValue];
+            }
+            
+            continue;
+        }
+        
+        NSRange range = [s rangeOfString:@":"];
+        
+        if (range.location == NSNotFound)
+        {
+            continue;
+        }
+        
+        NSString* key = [s substringWithRange: (NSRange){.location = 0, .length = range.location}];
+        NSString* value = [s substringFromIndex:range.location + 1];
+        
+        [retval setValue:value forKey:key];
     }
     
-	if (self.httpStatusCode == 0)
-	{
-		CFTypeRef response = CFReadStreamCopyProperty(stream, kCFStreamPropertyHTTPResponseHeader);
+    return retval;
+}
+
+-(BOOL) parseHttpHeader
+{
+    if (!httpHeaderNotAvailable)
+    {
+        CFTypeRef response = CFReadStreamCopyProperty(stream, kCFStreamPropertyHTTPResponseHeader);
         
         if (response)
         {
             httpHeaders = (__bridge_transfer NSDictionary*)CFHTTPMessageCopyAllHeaderFields((CFHTTPMessageRef)response);
             
-            self->httpStatusCode = (UInt32)CFHTTPMessageGetResponseStatusCode((CFHTTPMessageRef)response);
-            
+            if (httpHeaders.count == 0)
+            {
+                httpHeaderNotAvailable = YES;
+            }
+            else
+            {
+                self->httpStatusCode = (UInt32)CFHTTPMessageGetResponseStatusCode((CFHTTPMessageRef)response);
+            }
+
             CFRelease(response);
         }
-		
-		if (self.httpStatusCode == 200)
-		{
-			if (seekStart == 0)
-			{
-				fileLength = (SInt64)[[httpHeaders objectForKey:@"Content-Length"] longLongValue];
-			}
-			
-			NSString* contentType = [httpHeaders objectForKey:@"Content-Type"];
-			AudioFileTypeID typeIdFromMimeType = [STKHTTPDataSource audioFileTypeHintFromMimeType:contentType];
-			
-			if (typeIdFromMimeType != 0)
-			{
-				audioFileTypeHint = typeIdFromMimeType;
-			}
-		}
-		else if (self.httpStatusCode == 206)
-		{
-			NSString* contentRange = [httpHeaders objectForKey:@"Content-Range"];
-			NSArray* components = [contentRange componentsSeparatedByString:@"/"];
-			
-			if (components.count == 2)
-			{
-				fileLength = [[components objectAtIndex:1] integerValue];
-			}
-		}
-		else if (self.httpStatusCode == 416)
-		{
-			if (self.length >= 0)
-			{
-				seekStart = self.length;
-			}
-			
-			[self eof];
-			
-			return;
-		}
-		else if (self.httpStatusCode >= 300)
-		{
-			[self errorOccured];
-			
-			return;
-		}
+    }
+    
+    if (httpHeaderNotAvailable)
+    {
+        if (self->iceHeaderSearchComplete && !self->iceHeaderAvailable)
+        {
+            return YES;
+        }
+        
+        if (!self->iceHeaderSearchComplete)
+        {
+            UInt8 byte;
+            UInt8 terminal1[] = { '\n', '\n' };
+            UInt8 terminal2[] = { '\r', '\n', '\r', '\n' };
+
+            if (iceHeaderData == nil)
+            {
+                iceHeaderData = [NSMutableData dataWithCapacity:1024];
+            }
+            
+            while (true)
+            {
+                if (![self hasBytesAvailable])
+                {
+                    break;
+                }
+                
+                int read = [super readIntoBuffer:&byte withSize:1];
+                
+                if (read <= 0)
+                {
+                    break;
+                }
+                
+                [iceHeaderData appendBytes:&byte length:read];
+                
+                if (iceHeaderData.length >= sizeof(terminal1))
+                {
+                    if (memcmp(&terminal1[0], [self->iceHeaderData bytes] + iceHeaderData.length - sizeof(terminal1), sizeof(terminal1)) == 0)
+                    {
+                        self->iceHeaderAvailable = YES;
+                        self->iceHeaderSearchComplete = YES;
+                        
+                        break;
+                    }
+                }
+                
+                if (iceHeaderData.length >= sizeof(terminal2))
+                {
+                    if (memcmp(&terminal2[0], [self->iceHeaderData bytes] + iceHeaderData.length - sizeof(terminal2), sizeof(terminal2)) == 0)
+                    {
+                        self->iceHeaderAvailable = YES;
+                        self->iceHeaderSearchComplete = YES;
+                        
+                        break;
+                    }
+                }
+                
+                if (iceHeaderData.length >= 4)
+                {
+                    if (memcmp([self->iceHeaderData bytes], "ICY ", 4) != 0 && memcmp([self->iceHeaderData bytes], "HTTP", 4) != 0)
+                    {
+                        self->iceHeaderAvailable = NO;
+                        self->iceHeaderSearchComplete = YES;
+                        prefixBytes = iceHeaderData;
+                        
+                        return YES;
+                    }
+                }
+            }
+            
+            if (!self->iceHeaderSearchComplete)
+            {
+                return NO;
+            }
+        }
+
+        httpHeaders = [self parseIceHeader:self->iceHeaderData];
+        
+        self->iceHeaderData = nil;
+    }
+    
+    if (([httpHeaders objectForKey:@"Accept-Ranges"] ?: [httpHeaders objectForKey:@"accept-ranges"]) != nil)
+    {
+        self->supportsSeek = YES;
+    }
+    
+    if (self.httpStatusCode == 200)
+    {
+        if (seekStart == 0)
+        {
+            id value = [httpHeaders objectForKey:@"Content-Length"] ?: [httpHeaders objectForKey:@"content-length"];
+            
+            fileLength = (SInt64)[value longLongValue];
+        }
+        
+        NSString* contentType = [httpHeaders objectForKey:@"Content-Type"] ?: [httpHeaders objectForKey:@"content-type"] ;
+        AudioFileTypeID typeIdFromMimeType = [STKHTTPDataSource audioFileTypeHintFromMimeType:contentType];
+        
+        if (typeIdFromMimeType != 0)
+        {
+            audioFileTypeHint = typeIdFromMimeType;
+        }
+    }
+    else if (self.httpStatusCode == 206)
+    {
+        NSString* contentRange = [httpHeaders objectForKey:@"Content-Range"] ?: [httpHeaders objectForKey:@"content-range"];
+        NSArray* components = [contentRange componentsSeparatedByString:@"/"];
+        
+        if (components.count == 2)
+        {
+            fileLength = [[components objectAtIndex:1] integerValue];
+        }
+    }
+    else if (self.httpStatusCode == 416)
+    {
+        if (self.length >= 0)
+        {
+            seekStart = self.length;
+        }
+        
+        [self eof];
+        
+        return NO;
+    }
+    else if (self.httpStatusCode >= 300)
+    {
+        [self errorOccured];
+        
+        return NO;
+    }
+    
+    return YES;
+}
+
+-(void) dataAvailable
+{
+    if (stream == NULL)
+    {
+        return;
+    }
+    
+	if (self.httpStatusCode == 0)
+	{
+        if ([self parseHttpHeader])
+        {
+            if ([self hasBytesAvailable])
+            {
+                [super dataAvailable];
+            }
+            
+            return;
+        }
+        else
+        {
+            return;
+        }
 	}
-	
-	[super dataAvailable];
+    else
+    {
+        [super dataAvailable];
+    }
 }
 
 -(SInt64) position
@@ -242,17 +430,43 @@
     
     self->isInErrorState = NO;
     
+    if (!self->supportsSeek && offset != self->relativePosition)
+    {
+        return;
+    }
+    
     [self openForSeek:YES];
 }
 
 -(int) readIntoBuffer:(UInt8*)buffer withSize:(int)size
+{
+    return [self privateReadIntoBuffer:buffer withSize:size];
+}
+
+-(int) privateReadIntoBuffer:(UInt8*)buffer withSize:(int)size
 {
     if (size == 0)
     {
         return 0;
     }
     
-    int read = (int)CFReadStreamRead(stream, buffer, size);
+    if (prefixBytes != nil)
+    {
+        int count = MIN(size, (int)prefixBytes.length - prefixBytesRead);
+        
+        [prefixBytes getBytes:buffer length:count];
+        
+        prefixBytesRead += count;
+        
+        if (prefixBytesRead >= prefixBytes.length)
+        {
+            prefixBytes = nil;
+        }
+        
+        return count;
+    }
+    
+    int read = [super readIntoBuffer:buffer withSize:size];
     
     if (read < 0)
     {
@@ -282,7 +496,7 @@
 		{
 			return;
 		}
-		
+	
         self->currentUrl = url;
 
         if (url == nil)
@@ -292,13 +506,23 @@
 
         CFHTTPMessageRef message = CFHTTPMessageCreateRequest(NULL, (CFStringRef)@"GET", (__bridge CFURLRef)self->currentUrl, kCFHTTPVersion1_1);
 
-        if (seekStart > 0)
+        if (seekStart > 0 && supportsSeek)
         {
             CFHTTPMessageSetHeaderFieldValue(message, CFSTR("Range"), (__bridge CFStringRef)[NSString stringWithFormat:@"bytes=%lld-", seekStart]);
 
             discontinuous = YES;
         }
 
+        for (NSString* key in self->requestHeaders)
+        {
+            NSString* value = [self->requestHeaders objectForKey:key];
+            
+            CFHTTPMessageSetHeaderFieldValue(message, (__bridge CFStringRef)key, (__bridge CFStringRef)value);
+        }
+        
+        CFHTTPMessageSetHeaderFieldValue(message, CFSTR("Accept"), CFSTR("*/*"));
+        CFHTTPMessageSetHeaderFieldValue(message, CFSTR("Ice-MetaData"), CFSTR("0"));
+
         stream = CFReadStreamCreateForHTTPRequest(NULL, message);
 
         if (stream == nil)
@@ -309,6 +533,8 @@
 
             return;
         }
+ 
+        CFReadStreamSetProperty(stream, (__bridge CFStringRef)NSStreamNetworkServiceTypeBackground, (__bridge CFStringRef)NSStreamNetworkServiceTypeBackground);
 
         if (!CFReadStreamSetProperty(stream, kCFStreamPropertyHTTPShouldAutoredirect, kCFBooleanTrue))
         {
@@ -320,20 +546,15 @@
         }
 
         // Proxy support
-
         CFDictionaryRef proxySettings = CFNetworkCopySystemProxySettings();
         CFReadStreamSetProperty(stream, kCFStreamPropertyHTTPProxy, proxySettings);
         CFRelease(proxySettings);
 
         // SSL support
-
         if ([self->currentUrl.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame)
         {
             NSDictionary* sslSettings = [NSDictionary dictionaryWithObjectsAndKeys:
             (NSString*)kCFStreamSocketSecurityLevelNegotiatedSSL, kCFStreamSSLLevel,
-            [NSNumber numberWithBool:YES], kCFStreamSSLAllowsExpiredCertificates,
-            [NSNumber numberWithBool:YES], kCFStreamSSLAllowsExpiredRoots,
-            [NSNumber numberWithBool:YES], kCFStreamSSLAllowsAnyRoot,
             [NSNumber numberWithBool:NO], kCFStreamSSLValidatesCertificateChain,
             [NSNull null], kCFStreamSSLPeerName,
             nil];
@@ -346,7 +567,6 @@
 		self->httpStatusCode = 0;
 		
         // Open
-
         if (!CFReadStreamOpen(stream))
         {
             CFRelease(stream);
@@ -380,4 +600,9 @@
     return [NSString stringWithFormat:@"HTTP data source with file length: %lld and position: %lld", self.length, self.position];
 }
 
+-(BOOL) supportsSeek
+{
+    return self->supportsSeek;
+}
+
 @end

StreamingKit/StreamingKit/STKLocalFileDataSource.m

@@ -200,6 +200,18 @@
         [self open];
     }
     
+    if (stream == 0)
+    {
+        CFRunLoopPerformBlock(eventsRunLoop.getCFRunLoop, NSRunLoopCommonModes, ^
+        {
+            [self errorOccured];
+        });
+        
+        CFRunLoopWakeUp(eventsRunLoop.getCFRunLoop);
+        
+        return;
+    }
+    
     if (CFReadStreamSetProperty(stream, kCFStreamPropertyFileCurrentOffset, (__bridge CFTypeRef)[NSNumber numberWithLongLong:offset]) != TRUE)
     {
         position = 0;

StreamingKit/StreamingKit/STKQueueEntry.m

@@ -18,6 +18,8 @@
 {
     if (self = [super init])
     {
+        self->spinLock = OS_SPINLOCK_INIT;
+        
         self.dataSource = dataSourceIn;
         self.queueItemId = queueItemIdIn;
         self->lastFrameQueued = -1;