forked from BradLarson/GPUImage
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request BradLarson#2136 from wysaid/master
demo crash fix
- Loading branch information
Showing
6 changed files
with
72 additions
and
175 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,6 +26,7 @@ | |
| BCB5DDFF14E87783000AF3C2 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCB5DDFE14E87783000AF3C2 /* QuartzCore.framework */; }; | ||
| BCB5DE0114E87789000AF3C2 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCB5DE0014E87789000AF3C2 /* OpenGLES.framework */; }; | ||
| BCF867511725AB5300912E34 /* libGPUImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BCF8674C1725AB2100912E34 /* libGPUImage.a */; }; | ||
| D30ACF271BAFE43F00E9759C /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D30ACF261BAFE43F00E9759C /* AssetsLibrary.framework */; }; | ||
| E5066F611855AC78008C7682 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = E5066F601855AC78008C7682 /* [email protected] */; }; | ||
| /* End PBXBuildFile section */ | ||
|
|
||
|
|
@@ -78,6 +79,7 @@ | |
| BCB5DDFB14E876ED000AF3C2 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; }; | ||
| BCB5DDFE14E87783000AF3C2 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; | ||
| BCB5DE0014E87789000AF3C2 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; | ||
| D30ACF261BAFE43F00E9759C /* AssetsLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AssetsLibrary.framework; path = System/Library/Frameworks/AssetsLibrary.framework; sourceTree = SDKROOT; }; | ||
| E5066F601855AC78008C7682 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; }; | ||
| /* End PBXFileReference section */ | ||
|
|
||
|
|
@@ -86,6 +88,7 @@ | |
| isa = PBXFrameworksBuildPhase; | ||
| buildActionMask = 2147483647; | ||
| files = ( | ||
| D30ACF271BAFE43F00E9759C /* AssetsLibrary.framework in Frameworks */, | ||
| BCF867511725AB5300912E34 /* libGPUImage.a in Frameworks */, | ||
| BCB5DE0114E87789000AF3C2 /* OpenGLES.framework in Frameworks */, | ||
| BCB5DDFF14E87783000AF3C2 /* QuartzCore.framework in Frameworks */, | ||
|
|
@@ -122,6 +125,7 @@ | |
| BCB5DDCD14E86899000AF3C2 /* Frameworks */ = { | ||
| isa = PBXGroup; | ||
| children = ( | ||
| D30ACF261BAFE43F00E9759C /* AssetsLibrary.framework */, | ||
| BCB5DDEA14E8756A000AF3C2 /* GPUImage.xcodeproj */, | ||
| BCB5DE0014E87789000AF3C2 /* OpenGLES.framework */, | ||
| BCB5DDFE14E87783000AF3C2 /* QuartzCore.framework */, | ||
|
|
@@ -202,6 +206,11 @@ | |
| attributes = { | ||
| LastUpgradeCheck = 0500; | ||
| ORGANIZATIONNAME = "Cell Phone"; | ||
| TargetAttributes = { | ||
| BCB5DDC914E86899000AF3C2 = { | ||
| DevelopmentTeam = V2DTUY5PQ8; | ||
| }; | ||
| }; | ||
| }; | ||
| buildConfigurationList = BCB5DDC414E86899000AF3C2 /* Build configuration list for PBXProject "SimpleVideoFilter" */; | ||
| compatibilityVersion = "Xcode 3.2"; | ||
|
|
@@ -371,9 +380,11 @@ | |
| BCB5DDE314E86899000AF3C2 /* Debug */ = { | ||
| isa = XCBuildConfiguration; | ||
| buildSettings = { | ||
| CODE_SIGN_IDENTITY = "iPhone Developer"; | ||
| GCC_PRECOMPILE_PREFIX_HEADER = YES; | ||
| GCC_PREFIX_HEADER = "SimpleVideoFilter/SimpleVideoFilter-Prefix.pch"; | ||
| INFOPLIST_FILE = "SimpleVideoFilter/SimpleVideoFilter-Info.plist"; | ||
| IPHONEOS_DEPLOYMENT_TARGET = 6.0; | ||
| PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| WRAPPER_EXTENSION = app; | ||
| }; | ||
|
|
@@ -382,9 +393,11 @@ | |
| BCB5DDE414E86899000AF3C2 /* Release */ = { | ||
| isa = XCBuildConfiguration; | ||
| buildSettings = { | ||
| CODE_SIGN_IDENTITY = "iPhone Developer"; | ||
| GCC_PRECOMPILE_PREFIX_HEADER = YES; | ||
| GCC_PREFIX_HEADER = "SimpleVideoFilter/SimpleVideoFilter-Prefix.pch"; | ||
| INFOPLIST_FILE = "SimpleVideoFilter/SimpleVideoFilter-Info.plist"; | ||
| IPHONEOS_DEPLOYMENT_TARGET = 6.0; | ||
| PRODUCT_NAME = "$(TARGET_NAME)"; | ||
| WRAPPER_EXTENSION = app; | ||
| }; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
204 changes: 30 additions & 174 deletions
204
examples/iOS/SimpleVideoFilter/SimpleVideoFilter/SimpleVideoFilterViewController.xib
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,174 +1,30 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> | ||
| <data> | ||
| <int key="IBDocument.SystemTarget">1280</int> | ||
| <string key="IBDocument.SystemVersion">11D50</string> | ||
| <string key="IBDocument.InterfaceBuilderVersion">2182</string> | ||
| <string key="IBDocument.AppKitVersion">1138.32</string> | ||
| <string key="IBDocument.HIToolboxVersion">568.00</string> | ||
| <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> | ||
| <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | ||
| <string key="NS.object.0">1179</string> | ||
| </object> | ||
| <array key="IBDocument.IntegratedClassDependencies"> | ||
| <string>IBProxyObject</string> | ||
| <string>IBUIView</string> | ||
| <string>IBUISlider</string> | ||
| </array> | ||
| <array key="IBDocument.PluginDependencies"> | ||
| <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | ||
| </array> | ||
| <object class="NSMutableDictionary" key="IBDocument.Metadata"> | ||
| <string key="NS.key.0">PluginDependencyRecalculationVersion</string> | ||
| <integer value="1" key="NS.object.0"/> | ||
| </object> | ||
| <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> | ||
| <object class="IBProxyObject" id="372490531"> | ||
| <string key="IBProxiedObjectIdentifier">IBFilesOwner</string> | ||
| <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | ||
| </object> | ||
| <object class="IBProxyObject" id="975951072"> | ||
| <string key="IBProxiedObjectIdentifier">IBFirstResponder</string> | ||
| <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | ||
| </object> | ||
| <object class="IBUIView" id="191373211"> | ||
| <reference key="NSNextResponder"/> | ||
| <int key="NSvFlags">274</int> | ||
| <array class="NSMutableArray" key="NSSubviews"> | ||
| <object class="IBUISlider" id="601521545"> | ||
| <reference key="NSNextResponder" ref="191373211"/> | ||
| <int key="NSvFlags">266</int> | ||
| <string key="NSFrame">{{18, 418}, {284, 23}}</string> | ||
| <reference key="NSSuperview" ref="191373211"/> | ||
| <reference key="NSWindow"/> | ||
| <reference key="NSNextKeyView"/> | ||
| <string key="NSReuseIdentifierKey">_NS:623</string> | ||
| <bool key="IBUIOpaque">NO</bool> | ||
| <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | ||
| <int key="IBUIContentHorizontalAlignment">0</int> | ||
| <int key="IBUIContentVerticalAlignment">0</int> | ||
| <float key="IBUIValue">1</float> | ||
| </object> | ||
| </array> | ||
| <string key="NSFrame">{{0, 20}, {320, 460}}</string> | ||
| <reference key="NSSuperview"/> | ||
| <reference key="NSWindow"/> | ||
| <reference key="NSNextKeyView" ref="601521545"/> | ||
| <object class="NSColor" key="IBUIBackgroundColor"> | ||
| <int key="NSColorSpace">3</int> | ||
| <bytes key="NSWhite">MQA</bytes> | ||
| <object class="NSColorSpace" key="NSCustomColorSpace"> | ||
| <int key="NSID">2</int> | ||
| </object> | ||
| </object> | ||
| <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/> | ||
| <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> | ||
| </object> | ||
| </array> | ||
| <object class="IBObjectContainer" key="IBDocument.Objects"> | ||
| <array class="NSMutableArray" key="connectionRecords"> | ||
| <object class="IBConnectionRecord"> | ||
| <object class="IBCocoaTouchOutletConnection" key="connection"> | ||
| <string key="label">view</string> | ||
| <reference key="source" ref="372490531"/> | ||
| <reference key="destination" ref="191373211"/> | ||
| </object> | ||
| <int key="connectionID">3</int> | ||
| </object> | ||
| <object class="IBConnectionRecord"> | ||
| <object class="IBCocoaTouchEventConnection" key="connection"> | ||
| <string key="label">updateSliderValue:</string> | ||
| <reference key="source" ref="601521545"/> | ||
| <reference key="destination" ref="372490531"/> | ||
| <int key="IBEventType">13</int> | ||
| </object> | ||
| <int key="connectionID">6</int> | ||
| </object> | ||
| </array> | ||
| <object class="IBMutableOrderedSet" key="objectRecords"> | ||
| <array key="orderedObjects"> | ||
| <object class="IBObjectRecord"> | ||
| <int key="objectID">0</int> | ||
| <array key="object" id="0"/> | ||
| <reference key="children" ref="1000"/> | ||
| <nil key="parent"/> | ||
| </object> | ||
| <object class="IBObjectRecord"> | ||
| <int key="objectID">1</int> | ||
| <reference key="object" ref="191373211"/> | ||
| <array class="NSMutableArray" key="children"> | ||
| <reference ref="601521545"/> | ||
| </array> | ||
| <reference key="parent" ref="0"/> | ||
| </object> | ||
| <object class="IBObjectRecord"> | ||
| <int key="objectID">-1</int> | ||
| <reference key="object" ref="372490531"/> | ||
| <reference key="parent" ref="0"/> | ||
| <string key="objectName">File's Owner</string> | ||
| </object> | ||
| <object class="IBObjectRecord"> | ||
| <int key="objectID">-2</int> | ||
| <reference key="object" ref="975951072"/> | ||
| <reference key="parent" ref="0"/> | ||
| </object> | ||
| <object class="IBObjectRecord"> | ||
| <int key="objectID">4</int> | ||
| <reference key="object" ref="601521545"/> | ||
| <reference key="parent" ref="191373211"/> | ||
| </object> | ||
| </array> | ||
| </object> | ||
| <dictionary class="NSMutableDictionary" key="flattenedProperties"> | ||
| <string key="-1.CustomClassName">SimpleVideoFilterViewController</string> | ||
| <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | ||
| <string key="-2.CustomClassName">UIResponder</string> | ||
| <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | ||
| <string key="1.CustomClassName">GPUImageView</string> | ||
| <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | ||
| <string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> | ||
| </dictionary> | ||
| <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/> | ||
| <nil key="activeLocalization"/> | ||
| <dictionary class="NSMutableDictionary" key="localizations"/> | ||
| <nil key="sourceID"/> | ||
| <int key="maxID">6</int> | ||
| </object> | ||
| <object class="IBClassDescriber" key="IBDocument.Classes"> | ||
| <array class="NSMutableArray" key="referencedPartialClassDescriptions"> | ||
| <object class="IBPartialClassDescription"> | ||
| <string key="className">GPUImageView</string> | ||
| <string key="superclassName">UIView</string> | ||
| <object class="IBClassDescriptionSource" key="sourceIdentifier"> | ||
| <string key="majorKey">IBProjectSource</string> | ||
| <string key="minorKey">./Classes/GPUImageView.h</string> | ||
| </object> | ||
| </object> | ||
| <object class="IBPartialClassDescription"> | ||
| <string key="className">SimpleVideoFilterViewController</string> | ||
| <string key="superclassName">UIViewController</string> | ||
| <object class="NSMutableDictionary" key="actions"> | ||
| <string key="NS.key.0">updateSliderValue:</string> | ||
| <string key="NS.object.0">id</string> | ||
| </object> | ||
| <object class="NSMutableDictionary" key="actionInfosByName"> | ||
| <string key="NS.key.0">updateSliderValue:</string> | ||
| <object class="IBActionInfo" key="NS.object.0"> | ||
| <string key="name">updateSliderValue:</string> | ||
| <string key="candidateClassName">id</string> | ||
| </object> | ||
| </object> | ||
| <object class="IBClassDescriptionSource" key="sourceIdentifier"> | ||
| <string key="majorKey">IBProjectSource</string> | ||
| <string key="minorKey">./Classes/SimpleVideoFilterViewController.h</string> | ||
| </object> | ||
| </object> | ||
| </array> | ||
| </object> | ||
| <int key="IBDocument.localizationMode">0</int> | ||
| <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> | ||
| <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> | ||
| <int key="IBDocument.defaultPropertyAccessControl">3</int> | ||
| <string key="IBCocoaTouchPluginVersion">1179</string> | ||
| </data> | ||
| </archive> | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none"> | ||
| <dependencies> | ||
| <deployment identifier="iOS"/> | ||
| <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/> | ||
| </dependencies> | ||
| <objects> | ||
| <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="SimpleVideoFilterViewController"> | ||
| <connections> | ||
| <outlet property="view" destination="1" id="3"/> | ||
| </connections> | ||
| </placeholder> | ||
| <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> | ||
| <view contentMode="scaleToFill" id="1" customClass="GPUImageView"> | ||
| <rect key="frame" x="0.0" y="0.0" width="320" height="460"/> | ||
| <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> | ||
| <subviews> | ||
| <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="0.0" maxValue="1" id="4"> | ||
| <rect key="frame" x="18" y="412" width="284" height="29"/> | ||
| <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> | ||
| <connections> | ||
| <action selector="updateSliderValue:" destination="-1" eventType="valueChanged" id="6"/> | ||
| </connections> | ||
| </slider> | ||
| </subviews> | ||
| <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> | ||
| <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> | ||
| </view> | ||
| </objects> | ||
| </document> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters