Fixed forceProcessingAtSize: glitches for the bulge, pinch, pixellate…

…, sphere refraction, and centered Gaussian blur filters.
jacksonpan · Jun 4, 2013 · bb90abd · bb90abd
1 parent 1f6f130
commit bb90abd
Show file tree

Hide file tree

Showing 8 changed files with 155 additions and 51 deletions.
diff --git a/examples/iOS/FilterShowcase/FilterShowcase/ShowcaseFilterViewController.m b/examples/iOS/FilterShowcase/FilterShowcase/ShowcaseFilterViewController.m
@@ -1278,7 +1278,9 @@ - (void)setupFilter;
         default: filter = [[GPUImageSepiaFilter alloc] init]; break;
     }
 
-    if (filterType == GPUIMAGE_FILECONFIG) 
+    [filter forceProcessingAtSize:CGSizeMake(480.0, 640.0)];
+
+    if (filterType == GPUIMAGE_FILECONFIG)
     {
         self.title = @"File Configuration";
         pipeline = [[GPUImageFilterPipeline alloc] initWithConfigurationFile:[[NSBundle mainBundle] URLForResource:@"SampleConfiguration" withExtension:@"plist"]

diff --git a/framework/Source/GPUImageBulgeDistortionFilter.m b/framework/Source/GPUImageBulgeDistortionFilter.m
@@ -67,6 +67,8 @@ void main()
 
 @interface GPUImageBulgeDistortionFilter ()
 
+- (void)adjustAspectRatio;
+
 @property (readwrite, nonatomic) CGFloat aspectRatio;
 
 @end
@@ -103,21 +105,32 @@ - (id)init;
 #pragma mark -
 #pragma mark Accessors
 
+- (void)adjustAspectRatio;
+{
+    if (GPUImageRotationSwapsWidthAndHeight(inputRotation))
+    {
+        [self setAspectRatio:(inputTextureSize.width / inputTextureSize.height)];
+    }
+    else
+    {
+        [self setAspectRatio:(inputTextureSize.height / inputTextureSize.width)];
+    }
+}
+
+- (void)forceProcessingAtSize:(CGSize)frameSize;
+{
+    [super forceProcessingAtSize:frameSize];
+    [self adjustAspectRatio];
+}
+
 - (void)setInputSize:(CGSize)newSize atIndex:(NSInteger)textureIndex;
 {
     CGSize oldInputSize = inputTextureSize;
     [super setInputSize:newSize atIndex:textureIndex];
 
     if ( (!CGSizeEqualToSize(oldInputSize, inputTextureSize)) && (!CGSizeEqualToSize(newSize, CGSizeZero)) )
     {
-        if (GPUImageRotationSwapsWidthAndHeight(inputRotation))
-        {
-            [self setAspectRatio:(inputTextureSize.width / inputTextureSize.height)];
-        }
-        else
-        {
-            [self setAspectRatio:(inputTextureSize.height / inputTextureSize.width)];
-        }
+        [self adjustAspectRatio];
     }
 }
 
@@ -132,6 +145,7 @@ - (void)setInputRotation:(GPUImageRotationMode)newInputRotation atIndex:(NSInteg
 {
     [super setInputRotation:newInputRotation atIndex:textureIndex];
     [self setCenter:self.center];
+    [self adjustAspectRatio];
 }
 
 - (void)setRadius:(CGFloat)newValue;

diff --git a/framework/Source/GPUImageGaussianBlurPositionFilter.m b/framework/Source/GPUImageGaussianBlurPositionFilter.m
@@ -116,6 +116,8 @@ void main()
 
 @interface GPUImageGaussianBlurPositionFilter ()
 
+- (void)adjustAspectRatio;
+
 @property (readwrite, nonatomic) CGFloat aspectRatio;
 
 @end
@@ -157,25 +159,43 @@ - (id)init;
                       secondStageFragmentShaderFromString:nil];
 }
 
+- (void)adjustAspectRatio;
+{
+    if (GPUImageRotationSwapsWidthAndHeight(inputRotation))
+    {
+        [self setAspectRatio:(inputTextureSize.width / inputTextureSize.height)];
+    }
+    else
+    {
+        [self setAspectRatio:(inputTextureSize.height / inputTextureSize.width)];
+    }
+}
+
+- (void)forceProcessingAtSize:(CGSize)frameSize;
+{
+    [super forceProcessingAtSize:frameSize];
+    [self adjustAspectRatio];
+}
+
 - (void)setInputSize:(CGSize)newSize atIndex:(NSInteger)textureIndex;
 {
     CGSize oldInputSize = inputTextureSize;
     [super setInputSize:newSize atIndex:textureIndex];
-
+    
     if ( (!CGSizeEqualToSize(oldInputSize, inputTextureSize)) && (!CGSizeEqualToSize(newSize, CGSizeZero)) )
     {
-        if (GPUImageRotationSwapsWidthAndHeight(inputRotation))
-        {
-            [self setAspectRatio:(inputTextureSize.width / inputTextureSize.height)];
-        }
-        else
-        {
-            [self setAspectRatio:(inputTextureSize.height / inputTextureSize.width)];
-        }
+        [self adjustAspectRatio];
     }
 }
 
-#pragma mark Getters and Setters
+- (void)setInputRotation:(GPUImageRotationMode)newInputRotation atIndex:(NSInteger)textureIndex;
+{
+    [super setInputRotation:newInputRotation atIndex:textureIndex];
+    [self adjustAspectRatio];
+}
+
+#pragma mark -
+#pragma mark Accessors
 
 - (void)setBlurSize:(CGFloat)newValue;
 {

diff --git a/framework/Source/GPUImagePinchDistortionFilter.m b/framework/Source/GPUImagePinchDistortionFilter.m
@@ -70,6 +70,8 @@ void main()
 
 @interface GPUImagePinchDistortionFilter ()
 
+- (void)adjustAspectRatio;
+
 @property (readwrite, nonatomic) CGFloat aspectRatio;
 
 @end
@@ -106,28 +108,40 @@ - (id)init;
 #pragma mark -
 #pragma mark Accessors
 
+- (void)adjustAspectRatio;
+{
+    if (GPUImageRotationSwapsWidthAndHeight(inputRotation))
+    {
+        [self setAspectRatio:(inputTextureSize.width / inputTextureSize.height)];
+    }
+    else
+    {
+        [self setAspectRatio:(inputTextureSize.height / inputTextureSize.width)];
+    }
+}
+
+- (void)forceProcessingAtSize:(CGSize)frameSize;
+{
+    [super forceProcessingAtSize:frameSize];
+    [self adjustAspectRatio];
+}
+
 - (void)setInputSize:(CGSize)newSize atIndex:(NSInteger)textureIndex;
 {
     CGSize oldInputSize = inputTextureSize;
     [super setInputSize:newSize atIndex:textureIndex];
 
     if ( (!CGSizeEqualToSize(oldInputSize, inputTextureSize)) && (!CGSizeEqualToSize(newSize, CGSizeZero)) )
     {
-        if (GPUImageRotationSwapsWidthAndHeight(inputRotation))
-        {
-            [self setAspectRatio:(inputTextureSize.width / inputTextureSize.height)];
-        }
-        else
-        {
-            [self setAspectRatio:(inputTextureSize.height / inputTextureSize.width)];
-        }
+        [self adjustAspectRatio];
     }
 }
 
 - (void)setInputRotation:(GPUImageRotationMode)newInputRotation atIndex:(NSInteger)textureIndex;
 {
     [super setInputRotation:newInputRotation atIndex:textureIndex];
     [self setCenter:self.center];
+    [self adjustAspectRatio];
 }
 
 - (void)setAspectRatio:(CGFloat)newValue;

diff --git a/framework/Source/GPUImagePixellateFilter.h b/framework/Source/GPUImagePixellateFilter.h
@@ -8,4 +8,5 @@
 // The fractional width of the image to use as a size for the pixels in the resulting image. Values below one pixel width in the source image are ignored.
 @property(readwrite, nonatomic) CGFloat fractionalWidthOfAPixel;
 
+
 @end
diff --git a/framework/Source/GPUImagePixellateFilter.m b/framework/Source/GPUImagePixellateFilter.m
@@ -42,6 +42,8 @@ @interface GPUImagePixellateFilter ()
 
 @property (readwrite, nonatomic) CGFloat aspectRatio;
 
+- (void)adjustAspectRatio;
+
 @end
 
 @implementation GPUImagePixellateFilter
@@ -77,21 +79,38 @@ - (id)initWithFragmentShaderFromString:(NSString *)fragmentShaderString;
     return self;
 }
 
+- (void)adjustAspectRatio;
+{
+    if (GPUImageRotationSwapsWidthAndHeight(inputRotation))
+    {
+        [self setAspectRatio:(inputTextureSize.width / inputTextureSize.height)];
+    }
+    else
+    {
+        [self setAspectRatio:(inputTextureSize.height / inputTextureSize.width)];
+    }
+}
+
+- (void)setInputRotation:(GPUImageRotationMode)newInputRotation atIndex:(NSInteger)textureIndex;
+{
+    [super setInputRotation:newInputRotation atIndex:textureIndex];    
+    [self adjustAspectRatio];
+}
+
+- (void)forceProcessingAtSize:(CGSize)frameSize;
+{
+    [super forceProcessingAtSize:frameSize];
+    [self adjustAspectRatio];
+}
+
 - (void)setInputSize:(CGSize)newSize atIndex:(NSInteger)textureIndex;
 {
     CGSize oldInputSize = inputTextureSize;
     [super setInputSize:newSize atIndex:textureIndex];
 
     if ( (!CGSizeEqualToSize(oldInputSize, inputTextureSize)) && (!CGSizeEqualToSize(newSize, CGSizeZero)) )
     {
-        if (GPUImageRotationSwapsWidthAndHeight(inputRotation))
-        {
-            [self setAspectRatio:(inputTextureSize.width / inputTextureSize.height)];
-        }
-        else
-        {
-            [self setAspectRatio:(inputTextureSize.height / inputTextureSize.width)];
-        }
+        [self adjustAspectRatio];
     }
 }
 

diff --git a/framework/Source/GPUImagePixellatePositionFilter.m b/framework/Source/GPUImagePixellatePositionFilter.m
@@ -62,6 +62,8 @@ void main()
 
 @interface GPUImagePixellatePositionFilter ()
 
+- (void)adjustAspectRatio;
+
 @property (readwrite, nonatomic) CGFloat aspectRatio;
 
 @end
@@ -112,20 +114,38 @@ - (void)setInputSize:(CGSize)newSize atIndex:(NSInteger)textureIndex;
 
     if ( (!CGSizeEqualToSize(oldInputSize, inputTextureSize)) && (!CGSizeEqualToSize(newSize, CGSizeZero)) )
     {
-        if (GPUImageRotationSwapsWidthAndHeight(inputRotation))
-        {
-            [self setAspectRatio:(inputTextureSize.width / inputTextureSize.height)];
-        }
-        else
-        {
-            [self setAspectRatio:(inputTextureSize.height / inputTextureSize.width)];
-        }
+        [self adjustAspectRatio];
     }
 }
 
 #pragma mark -
 #pragma mark Accessors
 
+- (void)setInputRotation:(GPUImageRotationMode)newInputRotation atIndex:(NSInteger)textureIndex;
+{
+    [super setInputRotation:newInputRotation atIndex:textureIndex];
+    [self setCenter:self.center];
+    [self adjustAspectRatio];
+}
+
+- (void)adjustAspectRatio;
+{
+    if (GPUImageRotationSwapsWidthAndHeight(inputRotation))
+    {
+        [self setAspectRatio:(inputTextureSize.width / inputTextureSize.height)];
+    }
+    else
+    {
+        [self setAspectRatio:(inputTextureSize.height / inputTextureSize.width)];
+    }
+}
+
+- (void)forceProcessingAtSize:(CGSize)frameSize;
+{
+    [super forceProcessingAtSize:frameSize];
+    [self adjustAspectRatio];
+}
+
 - (void)setFractionalWidthOfAPixel:(CGFloat)newValue;
 {
     CGFloat singlePixelSpacing;

diff --git a/framework/Source/GPUImageSphereRefractionFilter.m b/framework/Source/GPUImageSphereRefractionFilter.m
@@ -60,6 +60,8 @@ void main()
 
 @interface GPUImageSphereRefractionFilter ()
 
+- (void)adjustAspectRatio;
+
 @property (readwrite, nonatomic) CGFloat aspectRatio;
 
 @end
@@ -113,24 +115,36 @@ - (void)setInputSize:(CGSize)newSize atIndex:(NSInteger)textureIndex;
 
     if (!CGSizeEqualToSize(oldInputSize, inputTextureSize) && (!CGSizeEqualToSize(newSize, CGSizeZero)) )
     {
-        if (GPUImageRotationSwapsWidthAndHeight(inputRotation))
-        {
-            [self setAspectRatio:(inputTextureSize.width / inputTextureSize.height)];
-        }
-        else
-        {
-            [self setAspectRatio:(inputTextureSize.height / inputTextureSize.width)];
-        }
+        [self adjustAspectRatio];
     }
 }
 
 #pragma mark -
 #pragma mark Accessors
 
+- (void)adjustAspectRatio;
+{
+    if (GPUImageRotationSwapsWidthAndHeight(inputRotation))
+    {
+        [self setAspectRatio:(inputTextureSize.width / inputTextureSize.height)];
+    }
+    else
+    {
+        [self setAspectRatio:(inputTextureSize.height / inputTextureSize.width)];
+    }
+}
+
 - (void)setInputRotation:(GPUImageRotationMode)newInputRotation atIndex:(NSInteger)textureIndex;
 {
     [super setInputRotation:newInputRotation atIndex:textureIndex];
     [self setCenter:self.center];
+    [self adjustAspectRatio];
+}
+
+- (void)forceProcessingAtSize:(CGSize)frameSize;
+{
+    [super forceProcessingAtSize:frameSize];
+    [self adjustAspectRatio];
 }
 
 - (void)setRadius:(CGFloat)newValue;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,5 @@
		// The fractional width of the image to use as a size for the pixels in the resulting image. Values below one pixel width in the source image are ignored.
		@property(readwrite, nonatomic) CGFloat fractionalWidthOfAPixel;


		@end