Replaced everything with a copy from the parent project

Had some corruption I couldn't track down

Author: fattjake

License.txt

@@ -78,6 +78,8 @@
 		BCAD0982154F7B2800278521 /* GPUImageHarrisCornerDetectionFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = BCAD0980154F7B2800278521 /* GPUImageHarrisCornerDetectionFilter.m */; };
 		BCAD0985154F931C00278521 /* GPUImageAlphaBlendFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = BCAD0983154F931C00278521 /* GPUImageAlphaBlendFilter.h */; };
 		BCAD0986154F931C00278521 /* GPUImageAlphaBlendFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = BCAD0984154F931C00278521 /* GPUImageAlphaBlendFilter.m */; };
+		BCAD099F15506F6F00278521 /* GPUImageNonMaximumSuppressionFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = BCAD099D15506F6E00278521 /* GPUImageNonMaximumSuppressionFilter.h */; };
+		BCAD09A015506F6F00278521 /* GPUImageNonMaximumSuppressionFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = BCAD099E15506F6E00278521 /* GPUImageNonMaximumSuppressionFilter.m */; };
 		BCB5DE0D14E87F32000AF3C2 /* GPUImagePixellateFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB5DE0B14E87F32000AF3C2 /* GPUImagePixellateFilter.h */; };
 		BCB5DE0E14E87F32000AF3C2 /* GPUImagePixellateFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = BCB5DE0C14E87F32000AF3C2 /* GPUImagePixellateFilter.m */; };
 		BCB5E75C14E2086300701302 /* GPUImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB5E75A14E2086300701302 /* GPUImageView.h */; };
@@ -176,11 +178,6 @@
 		BCF3D723153E0E0C009A1FE5 /* GPUImageThresholdEdgeDetection.m in Sources */ = {isa = PBXBuildFile; fileRef = BCF3D721153E0E0B009A1FE5 /* GPUImageThresholdEdgeDetection.m */; };
 		BCF3D730153F0D6F009A1FE5 /* GPUImageSmoothToonFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = BCF3D72E153F0D6E009A1FE5 /* GPUImageSmoothToonFilter.h */; };
 		BCF3D731153F0D6F009A1FE5 /* GPUImageSmoothToonFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = BCF3D72F153F0D6F009A1FE5 /* GPUImageSmoothToonFilter.m */; };
-		F2C19D6E154FC53A00857A72 /* GPUImageMosaicFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = F2C19D6C154FC53A00857A72 /* GPUImageMosaicFilter.h */; };
-		F2C19D6F154FC53A00857A72 /* GPUImageMosaicFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = F2C19D6D154FC53A00857A72 /* GPUImageMosaicFilter.m */; };
-		F2C19D74154FC55000857A72 /* squares.png in Resources */ = {isa = PBXBuildFile; fileRef = F2C19D71154FC55000857A72 /* squares.png */; };
-		F2C19D75154FC55000857A72 /* circles.png in Resources */ = {isa = PBXBuildFile; fileRef = F2C19D72154FC55000857A72 /* circles.png */; };
-		F2C19D76154FC55000857A72 /* photo 4.JPG in Resources */ = {isa = PBXBuildFile; fileRef = F2C19D73154FC55000857A72 /* photo 4.JPG */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -269,6 +266,8 @@
 		BCAD0980154F7B2800278521 /* GPUImageHarrisCornerDetectionFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPUImageHarrisCornerDetectionFilter.m; path = Source/GPUImageHarrisCornerDetectionFilter.m; sourceTree = SOURCE_ROOT; };
 		BCAD0983154F931C00278521 /* GPUImageAlphaBlendFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPUImageAlphaBlendFilter.h; path = Source/GPUImageAlphaBlendFilter.h; sourceTree = SOURCE_ROOT; };
 		BCAD0984154F931C00278521 /* GPUImageAlphaBlendFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPUImageAlphaBlendFilter.m; path = Source/GPUImageAlphaBlendFilter.m; sourceTree = SOURCE_ROOT; };
+		BCAD099D15506F6E00278521 /* GPUImageNonMaximumSuppressionFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPUImageNonMaximumSuppressionFilter.h; path = Source/GPUImageNonMaximumSuppressionFilter.h; sourceTree = SOURCE_ROOT; };
+		BCAD099E15506F6E00278521 /* GPUImageNonMaximumSuppressionFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPUImageNonMaximumSuppressionFilter.m; path = Source/GPUImageNonMaximumSuppressionFilter.m; sourceTree = SOURCE_ROOT; };
 		BCB5DE0B14E87F32000AF3C2 /* GPUImagePixellateFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPUImagePixellateFilter.h; path = Source/GPUImagePixellateFilter.h; sourceTree = SOURCE_ROOT; };
 		BCB5DE0C14E87F32000AF3C2 /* GPUImagePixellateFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPUImagePixellateFilter.m; path = Source/GPUImagePixellateFilter.m; sourceTree = SOURCE_ROOT; };
 		BCB5E75A14E2086300701302 /* GPUImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPUImageView.h; path = Source/GPUImageView.h; sourceTree = SOURCE_ROOT; };
@@ -366,11 +365,6 @@
 		BCF3D721153E0E0B009A1FE5 /* GPUImageThresholdEdgeDetection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPUImageThresholdEdgeDetection.m; path = Source/GPUImageThresholdEdgeDetection.m; sourceTree = SOURCE_ROOT; };
 		BCF3D72E153F0D6E009A1FE5 /* GPUImageSmoothToonFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPUImageSmoothToonFilter.h; path = Source/GPUImageSmoothToonFilter.h; sourceTree = SOURCE_ROOT; };
 		BCF3D72F153F0D6F009A1FE5 /* GPUImageSmoothToonFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPUImageSmoothToonFilter.m; path = Source/GPUImageSmoothToonFilter.m; sourceTree = SOURCE_ROOT; };
-		F2C19D6C154FC53A00857A72 /* GPUImageMosaicFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GPUImageMosaicFilter.h; path = "../../../../../Programming/iPhone/Face Esplode/Face Esplode/GPUImageMosaicFilter.h"; sourceTree = "<group>"; };
-		F2C19D6D154FC53A00857A72 /* GPUImageMosaicFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPUImageMosaicFilter.m; path = "../../../../../Programming/iPhone/Face Esplode/Face Esplode/GPUImageMosaicFilter.m"; sourceTree = "<group>"; };
-		F2C19D71154FC55000857A72 /* squares.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = squares.png; path = "../../../../../Programming/iPhone/Face Esplode/Face Esplode/squares.png"; sourceTree = "<group>"; };
-		F2C19D72154FC55000857A72 /* circles.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = circles.png; path = "../../../../../Programming/iPhone/Face Esplode/Face Esplode/circles.png"; sourceTree = "<group>"; };
-		F2C19D73154FC55000857A72 /* photo 4.JPG */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = "photo 4.JPG"; path = "../../../../../Programming/iPhone/Face Esplode/Face Esplode/photo 4.JPG"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -607,8 +601,8 @@
 				BCF3D70E153DF9E6009A1FE5 /* GPUImageEmbossFilter.m */,
 				83AE9FCB1540E92800F7FC13 /* GPUImageMaskFilter.h */,
 				83AE9FCC1540E92800F7FC13 /* GPUImageMaskFilter.m */,
-				F2C19D6C154FC53A00857A72 /* GPUImageMosaicFilter.h */,
-				F2C19D6D154FC53A00857A72 /* GPUImageMosaicFilter.m */,
+				BCAD099D15506F6E00278521 /* GPUImageNonMaximumSuppressionFilter.h */,
+				BCAD099E15506F6E00278521 /* GPUImageNonMaximumSuppressionFilter.m */,
 			);
 			name = "Image processing";
 			sourceTree = "<group>";
@@ -650,9 +644,6 @@
 		BCF1A33914DDB1EC00852800 /* GPUImage */ = {
 			isa = PBXGroup;
 			children = (
-				F2C19D71154FC55000857A72 /* squares.png */,
-				F2C19D72154FC55000857A72 /* circles.png */,
-				F2C19D73154FC55000857A72 /* photo 4.JPG */,
 				BC245DBF14DDBCF5009FE7EB /* GPUImage.h */,
 				BCB5E79214E3275100701302 /* GLProgram.h */,
 				BCB5E79314E3275200701302 /* GLProgram.m */,
@@ -780,12 +771,9 @@
 				BCC11D72154B44DC0044F5A0 /* GPUImageHistogramGenerator.h in Headers */,
 				BCAD0978154F39CA00278521 /* GPUImagePrewittEdgeDetectionFilter.h in Headers */,
 				BCAD097D154F3CB000278521 /* GPUImageXYDerivativeFilter.h in Headers */,
-<<<<<<< HEAD
-				F2C19D6E154FC53A00857A72 /* GPUImageMosaicFilter.h in Headers */,
-=======
 				BCAD0981154F7B2800278521 /* GPUImageHarrisCornerDetectionFilter.h in Headers */,
 				BCAD0985154F931C00278521 /* GPUImageAlphaBlendFilter.h in Headers */,
->>>>>>> upstream/master
+				BCAD099F15506F6F00278521 /* GPUImageNonMaximumSuppressionFilter.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -861,9 +849,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				BCF1A35214DDB1EC00852800 /* InfoPlist.strings in Resources */,
-				F2C19D74154FC55000857A72 /* squares.png in Resources */,
-				F2C19D75154FC55000857A72 /* circles.png in Resources */,
-				F2C19D76154FC55000857A72 /* photo 4.JPG in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -966,12 +951,9 @@
 				BCC11D73154B44DC0044F5A0 /* GPUImageHistogramGenerator.m in Sources */,
 				BCAD0979154F39CA00278521 /* GPUImagePrewittEdgeDetectionFilter.m in Sources */,
 				BCAD097E154F3CB000278521 /* GPUImageXYDerivativeFilter.m in Sources */,
-<<<<<<< HEAD
-				F2C19D6F154FC53A00857A72 /* GPUImageMosaicFilter.m in Sources */,
-=======
 				BCAD0982154F7B2800278521 /* GPUImageHarrisCornerDetectionFilter.m in Sources */,
 				BCAD0986154F931C00278521 /* GPUImageAlphaBlendFilter.m in Sources */,
->>>>>>> upstream/master
+				BCAD09A015506F6F00278521 /* GPUImageNonMaximumSuppressionFilter.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

README.md

@@ -78,3 +78,4 @@
 #import "GPUImageXYDerivativeFilter.h"
 #import "GPUImageHarrisCornerDetectionFilter.h"
 #import "GPUImageAlphaBlendFilter.h"
+#import "GPUImageNonMaximumSuppressionFilter.h"

examples/BenchmarkSuite/BenchmarkSuite.xcodeproj/project.pbxproj

@@ -2,7 +2,7 @@
 
 @interface GPUImageFastBlurFilter : GPUImageTwoPassFilter
 {
-    GLint verticalPassTexelWidthOffsetUniform, verticalPassTexelHeightOffsetUniform, horizontalPassTexelWidthOffsetUniform, horizontalPassTexelHeightOffsetUniform, blurSizeUniform;
+    GLint verticalPassTexelWidthOffsetUniform, verticalPassTexelHeightOffsetUniform, horizontalPassTexelWidthOffsetUniform, horizontalPassTexelHeightOffsetUniform, firstBlurSizeUniform, secondBlurSizeUniform;
 }
 
 // The number of times to sequentially blur the incoming image. The more passes, the slower the filter.

examples/BenchmarkSuite/BenchmarkSuite/41-picture-frame.png

@@ -78,12 +78,12 @@ - (id)init;
 
     verticalPassTexelWidthOffsetUniform = [filterProgram uniformIndex:@"texelWidthOffset"];
     verticalPassTexelHeightOffsetUniform = [filterProgram uniformIndex:@"texelHeightOffset"];
+    firstBlurSizeUniform = [filterProgram uniformIndex:@"blurSize"];
 
     horizontalPassTexelWidthOffsetUniform = [secondFilterProgram uniformIndex:@"texelWidthOffset"];
     horizontalPassTexelHeightOffsetUniform = [secondFilterProgram uniformIndex:@"texelHeightOffset"];
-    
+    secondBlurSizeUniform = [secondFilterProgram uniformIndex:@"blurSize"];
 
-    blurSizeUniform = [filterProgram uniformIndex:@"blurSize"];
     self.blurSize = 1.0;
 
     return self;
@@ -123,7 +123,10 @@ - (void)setBlurSize:(CGFloat)newValue;
 
     [GPUImageOpenGLESContext useImageProcessingContext];
     [filterProgram use];
-    glUniform1f(blurSizeUniform, _blurSize);
+    glUniform1f(firstBlurSizeUniform, _blurSize);
+
+    [secondFilterProgram use];
+    glUniform1f(secondBlurSizeUniform, _blurSize);
 }
 
 @end

examples/BenchmarkSuite/BenchmarkSuite/[email protected]

@@ -4,15 +4,15 @@
 @class GPUImageXYDerivativeFilter;
 @class GPUImageGrayscaleFilter;
 @class GPUImageFastBlurFilter;
+@class GPUImageNonMaximumSuppressionFilter;
 
 @interface GPUImageHarrisCornerDetectionFilter : GPUImageFilterGroup
 {
-    GPUImageGrayscaleFilter *luminanceFilter;
     GPUImageXYDerivativeFilter *derivativeFilter;
 //    GPUImageGaussianBlurFilter *blurFilter;
-    GPUImageFastBlurFilter *blurFilter;
+    GPUImageFastBlurFilter *preblurFilter, *blurFilter;
     GPUImageFilter *harrisCornerDetectionFilter;
-    // Non maximum suppression filter
+    GPUImageNonMaximumSuppressionFilter *nonMaximumSuppressionFilter;
     GPUImageFilter *simpleThresholdFilter;
 }
 // A multiplier for the underlying blur size, ranging from 0.0 on up, with a default of 1.0

examples/BenchmarkSuite/BenchmarkSuite/46-movie-2.png

@@ -4,6 +4,7 @@
 #import "GPUImageXYDerivativeFilter.h"
 #import "GPUImageGrayscaleFilter.h"
 #import "GPUImageFastBlurFilter.h"
+#import "GPUImageNonMaximumSuppressionFilter.h"
 
 // This is the Harris corner detector, as described in 
 // C. Harris and M. Stephens. A Combined Corner and Edge Detector. Proc. Alvey Vision Conf., Univ. Manchester, pp. 147-151, 1988.
@@ -16,7 +17,7 @@ @implementation GPUImageHarrisCornerDetectionFilter
 
  uniform sampler2D inputImageTexture;
 
- const mediump float harrisConstant = 0.01;
+ const mediump float harrisConstant = 0.04;
 
  void main()
  {
@@ -31,7 +32,8 @@ void main()
      // Original Harris detector
 //     highp float harrisIntensity = derivativeElements.x * derivativeElements.y - (derivativeElements.z * derivativeElements.z) - harrisConstant * derivativeSum * derivativeSum;
 
-     gl_FragColor = vec4(vec3(harrisIntensity * 8.0), 1.0);
+     gl_FragColor = vec4(vec3(harrisIntensity * 10.0), 1.0);
+//     gl_FragColor = vec4(derivativeElements, 1.0);
  }
 );
 
@@ -41,7 +43,7 @@ void main()
 
  uniform sampler2D inputImageTexture;
 
- const lowp float threshold = 0.2;
+ const lowp float threshold = 0.10;
 
  void main()
  {
@@ -50,6 +52,8 @@ void main()
      lowp float thresholdValue = step(threshold, intensity);
 
      gl_FragColor = vec4(thresholdValue, 0.0, 0.0, thresholdValue);
+//     gl_FragColor = vec4(intensity, intensity, intensity, 1.0);
+//     gl_FragColor = vec4(intensity, 0.0, 0.0, intensity);
  }
  );
 
@@ -62,43 +66,47 @@ - (id)init;
     {
 		return nil;
     }
-    
-    // First pass: reduce to luminance
-    luminanceFilter = [[GPUImageGrayscaleFilter alloc] init];
-    [self addFilter:luminanceFilter];
-    
-    // Second pass: take the derivative of the luminance texture
+
+//    preblurFilter = [[GPUImageFastBlurFilter alloc] init];
+//    [self addFilter:preblurFilter];
+
+    // First pass: reduce to luminance and take the derivative of the luminance texture
     derivativeFilter = [[GPUImageXYDerivativeFilter alloc] init];
-    derivativeFilter.imageWidthFactor = 256.0;
-    derivativeFilter.imageHeightFactor = 256.0;
+//    derivativeFilter.imageWidthFactor = 256.0;
+//    derivativeFilter.imageHeightFactor = 256.0;
     [self addFilter:derivativeFilter];
 
-    // Third pass: blur the derivative
+    // Second pass: blur the derivative
 //    blurFilter = [[GPUImageGaussianBlurFilter alloc] init];
     blurFilter = [[GPUImageFastBlurFilter alloc] init];
     [self addFilter:blurFilter];
 
-    // Fourth pass: apply the Harris corner detection calculation
+    // Third pass: apply the Harris corner detection calculation
     harrisCornerDetectionFilter = [[GPUImageFilter alloc] initWithFragmentShaderFromString:kGPUImageHarrisCornerDetectionFragmentShaderString];
     [self addFilter:harrisCornerDetectionFilter];
 
-    // TODO: Non-maximum suppression filter here
+    // Fourth pass: apply non-maximum suppression to find the local maxima
+//    nonMaximumSuppressionFilter = [[GPUImageNonMaximumSuppressionFilter alloc] init];
+//    [self addFilter:nonMaximumSuppressionFilter];
 
     // Fifth pass: threshold the result
     simpleThresholdFilter = [[GPUImageFilter alloc] initWithFragmentShaderFromString:kGPUImageSimpleThresholdFragmentShaderString];
     [self addFilter:simpleThresholdFilter];
 
-    [luminanceFilter addTarget:derivativeFilter];
+//    [preblurFilter addTarget:luminanceFilter];
     [derivativeFilter addTarget:blurFilter];    
     [blurFilter addTarget:harrisCornerDetectionFilter];
+//    [harrisCornerDetectionFilter addTarget:nonMaximumSuppressionFilter];
+//    [nonMaximumSuppressionFilter addTarget:simpleThresholdFilter];
     [harrisCornerDetectionFilter addTarget:simpleThresholdFilter];
 
-    self.initialFilters = [NSArray arrayWithObjects:luminanceFilter, nil];
+//    self.initialFilters = [NSArray arrayWithObjects:preblurFilter, nil];
+    self.initialFilters = [NSArray arrayWithObjects:derivativeFilter, nil];
 //    self.terminalFilter = harrisCornerDetectionFilter;
     self.terminalFilter = simpleThresholdFilter;
 
 //    self.intensity = 1.0;
-    self.blurSize = 1.5;
+    self.blurSize = 1.0;
 
     return self;
 }