Fixed thread related crashes in OutputRenderCallback

Fix STKAudioPlayer.progress property thread-related crash
Fixed deployment target min should be 4.3 not 6.0
2014-04-07 15:28:34 +01:00 · 2014-04-07 15:15:36 +01:00 · 2014-04-05 13:15:43 +01:00 · 2014-04-05 13:08:58 +01:00 · 2014-03-24 16:32:38 +00:00
10 changed files with 51 additions and 417 deletions
@@ -230,7 +230,7 @@
 		A1115929188D686000641365 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0500;
+				LastUpgradeCheck = 0510;
 				ORGANIZATIONNAME = "Thong Nguyen";
 				TargetAttributes = {
 					A111594B188D686000641365 = {
@@ -332,7 +332,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -366,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";
@@ -377,7 +376,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -405,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;
@@ -415,7 +413,6 @@
 		A111595E188D686000641365 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -433,7 +430,6 @@
 		A111595F188D686000641365 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -450,7 +446,6 @@
 		A1115961188D686000641365 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/ExampleApp.app/ExampleApp";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
@@ -473,7 +468,6 @@
 		A1115962188D686000641365 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/ExampleApp.app/ExampleApp";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
@@ -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 = 0500;
+				LastUpgradeCheck = 0510;
 				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 */,
 			);
@@ -647,7 +635,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -675,7 +662,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;
 			};
@@ -685,7 +672,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -707,7 +693,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;
 			};
@@ -716,7 +702,6 @@
 		A1E7C4EC188D57F60010896F /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				DSTROOT = /tmp/StreamingKit.dst;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -733,7 +718,6 @@
 		A1E7C4ED188D57F60010896F /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				DSTROOT = /tmp/StreamingKit.dst;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -750,7 +734,6 @@
 		A1E7C4EF188D57F60010896F /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -771,7 +754,6 @@
 		A1E7C4F0188D57F60010896F /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -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
@@ -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];
@@ -924,20 +933,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 +964,9 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn
        return 0;
    }
    
+    OSSpinLockLock(&currentEntryReferencesLock);
    STKQueueEntry* entry = currentlyPlayingEntry;
+    OSSpinLockUnlock(&currentEntryReferencesLock);
    
    if (entry == nil)
    {
@@ -1347,7 +1353,6 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn
        }
    }
    pthread_mutex_unlock(&playerMutex);
-
    
    return YES;
 }
@@ -1398,6 +1403,8 @@ static void AudioFileStreamPacketsProc(void* clientData, UInt32 numberBytes, UIn
 		
 		playbackThreadRunLoop = nil;

+		[self destroyAudioResources];
+		
 		[threadFinishedCondLock lock];
 		[threadFinishedCondLock unlockWithCondition:1];
 	}
@@ -2013,7 +2020,7 @@ static BOOL GetHardwareCodecClassDesc(UInt32 formatId, AudioClassDescription* cl
 	AudioComponentInstance convertUnit;
 	
 	CHECK_STATUS_AND_RETURN_VALUE(AUGraphAddNode(audioGraph, &convertUnitDescription, &convertNode), 0);
-	CHECK_STATUS_AND_RETURN_VALUE(status = AUGraphNodeInfo(audioGraph, convertNode, &mixerDescription, &convertUnit), 0);
+	CHECK_STATUS_AND_RETURN_VALUE(AUGraphNodeInfo(audioGraph, convertNode, &mixerDescription, &convertUnit), 0);
 	CHECK_STATUS_AND_RETURN_VALUE(AudioUnitSetProperty(convertUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, 0, &srcFormat, sizeof(srcFormat)), 0);
  	CHECK_STATUS_AND_RETURN_VALUE(AudioUnitSetProperty(convertUnit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Output, 0, &desFormat, sizeof(desFormat)), 0);
 	CHECK_STATUS_AND_RETURN_VALUE(AudioUnitSetProperty(convertUnit, kAudioUnitProperty_MaximumFramesPerSlice, kAudioUnitScope_Global, 0, &maxFramesPerSlice, sizeof(maxFramesPerSlice)), 0);
@@ -2530,11 +2537,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 +2563,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 +2776,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)
                {
@@ -1,22 +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 key;
-    UInt32 size;
-    UInt32 position;
-    UInt8* buffer;
-}
-
-(id) initWithBufferSize:(UInt32)sizeIn;
-
-@end
@@ -1,30 +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);
-}
-
-@end
@@ -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
@@ -1,277 +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;
-}
-
-(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
-{
-}
-
-(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
@@ -153,7 +153,7 @@
        {
            httpHeaders = (__bridge_transfer NSDictionary*)CFHTTPMessageCopyAllHeaderFields((CFHTTPMessageRef)response);
            
-            self->httpStatusCode = CFHTTPMessageGetResponseStatusCode((CFHTTPMessageRef)response);
+            self->httpStatusCode = (UInt32)CFHTTPMessageGetResponseStatusCode((CFHTTPMessageRef)response);
            
            CFRelease(response);
        }
@@ -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;
@@ -18,6 +18,8 @@
 {
    if (self = [super init])
    {
+        self->spinLock = OS_SPINLOCK_INIT;
+        
        self.dataSource = dataSourceIn;
        self.queueItemId = queueItemIdIn;
        self->lastFrameQueued = -1;
Author	SHA1	Message	Date
Thong Nguyen	a9dfb2eddf	Fixed thread related crashes in OutputRenderCallback	2014-04-07 15:28:34 +01:00
Thong Nguyen	3fcf054a23	Fix STKAudioPlayer.progress property thread-related crash	2014-04-07 15:15:36 +01:00
Thong Nguyen	a615419404	Fixed deployment target min should be 4.3 not 6.0	2014-04-05 13:15:43 +01:00
Thong Nguyen	e43a4613f8	startInternal now cleans up audio resources when the playback thread is finished. Added fix for undefned DBL_MAX	2014-04-05 13:08:58 +01:00
Thong Nguyen	ca928dfe1e	Removed buffering work (now in different branch)	2014-03-24 16:32:38 +00:00