Merge pull request BradLarson#2228 from RetVal/master

fix issue BradLarson#2093
Poopi · Apr 3, 2016 · d63c232 · d63c232
2 parents 08f6d12 + 809916d
commit d63c232
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,6 @@
 language: objective-c
 
 before_install:
-    - gem install cocoapods --pre --quiet
     - pod --version
     - pod setup --silent
     - pod repo update --silent

diff --git a/examples/iOS/SimpleVideoFilter/SimpleVideoFilter.xcodeproj/project.pbxproj b/examples/iOS/SimpleVideoFilter/SimpleVideoFilter.xcodeproj/project.pbxproj
@@ -332,7 +332,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "../../../framework/**";
-				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-ObjC",
@@ -365,7 +365,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "../../../framework/**";
-				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				OTHER_LDFLAGS = (
 					"-ObjC",

diff --git a/framework/Source/GPUImageFramebufferCache.m b/framework/Source/GPUImageFramebufferCache.m
@@ -50,7 +50,7 @@ - (id)init;
     framebufferCache = [[NSMutableDictionary alloc] init];
     framebufferTypeCounts = [[NSMutableDictionary alloc] init];
     activeImageCaptureList = [[NSMutableArray alloc] init];
-    framebufferCacheQueue = dispatch_queue_create("com.sunsetlakesoftware.GPUImage.framebufferCacheQueue", NULL);
+    framebufferCacheQueue = dispatch_queue_create("com.sunsetlakesoftware.GPUImage.framebufferCacheQueue", GPUImageDefaultQueueAttribute());
 
     return self;
 }

diff --git a/framework/Source/GPUImageOutput.h b/framework/Source/GPUImageOutput.h
@@ -17,6 +17,7 @@ typedef NS_ENUM(NSInteger, UIImageOrientation) {
 };
 #endif
 
+dispatch_queue_attr_t GPUImageDefaultQueueAttribute(void);
 void runOnMainQueueWithoutDeadlocking(void (^block)(void));
 void runSynchronouslyOnVideoProcessingQueue(void (^block)(void));
 void runAsynchronouslyOnVideoProcessingQueue(void (^block)(void));

diff --git a/framework/Source/GPUImageOutput.m b/framework/Source/GPUImageOutput.m
@@ -3,6 +3,17 @@
 #import "GPUImagePicture.h"
 #import <mach/mach.h>
 
+dispatch_queue_attr_t GPUImageDefaultQueueAttribute(void)
+{
+#if TARGET_OS_IPHONE
+    if ([[[UIDevice currentDevice] systemVersion] compare:@"9.0" options:NSNumericSearch] != NSOrderedAscending)
+    {
+        return dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_DEFAULT, 0);
+    }
+#endif
+    return nil;
+}
+
 void runOnMainQueueWithoutDeadlocking(void (^block)(void))
 {
 	if ([NSThread isMainThread])

diff --git a/framework/Source/iOS/GPUImageContext.m b/framework/Source/iOS/GPUImageContext.m
@@ -4,6 +4,8 @@
 
 #define MAXSHADERPROGRAMSALLOWEDINCACHE 40
 
+extern dispatch_queue_attr_t GPUImageDefaultQueueAttribute(void);
+
 @interface GPUImageContext()
 {
     NSMutableDictionary *shaderProgramCache;
@@ -31,7 +33,7 @@ - (id)init;
     }
 
 	openGLESContextQueueKey = &openGLESContextQueueKey;
-    _contextQueue = dispatch_queue_create("com.sunsetlakesoftware.GPUImage.openGLESContextQueue", NULL);
+    _contextQueue = dispatch_queue_create("com.sunsetlakesoftware.GPUImage.openGLESContextQueue", GPUImageDefaultQueueAttribute());
 
 #if OS_OBJECT_USE_OBJC
 	dispatch_queue_set_specific(_contextQueue, openGLESContextQueueKey, (__bridge void *)self, NULL);

diff --git a/framework/Source/iOS/GPUImageMovieWriter.m b/framework/Source/iOS/GPUImageMovieWriter.m
@@ -501,7 +501,7 @@ - (void)enableSynchronizationCallbacks;
         {
             [assetWriter startWriting];
         }
-        videoQueue = dispatch_queue_create("com.sunsetlakesoftware.GPUImage.videoReadingQueue", NULL);
+        videoQueue = dispatch_queue_create("com.sunsetlakesoftware.GPUImage.videoReadingQueue", GPUImageDefaultQueueAttribute());
         [assetWriterVideoInput requestMediaDataWhenReadyOnQueue:videoQueue usingBlock:^{
             if( _paused )
             {
@@ -530,7 +530,7 @@ - (void)enableSynchronizationCallbacks;
 
     if (audioInputReadyCallback != NULL)
     {
-        audioQueue = dispatch_queue_create("com.sunsetlakesoftware.GPUImage.audioReadingQueue", NULL);
+        audioQueue = dispatch_queue_create("com.sunsetlakesoftware.GPUImage.audioReadingQueue", GPUImageDefaultQueueAttribute());
         [assetWriterAudioInput requestMediaDataWhenReadyOnQueue:audioQueue usingBlock:^{
             if( _paused )
             {