Skip to content

Commit

Permalink
Fixed issue where media of certain sizes would cause the UI to freeze…
Browse files Browse the repository at this point in the history 
… (e.g selfies from the native Camera app)
  • Loading branch information
@joshbernfeld
joshbernfeld committed Feb 11, 2022
1 parent 42178e9 commit 72374ff
Show file tree
Hide file tree
Showing 27 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion PixelSDK-GPUImage3.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = 'PixelSDK-GPUImage3'
s.module_name = 'GPUImage'
s.version = '3.1.0'
s.version = '3.1.1'
s.license = 'BSD'
s.summary = 'An open source iOS framework for GPU-based image and video processing.'
s.homepage = 'https://github.com/GottaYotta/GPUImage3'
Expand Down
Binary file modified framework.zip
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion framework/Build/GPUImage.iOS-simulator.xcarchive/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>ArchiveVersion</key>
<integer>2</integer>
<key>CreationDate</key>
<date>2022-01-20T03:54:22Z</date>
<date>2022-02-11T03:28:25Z</date>
<key>Name</key>
<string>GPUImage_iOS</string>
<key>SchemeName</key>
Expand Down
Binary file modified .../GPUImage.iOS-simulator.xcarchive/Products/Library/Frameworks/GPUImage.framework/GPUImage
View file
Binary file not shown.
Binary file modified ...PUImage.iOS-simulator.xcarchive/Products/Library/Frameworks/GPUImage.framework/Info.plist
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion ...tor.xcarchive/Products/Library/Frameworks/GPUImage.framework/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</data>
<key>Info.plist</key>
<data>
CIwqcrNtSo2OFeGwt6fz6iC3v9I=
Q6hE6vzE36Q3G9CX6w+/QdhW+sI=
</data>
<key>Modules/GPUImage.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
<data>
Expand Down
4 changes: 2 additions & 2 deletions .../Build/GPUImage.iOS-simulator.xcarchive/dSYMs/GPUImage.framework.dSYM/Contents/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>3.1.0</string>
<string>3.1.1</string>
<key>CFBundleVersion</key>
<string>3.1.0.0</string>
<string>3.1.1.0</string>
</dict>
</plist>
Binary file modified ...e.iOS-simulator.xcarchive/dSYMs/GPUImage.framework.dSYM/Contents/Resources/DWARF/GPUImage
View file
Binary file not shown.
0 ...E-D952-32BB-9911-C526954D4CD3.bcsymbolmap → ...1-6BE1-3B3C-8F24-0FB960D6217C.bcsymbolmap
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion framework/Build/GPUImage.iOS.xcarchive/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<key>ArchiveVersion</key>
<integer>2</integer>
<key>CreationDate</key>
<date>2022-01-20T03:54:46Z</date>
<date>2022-02-11T03:28:49Z</date>
<key>Name</key>
<string>GPUImage_iOS</string>
<key>SchemeName</key>
Expand Down
Binary file modified ...work/Build/GPUImage.iOS.xcarchive/Products/Library/Frameworks/GPUImage.framework/GPUImage
View file
Binary file not shown.
Binary file modified ...rk/Build/GPUImage.iOS.xcarchive/Products/Library/Frameworks/GPUImage.framework/Info.plist
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions framework/Build/GPUImage.iOS.xcarchive/dSYMs/GPUImage.framework.dSYM/Contents/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>3.1.0</string>
<string>3.1.1</string>
<key>CFBundleVersion</key>
<string>3.1.0.0</string>
<string>3.1.1.0</string>
</dict>
</plist>
Binary file modified ...ld/GPUImage.iOS.xcarchive/dSYMs/GPUImage.framework.dSYM/Contents/Resources/DWARF/GPUImage
View file
Binary file not shown.
14 changes: 7 additions & 7 deletions framework/Build/GPUImage.xcframework/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,37 @@
<key>AvailableLibraries</key>
<array>
<dict>
<key>BitcodeSymbolMapsPath</key>
<string>BCSymbolMaps</string>
<key>DebugSymbolsPath</key>
<string>dSYMs</string>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<string>ios-arm64</string>
<key>LibraryPath</key>
<string>GPUImage.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>BitcodeSymbolMapsPath</key>
<string>BCSymbolMaps</string>
<key>DebugSymbolsPath</key>
<string>dSYMs</string>
<key>LibraryIdentifier</key>
<string>ios-arm64</string>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>GPUImage.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
</array>
<key>CFBundlePackageType</key>
Expand Down
0 ...E-D952-32BB-9911-C526954D4CD3.bcsymbolmap → ...1-6BE1-3B3C-8F24-0FB960D6217C.bcsymbolmap
View file
File renamed without changes.
Binary file modified framework/Build/GPUImage.xcframework/ios-arm64/GPUImage.framework/GPUImage
View file
Binary file not shown.
Binary file modified framework/Build/GPUImage.xcframework/ios-arm64/GPUImage.framework/Info.plist
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions ...rk/Build/GPUImage.xcframework/ios-arm64/dSYMs/GPUImage.framework.dSYM/Contents/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>3.1.0</string>
<string>3.1.1</string>
<key>CFBundleVersion</key>
<string>3.1.0.0</string>
<string>3.1.1.0</string>
</dict>
</plist>
Binary file modified ...age.xcframework/ios-arm64/dSYMs/GPUImage.framework.dSYM/Contents/Resources/DWARF/GPUImage
View file
Binary file not shown.
Binary file modified framework/Build/GPUImage.xcframework/ios-arm64_x86_64-simulator/GPUImage.framework/GPUImage
View file
Binary file not shown.
Binary file modified ...ework/Build/GPUImage.xcframework/ios-arm64_x86_64-simulator/GPUImage.framework/Info.plist
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion ...ge.xcframework/ios-arm64_x86_64-simulator/GPUImage.framework/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</data>
<key>Info.plist</key>
<data>
CIwqcrNtSo2OFeGwt6fz6iC3v9I=
Q6hE6vzE36Q3G9CX6w+/QdhW+sI=
</data>
<key>Modules/GPUImage.swiftmodule/arm64-apple-ios-simulator.swiftdoc</key>
<data>
Expand Down
4 changes: 2 additions & 2 deletions ....xcframework/ios-arm64_x86_64-simulator/dSYMs/GPUImage.framework.dSYM/Contents/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>3.1.0</string>
<string>3.1.1</string>
<key>CFBundleVersion</key>
<string>3.1.0.0</string>
<string>3.1.1.0</string>
</dict>
</plist>
Binary file modified ...os-arm64_x86_64-simulator/dSYMs/GPUImage.framework.dSYM/Contents/Resources/DWARF/GPUImage
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions framework/GPUImage.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1638,7 +1638,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3.1.0.0;
CURRENT_PROJECT_VERSION = 3.1.1.0;
DEFINES_MODULE = YES;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "$(SRCROOT)/GPUImage.xcodeproj/GPUImage_Info.plist";
Expand All @@ -1648,7 +1648,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 3.1.0;
MARKETING_VERSION = 3.1.1;
PRODUCT_BUNDLE_IDENTIFIER = com.redqueencoder.GPUImage;
PRODUCT_NAME = GPUImage;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
Expand All @@ -1663,7 +1663,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3.1.0.0;
CURRENT_PROJECT_VERSION = 3.1.1.0;
DEFINES_MODULE = YES;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "$(SRCROOT)/GPUImage.xcodeproj/GPUImage_Info.plist";
Expand All @@ -1673,7 +1673,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 3.1.0;
MARKETING_VERSION = 3.1.1;
PRODUCT_BUNDLE_IDENTIFIER = com.redqueencoder.GPUImage;
PRODUCT_NAME = GPUImage;
SWIFT_VERSION = 5.0;
Expand Down
4 changes: 2 additions & 2 deletions framework/Source/RenderView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ public class RenderView: UIView, ImageConsumer {
#if targetEnvironment(simulator)
if #available(iOS 13.0, *) {
let layer = self.internalLayer as! CAMetalLayer
layer.framebufferOnly = false
layer.framebufferOnly = true // When this is false on iOS 15.3 iPhone 12 certain texture sizes e.g. 2316x2316 cause the UI to freeze completely
layer.device = sharedMetalRenderingDevice.device

let (pipelineState, _, _) = generateRenderPipelineState(device:sharedMetalRenderingDevice, vertexFunctionName:"oneInputVertex", fragmentFunctionName:"passthroughFragment", operationName:"RenderView")
self.renderPipelineState = pipelineState
}
#else
let layer = self.internalLayer as! CAMetalLayer
layer.framebufferOnly = false
layer.framebufferOnly = true // When this is false on iOS 15.3 iPhone 12 certain texture sizes e.g. 2316x2316 cause the UI to freeze completely
layer.device = sharedMetalRenderingDevice.device

let (pipelineState, _, _) = generateRenderPipelineState(device:sharedMetalRenderingDevice, vertexFunctionName:"oneInputVertex", fragmentFunctionName:"passthroughFragment", operationName:"RenderView")
Expand Down

0 comments on commit 72374ff

Please sign in to comment.