Skip to content

Fix: #107 Remove deprecation warning caused by `DispatchQueue.GlobalQ… #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adi-li wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: #107 Remove deprecation warning caused by `DispatchQueue.GlobalQ… #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions framework/GPUImage.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,7 +1290,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0820;
LastUpgradeCheck = 0800;
LastUpgradeCheck = 0830;
ORGANIZATIONNAME = "Sunset Lake Software LLC";
TargetAttributes = {
BC6E7CAA1C39A9D8006DF678 = {
Expand All @@ -1306,7 +1306,6 @@
};
BC9E34F01E524A2200B8604F = {
CreatedOnToolsVersion = 8.2.1;
DevelopmentTeam = 7P4K3HK5JL;
ProvisioningStyle = Automatic;
};
};
Expand Down Expand Up @@ -1758,8 +1757,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
Expand Down Expand Up @@ -1808,8 +1809,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "-";
Expand Down Expand Up @@ -1876,7 +1879,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.sunsetlakesoftware.GPUImage;
PRODUCT_NAME = GPUImage;
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
};
name = Release;
Expand Down Expand Up @@ -1914,7 +1917,7 @@
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
Expand Down Expand Up @@ -1943,7 +1946,7 @@
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
Expand Down Expand Up @@ -1974,7 +1977,7 @@
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = 7P4K3HK5JL;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "$(SRCROOT)/GPUImage.xcodeproj/GPUImageTestSuite_Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand All @@ -1996,7 +1999,7 @@
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = 7P4K3HK5JL;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = "$(SRCROOT)/GPUImage.xcodeproj/GPUImageTestSuite_Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand Down
4 changes: 2 additions & 2 deletions framework/Source/Mac/Camera.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ public class Camera: NSObject, ImageSource, AVCaptureVideoDataOutputSampleBuffer
let captureAsYUV:Bool
let yuvConversionShader:ShaderProgram?
let frameRenderingSemaphore = DispatchSemaphore(value:1)
let cameraProcessingQueue = DispatchQueue.global(priority:standardProcessingQueuePriority)
let audioProcessingQueue = DispatchQueue.global(priority:lowProcessingQueuePriority)
let cameraProcessingQueue = standardProcessingQueue()
let audioProcessingQueue = lowProcessingQueue()

var numberOfFramesCaptured = 0
var totalFrameTimeDuringCapture:Double = 0.0
Expand Down
2 changes: 1 addition & 1 deletion framework/Source/Mac/MovieInput.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class MovieInput: ImageSource {

public func start() {
asset.loadValuesAsynchronously(forKeys: ["tracks"], completionHandler: {
DispatchQueue.global(priority:standardProcessingQueuePriority).async {
standardProcessingQueue().async {
guard (self.asset.statusOfValue(forKey:"tracks", error:nil) == .loaded) else { return }

guard self.assetReader.startReading() else {
Expand Down
21 changes: 10 additions & 11 deletions framework/Source/SerialDispatch.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,21 @@ extension SerialDispatch {

#else

public let standardProcessingQueuePriority:DispatchQueue.GlobalQueuePriority = {
// DispatchQueue.QoSClass.default
if #available(iOS 10, OSX 10.10, *) {
return DispatchQueue.GlobalQueuePriority.default
public func standardProcessingQueue() -> DispatchQueue {
if #available(iOS 8.0, OSX 10.10, *) {
return DispatchQueue.global(qos: .default)
} else {
return DispatchQueue.GlobalQueuePriority.default
return DispatchQueue.global(priority: .default)
}
}()
}

public let lowProcessingQueuePriority:DispatchQueue.GlobalQueuePriority = {
if #available(iOS 10, OSX 10.10, *) {
return DispatchQueue.GlobalQueuePriority.low
public func lowProcessingQueue() -> DispatchQueue {
if #available(iOS 8.0, OSX 10.10, *) {
return DispatchQueue.global(qos: .utility)
} else {
return DispatchQueue.GlobalQueuePriority.low
return DispatchQueue.global(priority: .low)
}
}()
}

func runAsynchronouslyOnMainQueue(_ mainThreadOperation:@escaping () -> ()) {
if (Thread.isMainThread) {
Expand Down
4 changes: 2 additions & 2 deletions framework/Source/iOS/Camera.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ public class Camera: NSObject, ImageSource, AVCaptureVideoDataOutputSampleBuffer
let captureAsYUV:Bool
let yuvConversionShader:ShaderProgram?
let frameRenderingSemaphore = DispatchSemaphore(value:1)
let cameraProcessingQueue = DispatchQueue.global(priority:DispatchQueue.GlobalQueuePriority.default)
let audioProcessingQueue = DispatchQueue.global(priority:DispatchQueue.GlobalQueuePriority.default)
let cameraProcessingQueue = DispatchQueue.global()
let audioProcessingQueue = DispatchQueue.global()

let framesToIgnore = 5
var numberOfFramesCaptured = 0
Expand Down
2 changes: 1 addition & 1 deletion framework/Source/iOS/MovieInput.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class MovieInput: ImageSource {

public func start() {
asset.loadValuesAsynchronously(forKeys:["tracks"], completionHandler:{
DispatchQueue.global(priority:DispatchQueue.GlobalQueuePriority.default).async(execute: {
DispatchQueue.global().async(execute: {
guard (self.asset.statusOfValue(forKey: "tracks", error:nil) == .loaded) else { return }

guard self.assetReader.startReading() else {
Expand Down