Adding missing rotation mode.

Fixing some of the exiting ones.
wjcwukong · Sep 5, 2013 · b7cac76 · b7cac76
1 parent 5e6c1f9
commit b7cac76
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 32 deletions.
diff --git a/framework/Source/GPUImageCropFilter.m b/framework/Source/GPUImageCropFilter.m
@@ -137,19 +137,19 @@ - (void)calculateCropTextureCoordinates;
             cropTextureCoordinates[6] = maxX; // 1,1
             cropTextureCoordinates[7] = maxY;
         }; break;
-        case kGPUImageRotateLeft: // Broken
+        case kGPUImageRotateLeft: // Fixed
         {
-            cropTextureCoordinates[0] = maxX; // 1,0
-            cropTextureCoordinates[1] = minY;
+            cropTextureCoordinates[0] = maxY; // 1,0
+            cropTextureCoordinates[1] = 1.0 - maxX;
 
-            cropTextureCoordinates[2] = maxX; // 1,1
-            cropTextureCoordinates[3] = maxY;
-            
-            cropTextureCoordinates[4] = minX; // 0,0
-            cropTextureCoordinates[5] = minY;
-            
-            cropTextureCoordinates[6] = minX; // 0,1
-            cropTextureCoordinates[7] = maxY;
+            cropTextureCoordinates[2] = maxY; // 1,1
+            cropTextureCoordinates[3] = 1.0 - minX;
+
+            cropTextureCoordinates[4] = minY; // 0,0
+            cropTextureCoordinates[5] = 1.0 - maxX;
+
+            cropTextureCoordinates[6] = minY; // 0,1
+            cropTextureCoordinates[7] = 1.0 - minX;
         }; break;
         case kGPUImageRotateRight: // Fixed
         {
@@ -165,7 +165,7 @@ - (void)calculateCropTextureCoordinates;
             cropTextureCoordinates[6] = maxY; // 1,0
             cropTextureCoordinates[7] = 1.0 - maxX;
         }; break;
-        case kGPUImageFlipVertical: // Broken
+        case kGPUImageFlipVertical: // Works for me
         {
             cropTextureCoordinates[0] = minX; // 0,1
             cropTextureCoordinates[1] = maxY;
@@ -179,7 +179,7 @@ - (void)calculateCropTextureCoordinates;
             cropTextureCoordinates[6] = maxX; // 1,0
             cropTextureCoordinates[7] = minY;
         }; break;
-        case kGPUImageFlipHorizonal: // Broken
+        case kGPUImageFlipHorizonal: // Works for me
         {
             cropTextureCoordinates[0] = maxX; // 1,0
             cropTextureCoordinates[1] = minY;
@@ -193,16 +193,16 @@ - (void)calculateCropTextureCoordinates;
             cropTextureCoordinates[6] = minX; // 0,1
             cropTextureCoordinates[7] = maxY;
         }; break;
-        case kGPUImageRotate180: // Broken
+        case kGPUImageRotate180: // Fixed
         {
             cropTextureCoordinates[0] = maxX; // 1,1
             cropTextureCoordinates[1] = maxY;
 
-            cropTextureCoordinates[2] = maxX; // 1,0
-            cropTextureCoordinates[3] = minY;
+            cropTextureCoordinates[2] = minX; // 0,1
+            cropTextureCoordinates[3] = maxY;
 
-            cropTextureCoordinates[4] = minX; // 0,1
-            cropTextureCoordinates[5] = maxY;
+            cropTextureCoordinates[4] = maxX; // 1,0
+            cropTextureCoordinates[5] = minY;
 
             cropTextureCoordinates[6] = minX; // 0,0
             cropTextureCoordinates[7] = minY;
@@ -221,7 +221,21 @@ - (void)calculateCropTextureCoordinates;
             cropTextureCoordinates[6] = maxY; // 1,1
             cropTextureCoordinates[7] = 1.0 - minX;
         }; break;
-    }    
+        case kGPUImageRotateRightFlipHorizontal: // Fixed
+        {
+            cropTextureCoordinates[0] = maxY; // 1,1
+            cropTextureCoordinates[1] = 1.0 - minX;
+
+            cropTextureCoordinates[2] = maxY; // 1,0
+            cropTextureCoordinates[3] = 1.0 - maxX;
+
+            cropTextureCoordinates[4] = minY; // 0,1
+            cropTextureCoordinates[5] = 1.0 - minX;
+
+            cropTextureCoordinates[6] = minY; // 0,0
+            cropTextureCoordinates[7] = 1.0 - maxX;
+        }; break;
+    }
 }
 
 - (void)newFrameReadyAtTime:(CMTime)frameTime atIndex:(NSInteger)textureIndex;

diff --git a/framework/Source/GPUImageFilter.m b/framework/Source/GPUImageFilter.m
@@ -491,7 +491,14 @@ + (const GLfloat *)textureCoordinatesForRotation:(GPUImageRotationMode)rotationM
         1.0f, 0.0f,
         1.0f, 1.0f,
     };
-
+
+    static const GLfloat rotateRightHorizontalFlipTextureCoordinates[] = {
+        1.0f, 1.0f,
+        1.0f, 0.0f,
+        0.0f, 1.0f,
+        0.0f, 0.0f,
+    };
+
     static const GLfloat rotate180TextureCoordinates[] = {
         1.0f, 1.0f,
         0.0f, 1.0f,
@@ -507,6 +514,7 @@ + (const GLfloat *)textureCoordinatesForRotation:(GPUImageRotationMode)rotationM
         case kGPUImageFlipVertical: return verticalFlipTextureCoordinates;
         case kGPUImageFlipHorizonal: return horizontalFlipTextureCoordinates;
         case kGPUImageRotateRightFlipVertical: return rotateRightVerticalFlipTextureCoordinates;
+        case kGPUImageRotateRightFlipHorizontal: return rotateRightHorizontalFlipTextureCoordinates;
         case kGPUImageRotate180: return rotate180TextureCoordinates;
     }
 }
@@ -849,6 +857,11 @@ - (CGPoint)rotatedPoint:(CGPoint)pointToRotate forRotation:(GPUImageRotationMode
             rotatedPoint.x = pointToRotate.y;
             rotatedPoint.y = pointToRotate.x;
         }; break;
+        case kGPUImageRotateRightFlipHorizontal:
+        {
+            rotatedPoint.x = 1.0 - pointToRotate.y;
+            rotatedPoint.y = 1.0 - pointToRotate.x;
+        }; break;
         case kGPUImageRotate180:
         {
             rotatedPoint.x = 1.0 - pointToRotate.x;

diff --git a/framework/Source/GPUImageVideoCamera.m b/framework/Source/GPUImageVideoCamera.m
@@ -926,8 +926,8 @@ - (void)updateOrientationSendToTargets;
                 {
                     case UIInterfaceOrientationPortrait:outputRotation = kGPUImageRotateRight; break;
                     case UIInterfaceOrientationPortraitUpsideDown:outputRotation = kGPUImageRotateLeft; break;
-                    case UIInterfaceOrientationLandscapeLeft:outputRotation = kGPUImageNoRotation; break;
-                    case UIInterfaceOrientationLandscapeRight:outputRotation = kGPUImageRotate180; break;
+                    case UIInterfaceOrientationLandscapeLeft:outputRotation = kGPUImageRotate180; break;
+                    case UIInterfaceOrientationLandscapeRight:outputRotation = kGPUImageNoRotation; break;
                 }
             }
         }
@@ -937,20 +937,20 @@ - (void)updateOrientationSendToTargets;
             {
                 switch(_outputImageOrientation)
                 {
-                    case UIInterfaceOrientationPortrait:outputRotation = kGPUImageRotateRight; break;
-                    case UIInterfaceOrientationPortraitUpsideDown:outputRotation = kGPUImageRotateLeft; break;
-                    case UIInterfaceOrientationLandscapeLeft:outputRotation = kGPUImageRotate180; break;
-                    case UIInterfaceOrientationLandscapeRight:outputRotation = kGPUImageNoRotation; break;
+                    case UIInterfaceOrientationPortrait:outputRotation = kGPUImageRotateRightFlipVertical; break;
+                    case UIInterfaceOrientationPortraitUpsideDown:outputRotation = kGPUImageRotateRightFlipHorizontal; break;
+                    case UIInterfaceOrientationLandscapeLeft:outputRotation = kGPUImageFlipHorizonal; break;
+                    case UIInterfaceOrientationLandscapeRight:outputRotation = kGPUImageFlipVertical; break;
                 }
             }
             else
             {
                 switch(_outputImageOrientation)
                 {
-                    case UIInterfaceOrientationPortrait:outputRotation = kGPUImageRotateRightFlipVertical; break;
-                    case UIInterfaceOrientationPortraitUpsideDown:outputRotation = kGPUImageRotateRight; break;
-                    case UIInterfaceOrientationLandscapeLeft:outputRotation = kGPUImageFlipVertical; break;
-                    case UIInterfaceOrientationLandscapeRight:outputRotation = kGPUImageFlipHorizonal; break;
+                    case UIInterfaceOrientationPortrait:outputRotation = kGPUImageRotateRight; break;
+                    case UIInterfaceOrientationPortraitUpsideDown:outputRotation = kGPUImageRotateLeft; break;
+                    case UIInterfaceOrientationLandscapeLeft:outputRotation = kGPUImageNoRotation; break;
+                    case UIInterfaceOrientationLandscapeRight:outputRotation = kGPUImageRotate180; break;
                 }
             }
         }

diff --git a/framework/Source/iOS/GPUImageContext.h b/framework/Source/iOS/GPUImageContext.h
@@ -6,9 +6,9 @@
 #import <CoreMedia/CoreMedia.h>
 #import "GLProgram.h"
 
-#define GPUImageRotationSwapsWidthAndHeight(rotation) ((rotation) == kGPUImageRotateLeft || (rotation) == kGPUImageRotateRight || (rotation) == kGPUImageRotateRightFlipVertical)
+#define GPUImageRotationSwapsWidthAndHeight(rotation) ((rotation) == kGPUImageRotateLeft || (rotation) == kGPUImageRotateRight || (rotation) == kGPUImageRotateRightFlipVertical || (rotation) == kGPUImageRotateRightFlipHorizontal)
 
-typedef enum { kGPUImageNoRotation, kGPUImageRotateLeft, kGPUImageRotateRight, kGPUImageFlipVertical, kGPUImageFlipHorizonal, kGPUImageRotateRightFlipVertical, kGPUImageRotate180 } GPUImageRotationMode;
+typedef enum { kGPUImageNoRotation, kGPUImageRotateLeft, kGPUImageRotateRight, kGPUImageFlipVertical, kGPUImageFlipHorizonal, kGPUImageRotateRightFlipVertical, kGPUImageRotateRightFlipHorizontal, kGPUImageRotate180 } GPUImageRotationMode;
 
 @interface GPUImageContext : NSObject
 

diff --git a/framework/Source/iOS/GPUImageView.m b/framework/Source/iOS/GPUImageView.m
@@ -331,6 +331,13 @@ + (const GLfloat *)textureCoordinatesForRotation:(GPUImageRotationMode)rotationM
         0.0f, 1.0f,
     };
 
+    static const GLfloat rotateRightHorizontalFlipTextureCoordinates[] = {
+        1.0f, 1.0f,
+        1.0f, 0.0f,
+        0.0f, 1.0f,
+        0.0f, 0.0f,
+    };
+
     static const GLfloat rotate180TextureCoordinates[] = {
         1.0f, 0.0f,
         0.0f, 0.0f,
@@ -346,6 +353,7 @@ + (const GLfloat *)textureCoordinatesForRotation:(GPUImageRotationMode)rotationM
         case kGPUImageFlipVertical: return verticalFlipTextureCoordinates;
         case kGPUImageFlipHorizonal: return horizontalFlipTextureCoordinates;
         case kGPUImageRotateRightFlipVertical: return rotateRightVerticalFlipTextureCoordinates;
+        case kGPUImageRotateRightFlipHorizontal: return rotateRightHorizontalFlipTextureCoordinates;
         case kGPUImageRotate180: return rotate180TextureCoordinates;
     }
 }