update init function

汪洋 · 汪洋 · commit 8f9cd17e02b7 · 2019-04-16T18:16:36.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -63,4 +63,5 @@ fastlane/test_output
 # After new code Injection tools there's a generated folder /iOSInjectionProject
 # https://github.com/johnno1962/injectionforxcode
 
-iOSInjectionProject/
+iOSInjectionProject/
+Podfile.lock
diff --git a/AiyaEffectSDK/AiyaEffectSDK.xcodeproj/project.xcworkspace/xcuserdata/wangyang.xcuserdatad/UserInterfaceState.xcuserstate b/AiyaEffectSDK/AiyaEffectSDK.xcodeproj/project.xcworkspace/xcuserdata/wangyang.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/AiyaEffectSDK/AiyaEffectSDK.xcodeproj/xcuserdata/wangyang.xcuserdatad/xcschemes/xcschememanagement.plist b/AiyaEffectSDK/AiyaEffectSDK.xcodeproj/xcuserdata/wangyang.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -17,7 +17,7 @@
 		<key>AyBeauty.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>8</integer>
+			<integer>7</integer>
 		</dict>
 		<key>AyCore.xcscheme</key>
 		<dict>
@@ -32,7 +32,7 @@
 		<key>AyEffect.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>7</integer>
+			<integer>6</integer>
 		</dict>
 		<key>AyFaceTrack.xcscheme</key>
 		<dict>
@@ -47,7 +47,7 @@
 		<key>AyShortVideoEffect.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>9</integer>
+			<integer>8</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
diff --git a/AiyaEffectSDK/AiyaEffectSDK/AyGPUImage/AYGLProgram.h b/AiyaEffectSDK/AiyaEffectSDK/AyGPUImage/AYGLProgram.h
@@ -27,13 +27,13 @@
 
 - (id)initWithVertexShaderString:(NSString *)vShaderString
             fragmentShaderString:(NSString *)fShaderString;
-- (id)initWithVertexShaderString:(NSString *)vShaderString
-          fragmentShaderFilename:(NSString *)fShaderFilename;
-- (id)initWithVertexShaderFilename:(NSString *)vShaderFilename
-            fragmentShaderFilename:(NSString *)fShaderFilename;
+
 - (GLuint)attributeIndex:(NSString *)attributeName;
+
 - (GLuint)uniformIndex:(NSString *)uniformName;
+
 - (BOOL)link;
+
 - (void)use;
 
 @end
diff --git a/AiyaEffectSDK/AiyaEffectSDK/AyGPUImage/AYGLProgram.m b/AiyaEffectSDK/AiyaEffectSDK/AyGPUImage/AYGLProgram.m
@@ -8,10 +8,6 @@
 
 #import "AYGLProgram.h"
 
-// START:typedefs
-#pragma mark Function Pointer Definitions
-typedef void (*GLInfoFunction)(GLuint program, GLenum pname, GLint* params);
-typedef void (*GLLogFunction) (GLuint program, GLsizei bufsize, GLsizei* length, GLchar* infolog);
 // END:typedefs
 #pragma mark -
 #pragma mark Private Extension Method Declaration
@@ -62,34 +58,6 @@ - (id)initWithVertexShaderString:(NSString *)vShaderString
     return self;
 }
 
-- (id)initWithVertexShaderString:(NSString *)vShaderString
-          fragmentShaderFilename:(NSString *)fShaderFilename;
-{
-    NSString *fragShaderPathname = [[NSBundle mainBundle] pathForResource:fShaderFilename ofType:@"fsh"];
-    NSString *fragmentShaderString = [NSString stringWithContentsOfFile:fragShaderPathname encoding:NSUTF8StringEncoding error:nil];
-    
-    if ((self = [self initWithVertexShaderString:vShaderString fragmentShaderString:fragmentShaderString]))
-    {
-    }
-    
-    return self;
-}
-
-- (id)initWithVertexShaderFilename:(NSString *)vShaderFilename
-            fragmentShaderFilename:(NSString *)fShaderFilename;
-{
-    NSString *vertShaderPathname = [[NSBundle mainBundle] pathForResource:vShaderFilename ofType:@"vsh"];
-    NSString *vertexShaderString = [NSString stringWithContentsOfFile:vertShaderPathname encoding:NSUTF8StringEncoding error:nil];
-    
-    NSString *fragShaderPathname = [[NSBundle mainBundle] pathForResource:fShaderFilename ofType:@"fsh"];
-    NSString *fragmentShaderString = [NSString stringWithContentsOfFile:fragShaderPathname encoding:NSUTF8StringEncoding error:nil];
-    
-    if ((self = [self initWithVertexShaderString:vertexShaderString fragmentShaderString:fragmentShaderString]))
-    {
-    }
-    
-    return self;
-}
 // END:init
 // START:compile
 - (BOOL)compileShader:(GLuint *)shader
diff --git a/AiyaEffectSDK/AiyaEffectSDK/AyGPUImage/AYGPUImageContext.h b/AiyaEffectSDK/AiyaEffectSDK/AyGPUImage/AYGPUImageContext.h
@@ -21,7 +21,9 @@ void runAYSynchronouslyOnContextQueue(AYGPUImageContext *context, void (^block)(
 
 @property(readonly, nonatomic) dispatch_queue_t contextQueue;
 @property(readonly, nonatomic) void *contextKey;
+
 @property(readonly, retain, nonatomic) EAGLContext *context;
+
 @property(readonly) CVOpenGLESTextureCacheRef coreVideoTextureCache;
 @property(readonly, retain, nonatomic) AYGPUImageFramebufferCache *framebufferCache;
 
@@ -35,8 +37,6 @@ void runAYSynchronouslyOnContextQueue(AYGPUImageContext *context, void (^block)(
 
 - (AYGLProgram *)programForVertexShaderString:(NSString *)vertexShaderString fragmentShaderString:(NSString *)fragmentShaderString;
 
-- (void)useSharegroup:(EAGLSharegroup *)sharegroup;
-
 @end
 
 @protocol AYGPUImageInput <NSObject>
diff --git a/AiyaEffectSDK/AiyaEffectSDK/AyGPUImage/AYGPUImageContext.m b/AiyaEffectSDK/AiyaEffectSDK/AyGPUImage/AYGPUImageContext.m
@@ -42,6 +42,8 @@ @interface AYGPUImageContext()
 {
     NSMutableDictionary *shaderProgramCache;
     EAGLSharegroup *_sharegroup;
+    
+    BOOL _newGLContext;
 }
 
 @end
@@ -56,7 +58,7 @@ @implementation AYGPUImageContext
 
 static int specificKey;
 
-- (instancetype)initWithNewGLContext
+- (instancetype)initWithNewGLContext;
 {
     self = [super init];
     if (self) {
@@ -70,7 +72,9 @@ - (instancetype)initWithNewGLContext
         
         shaderProgramCache = [[NSMutableDictionary alloc] init];
         
-        _context = [self createContext];
+        dispatch_sync(_contextQueue, ^{
+            _context = [self createContext];
+        });
     }
     return self;
 }
@@ -135,11 +139,6 @@ - (EAGLContext *)createContext;
 #pragma mark -
 #pragma mark Accessors
 
-- (EAGLContext *)context;
-{
-    return _context;
-}
-
 - (CVOpenGLESTextureCacheRef)coreVideoTextureCache;
 {
     if (_coreVideoTextureCache == NULL)
@@ -165,5 +164,4 @@ - (AYGPUImageFramebufferCache *)framebufferCache;
     
     return _framebufferCache;
 }
-
 @end
diff --git a/AiyaEffectSDK/AiyaEffectSDK/AyGPUImage/AYGPUImageFilter.h b/AiyaEffectSDK/AiyaEffectSDK/AyGPUImage/AYGPUImageFilter.h
@@ -17,10 +17,6 @@
 #define STRINGIZE2(x) STRINGIZE(x)
 #define SHADER_STRING(text) @ STRINGIZE2(text)
 
-#define AYGPUImageHashIdentifier #
-#define AYGPUImageWrappedLabel(x) x
-#define AYGPUImageEscapedHashIdentifier(a) AYGPUImageWrappedLabel(AYGPUImageHashIdentifier)a
-
 extern NSString *const kAYGPUImageVertexShaderString;
 extern NSString *const kAYGPUImagePassthroughFragmentShaderString;
 
@@ -47,7 +43,9 @@ extern NSString *const kAYGPUImagePassthroughFragmentShaderString;
 
 /// @name Rendering
 + (const GLfloat *)textureCoordinatesForRotation:(AYGPUImageRotationMode)rotationMode;
+
 + (BOOL)needExchangeWidthAndHeightWithRotation:(AYGPUImageRotationMode)rotationMode;
+
 - (void)renderToTextureWithVertices:(const GLfloat *)vertices textureCoordinates:(const GLfloat *)textureCoordinates;
 
 - (void)informTargetsAboutNewFrame;
diff --git a/AiyaEffectSDK/AiyaEffectSDK/AyGPUImage/AYGPUImageFramebufferCache.h b/AiyaEffectSDK/AiyaEffectSDK/AyGPUImage/AYGPUImageFramebufferCache.h
@@ -20,6 +20,7 @@
 - (id)initWithContext:(AYGPUImageContext *)context;
 
 - (AYGPUImageFramebuffer *)fetchFramebufferForSize:(CGSize)framebufferSize textureOptions:(AYGPUTextureOptions)textureOptions missCVPixelBuffer:(BOOL)missCVPixelBuffer;
+
 - (AYGPUImageFramebuffer *)fetchFramebufferForSize:(CGSize)framebufferSize missCVPixelBuffer:(BOOL)missCVPixelBuffer;
 
 - (void)returnFramebufferToCache:(AYGPUImageFramebuffer *)framebuffer;
diff --git a/AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/AYGPUImageTrackOutput.m b/AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/AYGPUImageTrackOutput.m
@@ -47,6 +47,7 @@ - (instancetype)initWithContext:(AYGPUImageContext *)context{
     
     runAYSynchronouslyOnContextQueue(context, ^{
         [context useAsCurrentContext];
+        
         dataProgram = [context programForVertexShaderString:kAYGPUImageVertexShaderString fragmentShaderString:kAYGPUImagePassthroughFragmentShaderString];
         
         if (!dataProgram.initialized)
@@ -71,6 +72,7 @@ - (instancetype)initWithContext:(AYGPUImageContext *)context{
         _track = [[AyFaceTrack alloc] init];
 #endif
     });
+    
     return self;
 }
 
diff --git a/AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/inputOutput/AYGPUImageBGRADataInput.m b/AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/inputOutput/AYGPUImageBGRADataInput.m
@@ -52,6 +52,7 @@ - (instancetype)initWithContext:(AYGPUImageContext *)context
         dataTextureCoordinateAttribute = [dataProgram attributeIndex:@"inputTextureCoordinate"];
         dataInputTextureUniform = [dataProgram uniformIndex:@"inputImageTexture"];
     });
+    
     return self;
 }
 
diff --git a/AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/inputOutput/AYGPUImageBGRADataOutput.m b/AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/inputOutput/AYGPUImageBGRADataOutput.m
@@ -40,6 +40,7 @@ - (instancetype)initWithContext:(AYGPUImageContext *)context
     }
     
     _context = context;
+    
     runAYSynchronouslyOnContextQueue(context, ^{
         [context useAsCurrentContext];
         dataProgram = [context programForVertexShaderString:kAYGPUImageVertexShaderString fragmentShaderString:kAYGPUImagePassthroughFragmentShaderString];
@@ -62,6 +63,7 @@ - (instancetype)initWithContext:(AYGPUImageContext *)context
         dataTextureCoordinateAttribute = [dataProgram attributeIndex:@"inputTextureCoordinate"];
         dataInputTextureUniform = [dataProgram uniformIndex:@"inputImageTexture"];
     });
+    
     return self;
 }
 
diff --git a/AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/inputOutput/AYGPUImageI420DataInput.m b/AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/inputOutput/AYGPUImageI420DataInput.m
@@ -59,9 +59,9 @@ - (instancetype)initWithContext:(AYGPUImageContext *)context
         return nil;
     }
     
+    [context useAsCurrentContext];
+    
     runAYSynchronouslyOnContextQueue(context, ^{
-        [context useAsCurrentContext];
-        
         dataProgram = [context programForVertexShaderString:kAYGPUImageVertexShaderString fragmentShaderString:kAYRGBConversion2FragmentShaderString];
         
         if (!dataProgram.initialized)
@@ -85,6 +85,7 @@ - (instancetype)initWithContext:(AYGPUImageContext *)context
         datavTextureUniform = [dataProgram uniformIndex:@"vTexture"];
         colorConversionUniform = [dataProgram uniformIndex:@"colorConversionMatrix"];
     });
+        
     return self;
 }
 
diff --git a/AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/inputOutput/AYGPUImageI420DataOutput.m b/AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/inputOutput/AYGPUImageI420DataOutput.m
@@ -116,6 +116,7 @@ - (instancetype)initWithContext:(AYGPUImageContext *)context
     }
     
     _context = context;
+    
     runAYSynchronouslyOnContextQueue(context, ^{
         [context useAsCurrentContext];
         
@@ -182,6 +183,7 @@ - (instancetype)initWithContext:(AYGPUImageContext *)context
         vInputTextureUniform = [vProgram uniformIndex:@"inputImageTexture"];
         vColorConversionUniform = [vProgram uniformIndex:@"colorConversionMatrix"];
     });
+        
     return self;
 }
 
diff --git a/AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/inputOutput/AYGPUImageNV12DataInput.m b/AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/inputOutput/AYGPUImageNV12DataInput.m
@@ -64,7 +64,7 @@ - (instancetype)initWithContext:(AYGPUImageContext *)context
     
     runAYSynchronouslyOnContextQueue(context, ^{
         [context useAsCurrentContext];
-        
+
         dataProgram = [context programForVertexShaderString:kAYGPUImageVertexShaderString fragmentShaderString:kAYRGBConversionFragmentShaderString];
         
         if (!dataProgram.initialized)
@@ -87,6 +87,7 @@ - (instancetype)initWithContext:(AYGPUImageContext *)context
         dataChrominanceTextureUniform = [dataProgram uniformIndex:@"chrominanceTexture"];
         colorConversionUniform = [dataProgram uniformIndex:@"colorConversionMatrix"];
     });
+    
     return self;
 }
 
diff --git a/AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/inputOutput/AYGPUImageNV12DataOutput.m b/AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/inputOutput/AYGPUImageNV12DataOutput.m
@@ -140,6 +140,7 @@ - (instancetype)initWithContext:(AYGPUImageContext *)context
         chrominanceInputTextureUniform = [chrominanceProgram uniformIndex:@"inputImageTexture"];
         chrominanceColorConversionUniform = [chrominanceProgram uniformIndex:@"colorConversionMatrix"];
     });
+    
     return self;
 }
 
diff --git a/AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/inputOutput/AYGPUImageTextureInput.m b/AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/inputOutput/AYGPUImageTextureInput.m
@@ -30,7 +30,7 @@ - (instancetype)initWithContext:(AYGPUImageContext *)context
     
     runAYSynchronouslyOnContextQueue(context, ^{
         [context useAsCurrentContext];
-    
+        
         dataProgram = [context programForVertexShaderString:kAYGPUImageVertexShaderString fragmentShaderString:kAYGPUImagePassthroughFragmentShaderString];
         
         if (!dataProgram.initialized)
@@ -51,6 +51,7 @@ - (instancetype)initWithContext:(AYGPUImageContext *)context
         dataTextureCoordinateAttribute = [dataProgram attributeIndex:@"inputTextureCoordinate"];
         dataInputTextureUniform = [dataProgram uniformIndex:@"inputImageTexture"];
     });
+    
     return self;
 }
 
diff --git a/AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/inputOutput/AYGPUImageTextureOutput.m b/AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/inputOutput/AYGPUImageTextureOutput.m
@@ -62,6 +62,7 @@ - (instancetype)initWithContext:(AYGPUImageContext *)context
         dataTextureCoordinateAttribute = [dataProgram attributeIndex:@"inputTextureCoordinate"];
         dataInputTextureUniform = [dataProgram uniformIndex:@"inputImageTexture"];
     });
+    
     return self;
 }
 
diff --git a/AiyaEffectSDK/AiyaEffectSDK/AyHandler/AYEffectHandler.h b/AiyaEffectSDK/AiyaEffectSDK/AyHandler/AYEffectHandler.h
@@ -80,6 +80,16 @@
  */
 @property (nonatomic, assign) AYGPUImageRotationMode rotateMode;
 
+/**
+ 初始化判断是否是处理纹理数据
+ */
+- (instancetype)initWithProcessTexture:(Boolean)isProcessTexture;
+
+/**
+ 清空所有资源
+ */
+- (void)destroy;
+
 /**
  处理纹理数据
 
diff --git a/AiyaEffectSDK/AiyaEffectSDK/AyHandler/AYEffectHandler.m b/AiyaEffectSDK/AiyaEffectSDK/AyHandler/AYEffectHandler.m
diff --git a/AiyaEffectSDK/AiyaEffectSDK/AyHandler/AYShortVideoEffectHandler.h b/AiyaEffectSDK/AiyaEffectSDK/AyHandler/AYShortVideoEffectHandler.h
diff --git a/AiyaEffectSDK/AiyaEffectSDK/AyHandler/AYShortVideoEffectHandler.m b/AiyaEffectSDK/AiyaEffectSDK/AyHandler/AYShortVideoEffectHandler.m
diff --git a/README.md b/README.md
diff --git a/demo/AiyaEffectSDKDemo/AiyaEffectsDemo.xcodeproj/project.pbxproj b/demo/AiyaEffectSDKDemo/AiyaEffectsDemo.xcodeproj/project.pbxproj
diff --git a/demo/AiyaEffectSDKDemo/AiyaEffectsDemo.xcworkspace/xcuserdata/wangyang.xcuserdatad/UserInterfaceState.xcuserstate b/demo/AiyaEffectSDKDemo/AiyaEffectsDemo.xcworkspace/xcuserdata/wangyang.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/demo/AiyaEffectSDKDemo/AiyaEffectsDemo/AiyaEffectFilter.m b/demo/AiyaEffectSDKDemo/AiyaEffectsDemo/AiyaEffectFilter.m

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@ @interface AYGPUImageContext()`
`42`	`42`	`{`
`43`	`43`	`NSMutableDictionary *shaderProgramCache;`
`44`	`44`	`EAGLSharegroup *_sharegroup;`
	`45`	`+`
	`46`	`+ BOOL _newGLContext;`
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`@end`
`@@ -56,7 +58,7 @@ @implementation AYGPUImageContext`
`56`	`58`
`57`	`59`	`static int specificKey;`
`58`	`60`
`59`		`-- (instancetype)initWithNewGLContext`
	`61`	`+- (instancetype)initWithNewGLContext;`
`60`	`62`	`{`
`61`	`63`	`self = [super init];`
`62`	`64`	`if (self) {`
`@@ -70,7 +72,9 @@ - (instancetype)initWithNewGLContext`
`70`	`72`
`71`	`73`	`shaderProgramCache = [[NSMutableDictionary alloc] init];`
`72`	`74`
`73`		`- _context = [self createContext];`
	`75`	`+ dispatch_sync(_contextQueue, ^{`
	`76`	`+ _context = [self createContext];`
	`77`	`+ });`
`74`	`78`	`}`
`75`	`79`	`return self;`
`76`	`80`	`}`
`@@ -135,11 +139,6 @@ - (EAGLContext *)createContext;`
`135`	`139`	`#pragma mark -`
`136`	`140`	`#pragma mark Accessors`
`137`	`141`
`138`		`-- (EAGLContext *)context;`
`139`		`-{`
`140`		`- return _context;`
`141`		`-}`
`142`		`-`
`143`	`142`	`- (CVOpenGLESTextureCacheRef)coreVideoTextureCache;`
`144`	`143`	`{`
`145`	`144`	`if (_coreVideoTextureCache == NULL)`
`@@ -165,5 +164,4 @@ - (AYGPUImageFramebufferCache *)framebufferCache;`
`165`	`164`
`166`	`165`	`return _framebufferCache;`
`167`	`166`	`}`
`168`		`-`
`169`	`167`	`@end`