diff --git a/examples/iOS/FilterShowcase/FilterShowcase/ShowcaseFilterViewController.xib b/examples/iOS/FilterShowcase/FilterShowcase/ShowcaseFilterViewController.xib index 36ae59281..b13f78b9a 100755 --- a/examples/iOS/FilterShowcase/FilterShowcase/ShowcaseFilterViewController.xib +++ b/examples/iOS/FilterShowcase/FilterShowcase/ShowcaseFilterViewController.xib @@ -1,242 +1,55 @@ - - - 1536 - 12A269 - 2818 - 1187 - 624.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1900 - - - IBProxyObject - IBUILabel - IBUISlider - IBUISwitch - IBUIView - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 274 - - - - 266 - {{18, 374}, {284, 23}} - - _NS:623 - NO - IBCocoaTouchFramework - 0 - 0 - 0.5 - - - - 292 - {{219, 8}, {94, 27}} - - - _NS:9 - NO - IBCocoaTouchFramework - 0 - 0 - - 2 - MC45MTc2NDcxMjMzIDAuOTE3NjQ3MTIzMyAwLjkxNzY0NzEyMzMAA - - - - - 292 - {{173, 8}, {52, 27}} - - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - - 0 - Faces: - - 1 - MCAwIDAAA - - - HelveticaNeue-Bold - Helvetica Neue - 2 - 16 - - - HelveticaNeue-Bold - 16 - 16 - - NO - 0 - - - {{0, 64}, {320, 416}} - - - - 3 - MQA - - 2 - - - - - NO - - IBCocoaTouchFramework - - - - - - - view - - - - 3 - - - - filterSettingsSlider - - - - 7 - - - - facesSwitch - - - - 10 - - - - facesLabel - - - - 12 - - - - updateFilterFromSlider: - - - 13 - - 6 - - - - facesSwitched: - - - 13 - - 11 - - - - - - 0 - - - - - - 1 - - - - - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - - - 8 - - - - - 9 - - - - - - - ShowcaseFilterViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - GPUImageView - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - 12 - - - 0 - IBCocoaTouchFramework - YES - 3 - 1900 - - + + + + + + + + + HelveticaNeue-Bold + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/framework/Source/GPUImageSolidColorGenerator.m b/framework/Source/GPUImageSolidColorGenerator.m index 9b555ce04..45949f6e8 100644 --- a/framework/Source/GPUImageSolidColorGenerator.m +++ b/framework/Source/GPUImageSolidColorGenerator.m @@ -90,8 +90,10 @@ - (void)addTarget:(id)newTarget atTextureLocation:(NSInteger)text if (!CGSizeEqualToSize(inputTextureSize, CGSizeZero)) { - [newTarget setInputSize:inputTextureSize atIndex:textureLocation]; - [newTarget newFrameReadyAtTime:kCMTimeIndefinite atIndex:textureLocation]; + runSynchronouslyOnVideoProcessingQueue(^{ + [newTarget setInputSize:inputTextureSize atIndex:textureLocation]; + [newTarget newFrameReadyAtTime:kCMTimeIndefinite atIndex:textureLocation]; + }); } } diff --git a/framework/Source/iOS/GPUImagePicture.m b/framework/Source/iOS/GPUImagePicture.m index c525f4dcf..7f9e2182b 100755 --- a/framework/Source/iOS/GPUImagePicture.m +++ b/framework/Source/iOS/GPUImagePicture.m @@ -363,8 +363,10 @@ - (void)addTarget:(id)newTarget atTextureLocation:(NSInteger)text if (hasProcessedImage) { - [newTarget setInputSize:pixelSizeOfImage atIndex:textureLocation]; - [newTarget newFrameReadyAtTime:kCMTimeIndefinite atIndex:textureLocation]; + runSynchronouslyOnVideoProcessingQueue(^{ + [newTarget setInputSize:pixelSizeOfImage atIndex:textureLocation]; + [newTarget newFrameReadyAtTime:kCMTimeIndefinite atIndex:textureLocation]; + }); } }