Publish v4.0.4 (#39)

* 1. fixed sdk bug 2. fixed record video demo bug * 1. update documents
aiyaapp · Jan 8, 2018 · 5cbb98c · 5cbb98c
1 parent f0941a4
commit 5cbb98c
Show file tree

Hide file tree

Showing 10 changed files with 282 additions and 30 deletions.
diff --git a/AiyaEffectSDK/AyEffect/libaysdk.a b/AiyaEffectSDK/AyEffect/libaysdk.a
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 宝宝特效 AiyaEffectsSDK 涵盖Android、iOS两个平台，基于自主研发的人脸识别模块，作为一款动态贴纸和动画特效高效渲染的解决方案
 
 ### 1.1 版本信息
-最新版本 : v4.0.0 [更多版本信息](doc/versionHistory.md)
+最新版本 : v4.0.4 [更多版本信息](doc/versionHistory.md)
 
 ### 1.2 集成示例
 * [集成到金山云示例](https://github.com/aiyaapp/AiyaEffectsWithKSVCIOS)

diff --git a/...deproj/project.xcworkspace/xcuserdata/wangyang.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/wangyang.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/demo/AiyaVideoRecord/AiyaVideoRecord/Camera.m b/demo/AiyaVideoRecord/AiyaVideoRecord/Camera.m
@@ -105,7 +105,9 @@ - (void)configSession{
         [self.session addOutput:self.audioOutput];
     }
 
-    if ([self.session canSetSessionPreset:AVCaptureSessionPreset1280x720]){
+    if ([self.session canSetSessionPreset:AVCaptureSessionPreset1920x1080]){
+        self.session.sessionPreset = AVCaptureSessionPreset1920x1080;
+    }else if ([self.session canSetSessionPreset:AVCaptureSessionPreset1280x720]){
         self.session.sessionPreset = AVCaptureSessionPreset1280x720;
     }else if ([self.session canSetSessionPreset:AVCaptureSessionPreset640x480]){
         self.session.sessionPreset = AVCaptureSessionPreset640x480;
@@ -117,6 +119,8 @@ - (void)configSession{
 - (void)startCapture{
     if (![self.session isRunning]) {
         [self.session startRunning];
+
+        [self focusAtPoint:CGPointMake(0.5f, 0.5f)];
     }
 }
 

diff --git a/demo/AiyaVideoRecord/AiyaVideoRecord/MediaWriter.m b/demo/AiyaVideoRecord/AiyaVideoRecord/MediaWriter.m
@@ -4,7 +4,7 @@
 #import <MobileCoreServices/UTCoreTypes.h>
 
 @interface MediaWriter (){
-    dispatch_queue_t writerQueue;
+    dispatch_queue_t writerQueue; // AVAssetWriter 不能并行调用, 会出错.
 
     CMFormatDescriptionRef _outputFormatDescription;
 }
@@ -198,8 +198,10 @@ - (void)writeAudioSampleBuffer:(CMSampleBufferRef)sampleBuffer{
     }
 
     if (!self.audioAlreadySetup){
-        self.audioAlreadySetup = [self setupAudioWithSettings:sampleBuffer];
-
+        dispatch_sync(writerQueue, ^{
+            self.audioAlreadySetup = [self setupAudioWithSettings:sampleBuffer];
+        });
+
         if (!self.audioAlreadySetup) {
             NSLog(@"设置音频参数失败");
             return;
@@ -281,7 +283,10 @@ - (void)writeVideoPixelBuffer:(CVPixelBufferRef)pixelBuffer time:(CMTime)frameTi
     }
 
     if (!self.videoAlreadySetup){
-        self.videoAlreadySetup = [self setupVideoWithSettings:pixelBuffer];
+        dispatch_sync(writerQueue, ^{
+            self.videoAlreadySetup = [self setupVideoWithSettings:pixelBuffer];
+        });
+
         if (!self.videoAlreadySetup){
             NSLog(@"设置视频参数失败");
             return;

diff --git a/demo/AiyaVideoRecord/AiyaVideoRecord/OpenglHelper.m b/demo/AiyaVideoRecord/AiyaVideoRecord/OpenglHelper.m
@@ -183,7 +183,7 @@ - (BOOL)compileShader:(GLuint *)shader type:(GLenum)type string:(const NSString
 - (GLuint)createProgramWithVert:(const NSString *)vShaderString frag:(const NSString *)fShaderString{
 
     GLuint program = glCreateProgram();
-    GLuint vertShader, fragShader;
+    GLuint vertShader = 0, fragShader = 0;
     if (![self compileShader:&vertShader
                         type:GL_VERTEX_SHADER
                       string:vShaderString]){

diff --git a/demo/AiyaVideoRecord/AiyaVideoRecord/Preview.h b/demo/AiyaVideoRecord/AiyaVideoRecord/Preview.h
@@ -15,4 +15,9 @@
  */
 - (void)render:(CVPixelBufferRef)CVPixelBuffer;
 
+/**
+ 停止渲染
+ */
+@property (nonatomic, assign) BOOL renderSuspended;
+
 @end
diff --git a/demo/AiyaVideoRecord/AiyaVideoRecord/Preview.m b/demo/AiyaVideoRecord/AiyaVideoRecord/Preview.m
@@ -114,6 +114,12 @@ - (void)initGL{
 
 }
 
+- (void)setRenderSuspended:(BOOL)renderSuspended{
+    runSynchronouslyOnOpenglHelperContextQueue(^{
+        _renderSuspended = renderSuspended;
+    });
+}
+
 - (void)render:(CVPixelBufferRef)pixelBuffer{
     runSynchronouslyOnOpenglHelperContextQueue(^{
         [glHelper useAsCurrentContext];
@@ -190,7 +196,7 @@ - (void)render:(CVPixelBufferRef)pixelBuffer{
         glBindFramebuffer(GL_FRAMEBUFFER, displayFrameBuffer);
         glViewport(0, 0, backingWidth, backingHeight);
 
-        glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+        glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
         glUseProgram(program);
@@ -255,7 +261,12 @@ - (void)render:(CVPixelBufferRef)pixelBuffer{
         glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 
         glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer);
-        [[glHelper context] presentRenderbuffer:GL_RENDERBUFFER];
+
+        if (!self.renderSuspended) {
+            [[glHelper context] presentRenderbuffer:GL_RENDERBUFFER];
+        } else {
+            NSLog(@"render has stoped");
+        }
 // ----------显示纹理数据到视图中 绘制结束----------
     });
 }
@@ -316,7 +327,12 @@ - (void)createDisplayFramebuffer;{
         glGenRenderbuffers(1, &renderbuffer);
         glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer);
 
-        [[glHelper context] renderbufferStorage:GL_RENDERBUFFER fromDrawable:(CAEAGLLayer *)self.layer];
+        __block CAEAGLLayer *layer;
+        dispatch_sync(dispatch_get_main_queue(), ^{
+            layer = (CAEAGLLayer *)self.layer;
+        });
+
+        [[glHelper context] renderbufferStorage:GL_RENDERBUFFER fromDrawable:layer];
 
         glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_WIDTH, &backingWidth);
         glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_HEIGHT, &backingHeight);