v2.2.3 GPU 指令优化

README.md

@@ -2,15 +2,15 @@
 
 #### 项目介绍
 
-**pixelFree** 是基于个人几年对图形学习，总结开发的SDK, 主要用于直播，短视频领域.....
+**pixelFree** 是基于个人几年对图形学习，总结开发的SDK, 轻量级高性能，主要用于直播，短视频领域.....
 
 主要功能包含：美白，红润，磨皮，锐化，大眼，瘦脸…….
 
 集成接入参考  *pixelFreeEffects* 演示**DEMO**
 
 注：演示所有素材均来源于网络，如有侵权邮件告知 [email protected],将第一时间删除
 
-#### 美颜效果 :
+#### 美颜效果 
 
 磨皮的同时，保留更多细节，美化与真实并存
 
@@ -22,6 +22,10 @@
 
 ![aaa](./res/lvmuCom.png)   
 
+#### 美颜全开性能
+
+![aaa](./res/option.png)   
+
 #### 支持的平台系统
 
 |  平台   |  系统  |
@@ -43,7 +47,6 @@
      pod 'PixelFree'
    ```
 
-
 
 #### 接入使用
 
@@ -82,10 +85,14 @@
    [_mPixelFree processWithBuffer:pixbuffer];
    ```
 
-
 
 
 #### 更新日志
+**2023-08-12 日更新** v2.3.3
+伟大优化，性能提升 30%
+- 磨皮优化
+- GPU 指令优化
+
 **2023-07-20 日更新** v2.3.2
 
 - 优化美型效果，美型形变显得更加真实

SMBeautyEngine_iOS/PixelFree.framework/Headers/SMPixelFree.h

@@ -12,7 +12,6 @@
 #import <OpenGLES/ES2/glext.h>
 #import "pixelFree_c.hpp"
 //#import "SMFilterModel.h"
-
 NS_ASSUME_NONNULL_BEGIN
 
 __attribute__((visibility("default"))) @interface SMPixelFree : NSObject
@@ -64,7 +63,6 @@ __attribute__((visibility("default"))) @interface SMPixelFree : NSObject
 // 加载美颜bundle
 - (void)createBeautyItemFormBundle:(void*)data size:(int)sz;
 
-
 @end
 
 NS_ASSUME_NONNULL_END

SMBeautyEngine_iOS/SMBeautyEngine_iOS/PFCamera.m

@@ -56,7 +56,7 @@ - (instancetype)init
 {
     if (self = [super init]) {
         self.cameraPosition = AVCaptureDevicePositionFront;
-        self.captureFormat = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;//kCVPixelFormatType_32BGRA;//
+        self.captureFormat = kCVPixelFormatType_32BGRA;// kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;//kCVPixelFormatType_32BGRA;//
         videoHDREnabled = YES;
     }
     return self;

SMBeautyEngine_iOS/SMBeautyEngine_iOS/PFOpenGLView.h

@@ -47,4 +47,6 @@ typedef NS_ENUM(NSInteger, PFOpenGLViewContentMode) {
 /* 同步渲染 */
 - (void)displaySyncPixelBuffer:(CVPixelBufferRef)pixelBuffer;
 
+- (void)displaySyncTexture:(int)texture withSize:(CGSize)size;
+
 @end

SMBeautyEngine_iOS/SMBeautyEngine_iOS/PFOpenGLView.m

@@ -529,6 +529,56 @@ - (void)displayImageData:(void *)imageData withSize:(CGSize)size{
     [self presentFramebuffer];
 }
 
+- (void)displaySyncTexture:(int)texture withSize:(CGSize)size{
+    frameWidth = (int)size.width;
+    frameHeight = (int)size.height;
+
+    if ([EAGLContext currentContext] != self.glContext) {
+        if (![EAGLContext setCurrentContext:self.glContext]) {
+            NSLog(@"fail to setCurrentContext");
+        }
+    }
+    [self setDisplayFramebuffer];
+    if (!rgbaProgram) {
+        [self loadShadersRGBA];
+    }
+
+    glBindTexture(GL_TEXTURE_2D, texture);
+
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+    glUseProgram(rgbaProgram);
+
+    glActiveTexture(GL_TEXTURE1);
+    glBindTexture(GL_TEXTURE_2D, texture);
+    glUniform1i(displayInputTextureUniform, 1);
+
+    [self updateVertices];
+
+    // 更新顶点数据
+    glVertexAttribPointer(furgbaPositionAttribute, 2, GL_FLOAT, 0, 0, vertices);
+    glEnableVertexAttribArray(furgbaPositionAttribute);
+
+    GLfloat quadTextureData[] =  {
+        0.0f, 1.0f,
+        1.0f, 1.0f,
+        0.0f,  0.0f,
+        1.0f,  0.0f,
+    };
+
+    glVertexAttribPointer(furgbaTextureCoordinateAttribute, 2, GL_FLOAT, 0, 0, quadTextureData);
+    glEnableVertexAttribArray(furgbaTextureCoordinateAttribute);
+
+    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
+    [self presentFramebuffer];
+}
+
+
+
 - (void)displayImageData:(void *)imageData withSize:(CGSize)size Center:(CGPoint)center Landmarks:(float *)landmarks count:(int)count {
 
     frameWidth = (int)size.width;

SMBeautyEngine_iOS/SMBeautyEngine_iOS/PFVideoController.m

@@ -45,7 +45,7 @@ - (void)viewDidLoad {
 -(void)didOutputVideoSampleBuffer:(CMSampleBufferRef)sampleBuffer{
     CVPixelBufferRef pixbuffer = CMSampleBufferGetImageBuffer(sampleBuffer);
     CVPixelBufferLockBaseAddress(pixbuffer, 0);
-    
+
     if(pixbuffer){
         [self.mPixelFree processWithBuffer:pixbuffer rotationMode:PFRotationMode0];
     }