Skip to content

Commit 4900ecc

Browse files
WangYngaiyaapp
WangYng
authored and
aiyaapp
committed
1. fix verticalFlip bug 2. add videorecord demo (aiyaapp#35)
1 parent 17bbedd commit 4900ecc

File tree

56 files changed

+3687
-47
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+3687
-47
lines changed

‎AiyaEffectSDK/AiyaEffectSDK.xcodeproj/project.xcworkspace/xcuserdata/wangyang.xcuserdatad/UserInterfaceState.xcuserstate

5.19 KB
Binary file not shown.

‎AiyaEffectSDK/AiyaEffectSDK.xcodeproj/xcuserdata/wangyang.xcuserdatad/xcschemes/xcschememanagement.plist

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,32 @@
77
<key>AiyaEffectSDK.xcscheme</key>
88
<dict>
99
<key>orderHint</key>
10-
<integer>1</integer>
10+
<integer>0</integer>
1111
</dict>
1212
<key>AyBeauty.xcscheme</key>
1313
<dict>
1414
<key>orderHint</key>
15-
<integer>9</integer>
15+
<integer>5</integer>
1616
</dict>
1717
<key>AyEffect.xcscheme</key>
1818
<dict>
1919
<key>orderHint</key>
20-
<integer>8</integer>
20+
<integer>4</integer>
2121
</dict>
2222
<key>AySDKCore.xcscheme</key>
2323
<dict>
2424
<key>orderHint</key>
25-
<integer>6</integer>
25+
<integer>3</integer>
2626
</dict>
2727
<key>AyShortVideoEffect.xcscheme</key>
2828
<dict>
2929
<key>orderHint</key>
30-
<integer>10</integer>
30+
<integer>6</integer>
3131
</dict>
3232
<key>AyTrack.xcscheme</key>
3333
<dict>
3434
<key>orderHint</key>
35-
<integer>7</integer>
35+
<integer>1</integer>
3636
</dict>
3737
</dict>
3838
<key>SuppressBuildableAutocreation</key>

‎AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/AYGPUImageRawDataInput.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ - (void)processBGRADataWithCVPixelBuffer:(CVPixelBufferRef)pixelBuffer;
8484
1.0f, 1.0f,
8585
};
8686

87-
static const GLfloat verticalFlipTextureCoordinates[] = {
88-
0.0f, 1.0f,
87+
static const GLfloat rotate180TextureCoordinates[] = {
8988
1.0f, 1.0f,
90-
0.0f, 0.0f,
91-
1.0f, 0.0f,
89+
0.0f, 1.0f,
90+
1.0f, 0.0f,
91+
0.0f, 0.0f,
9292
};
9393

9494
if (!inputDataTexture) {
@@ -110,7 +110,7 @@ - (void)processBGRADataWithCVPixelBuffer:(CVPixelBufferRef)pixelBuffer;
110110

111111
glVertexAttribPointer(dataPositionAttribute, 2, GL_FLOAT, 0, 0, squareVertices);
112112
if (self.verticalFlip) {
113-
glVertexAttribPointer(dataTextureCoordinateAttribute, 2, GL_FLOAT, 0, 0,verticalFlipTextureCoordinates);
113+
glVertexAttribPointer(dataTextureCoordinateAttribute, 2, GL_FLOAT, 0, 0,rotate180TextureCoordinates);
114114
} else {
115115
glVertexAttribPointer(dataTextureCoordinateAttribute, 2, GL_FLOAT, 0, 0,noRotationTextureCoordinates);
116116
}

‎AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/AYGPUImageRawDataOutput.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ - (void)renderAtInternalSize;
9494
1.0f, 1.0f,
9595
};
9696

97-
static const GLfloat verticalFlipTextureCoordinates[] = {
98-
0.0f, 1.0f,
97+
static const GLfloat rotate180TextureCoordinates[] = {
9998
1.0f, 1.0f,
100-
0.0f, 0.0f,
101-
1.0f, 0.0f,
99+
0.0f, 1.0f,
100+
1.0f, 0.0f,
101+
0.0f, 0.0f,
102102
};
103103

104104
glActiveTexture(GL_TEXTURE4);
@@ -107,7 +107,7 @@ - (void)renderAtInternalSize;
107107

108108
glVertexAttribPointer(dataPositionAttribute, 2, GL_FLOAT, 0, 0, squareVertices);
109109
if (self.verticalFlip) {
110-
glVertexAttribPointer(dataTextureCoordinateAttribute, 2, GL_FLOAT, 0, 0,verticalFlipTextureCoordinates);
110+
glVertexAttribPointer(dataTextureCoordinateAttribute, 2, GL_FLOAT, 0, 0,rotate180TextureCoordinates);
111111
} else {
112112
glVertexAttribPointer(dataTextureCoordinateAttribute, 2, GL_FLOAT, 0, 0,noRotationTextureCoordinates);
113113
}

‎AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/AYGPUImageTextureInput.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ - (void)processBGRADataWithTexture:(GLint)texture width:(int)width height:(int)h
7979
1.0f, 1.0f,
8080
};
8181

82-
static const GLfloat verticalFlipTextureCoordinates[] = {
83-
0.0f, 1.0f,
82+
static const GLfloat rotate180TextureCoordinates[] = {
8483
1.0f, 1.0f,
85-
0.0f, 0.0f,
86-
1.0f, 0.0f,
84+
0.0f, 1.0f,
85+
1.0f, 0.0f,
86+
0.0f, 0.0f,
8787
};
8888

8989
glActiveTexture(GL_TEXTURE1);
@@ -92,7 +92,7 @@ - (void)processBGRADataWithTexture:(GLint)texture width:(int)width height:(int)h
9292

9393
glVertexAttribPointer(dataPositionAttribute, 2, GL_FLOAT, 0, 0, squareVertices);
9494
if (self.verticalFlip) {
95-
glVertexAttribPointer(dataTextureCoordinateAttribute, 2, GL_FLOAT, 0, 0,verticalFlipTextureCoordinates);
95+
glVertexAttribPointer(dataTextureCoordinateAttribute, 2, GL_FLOAT, 0, 0,rotate180TextureCoordinates);
9696
} else {
9797
glVertexAttribPointer(dataTextureCoordinateAttribute, 2, GL_FLOAT, 0, 0,noRotationTextureCoordinates);
9898
}

‎AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/AYGPUImageTextureOutput.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ - (void)renderAtInternalSize;
9292
1.0f, 1.0f,
9393
};
9494

95-
static const GLfloat verticalFlipTextureCoordinates[] = {
96-
0.0f, 1.0f,
95+
static const GLfloat rotate180TextureCoordinates[] = {
9796
1.0f, 1.0f,
98-
0.0f, 0.0f,
99-
1.0f, 0.0f,
97+
0.0f, 1.0f,
98+
1.0f, 0.0f,
99+
0.0f, 0.0f,
100100
};
101101

102102
glActiveTexture(GL_TEXTURE4);
@@ -105,7 +105,7 @@ - (void)renderAtInternalSize;
105105

106106
glVertexAttribPointer(dataPositionAttribute, 2, GL_FLOAT, 0, 0, squareVertices);
107107
if (self.verticalFlip) {
108-
glVertexAttribPointer(dataTextureCoordinateAttribute, 2, GL_FLOAT, 0, 0,verticalFlipTextureCoordinates);
108+
glVertexAttribPointer(dataTextureCoordinateAttribute, 2, GL_FLOAT, 0, 0,rotate180TextureCoordinates);
109109
} else {
110110
glVertexAttribPointer(dataTextureCoordinateAttribute, 2, GL_FLOAT, 0, 0,noRotationTextureCoordinates);
111111
}

‎AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/AYGPUImageTrackOutput.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212

1313
@interface AYGPUImageTrackOutput : NSObject<AYGPUImageInput>
1414

15-
@property (nonatomic, assign) BOOL verticalFlip;
16-
1715
@property (nonatomic, assign) void **faceData;
1816

1917
- (instancetype)initWithContext:(AYGPUImageContext *)context;

‎AiyaEffectSDK/AiyaEffectSDK/AyGPUImageCustomFilter/AYGPUImageTrackOutput.m

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,23 +100,12 @@ - (void)renderAtInternalSize;
100100
1.0f, 1.0f,
101101
};
102102

103-
static const GLfloat verticalFlipTextureCoordinates[] = {
104-
0.0f, 1.0f,
105-
1.0f, 1.0f,
106-
0.0f, 0.0f,
107-
1.0f, 0.0f,
108-
};
109-
110103
glActiveTexture(GL_TEXTURE4);
111104
glBindTexture(GL_TEXTURE_2D, [firstInputFramebuffer texture]);
112105
glUniform1i(dataInputTextureUniform, 4);
113106

114107
glVertexAttribPointer(dataPositionAttribute, 2, GL_FLOAT, 0, 0, squareVertices);
115-
if (self.verticalFlip) {
116-
glVertexAttribPointer(dataTextureCoordinateAttribute, 2, GL_FLOAT, 0, 0,verticalFlipTextureCoordinates);
117-
} else {
118-
glVertexAttribPointer(dataTextureCoordinateAttribute, 2, GL_FLOAT, 0, 0,noRotationTextureCoordinates);
119-
}
108+
glVertexAttribPointer(dataTextureCoordinateAttribute, 2, GL_FLOAT, 0, 0,noRotationTextureCoordinates);
120109

121110
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
122111
glFinish();

‎AiyaEffectSDK/AiyaEffectSDK/AyHandler/AYEffectHandler.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,6 @@ - (void)setVerticalFlip:(BOOL)verticalFlip{
181181
self.textureOutput.verticalFlip = verticalFlip;
182182
self.rawDataInput.verticalFlip = verticalFlip;
183183
self.rawDataOutput.verticalFlip = verticalFlip;
184-
185-
#if AY_ENABLE_TRACK
186-
_trackOutput.verticalFlip = verticalFlip;
187-
#endif
188184
}
189185

190186
- (void)processWithTexture:(GLuint)texture width:(GLint)width height:(GLint)height{

‎demo/AiyaShortVideoEffectDemo/AiyaVideoEffectDemo.xcodeproj/project.xcworkspace/xcuserdata/wangyang.xcuserdatad/UserInterfaceState.xcuserstate

2.25 KB
Binary file not shown.

0 commit comments

Comments
 (0)