Merge pull request #67 from shitouren1994/clear-file

添加滤镜瘦脸大眼，添加iris检测。

Author: mlbo

Android/source/app/build.gradle

@@ -41,7 +41,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     //TODO change path to real
-    implementation files('path_to/tengine-kit1.0.0.aar')
+    implementation files('path_to/tengine-kit1.0.1.aar')
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

Android/source/app/src/main/AndroidManifest.xml

@@ -35,6 +35,7 @@
         <activity android:name=".bodydemo.BodyEntryActivity" />
         <activity android:name=".bodydemo.BodyBitmapActivity" />
         <activity android:name=".bodydemo.BodyFrameActivity" />
+        <activity android:name=".facedemo.FaceEffectActivity" />
     </application>
 
 </manifest>

Android/source/app/src/main/assets/model/tenginekit_face_attribute_if.tmfile

@@ -0,0 +1,62 @@
+package com.tenginekit.tenginedemo.camera2
+
+import android.app.Activity
+import android.content.Context
+import android.graphics.SurfaceTexture
+import android.opengl.GLES20
+import android.opengl.GLSurfaceView
+import android.util.Log
+import com.tengine.cameratest.CameraFilter
+import javax.microedition.khronos.egl.EGLConfig
+import javax.microedition.khronos.opengles.GL10
+
+abstract class CameraV2BaseRenderer(
+) : GLSurfaceView.Renderer {
+    var cameraV2GLSurfaceView: CameraV2GLSurfaceView? = null
+    var cameraManager: CameraV2Manager? = null
+    var mSurfaceTexture: SurfaceTexture? = null
+    val transformMatrix = FloatArray(16)
+    var cameraFilter: CameraFilter? = null
+    var context: Context? = null
+
+    fun setUp(surfaceView: CameraV2GLSurfaceView, camera: CameraV2Manager, activity: Activity) {
+        cameraV2GLSurfaceView = surfaceView
+        cameraManager = camera
+        context = activity
+    }
+
+    override fun onSurfaceCreated(gl: GL10, config: EGLConfig) {
+        // super part
+        cameraFilter = CameraFilter()
+        cameraManager!!.setSurfaceCreated(true)
+        cameraManager!!.openCamera()
+        // super part
+    }
+
+    override fun onSurfaceChanged(gl: GL10, width: Int, height: Int) {
+        // super part
+        GLES20.glViewport(0, 0, width, height)
+        cameraFilter!!.onSurfaceChanged(width, height)
+        Log.i(TAG, "onSurfaceChanged: $width, $height")
+        // super part
+    }
+
+    override fun onDrawFrame(gl: GL10) {
+        //super part
+        if (mSurfaceTexture != null) {
+            mSurfaceTexture!!.updateTexImage()
+            mSurfaceTexture!!.getTransformMatrix(transformMatrix)
+        }
+        //super part
+    }
+
+    fun getSurfaceTexture(): SurfaceTexture {
+        mSurfaceTexture = SurfaceTexture(cameraFilter!!.oESTextureId)
+        mSurfaceTexture!!.setOnFrameAvailableListener { cameraV2GLSurfaceView!!.requestRender() }
+        return mSurfaceTexture!!
+    }
+
+    companion object {
+        const val TAG = "CameraV2BaseRenderer"
+    }
+}

Android/source/app/src/main/assets/model/tenginekit_face_iris.tmfile

@@ -1,39 +1,28 @@
 package com.tenginekit.tenginedemo.camera2;
 
 import android.content.Context;
-import android.graphics.Bitmap;
 import android.graphics.SurfaceTexture;
 import android.opengl.GLSurfaceView;
 import android.util.AttributeSet;
 
-import com.tenginekit.tenginedemo.Constant;
-
 public class CameraV2GLSurfaceView extends GLSurfaceView {
-    public static final String TAG = Constant.LOG_TAG;
-    private CameraV2Renderer mCameraV2Renderer;
+    private CameraV2BaseRenderer mCameraV2Renderer;
 
     public CameraV2GLSurfaceView(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
-    public void init(CameraV2Manager camera, boolean isPreviewStarted, Context context) {
+    public void init(CameraV2BaseRenderer renderer) {
         setEGLContextClientVersion(3);
-
-        mCameraV2Renderer = new CameraV2Renderer();
-        mCameraV2Renderer.init(this, camera, isPreviewStarted, context);
-
-        setRenderer(mCameraV2Renderer);
+        mCameraV2Renderer = renderer;
+        setRenderer(renderer);
     }
 
     public CameraV2GLSurfaceView(Context context) {
         this(context, null);
     }
 
     public SurfaceTexture getSurfaceTexture() {
-        return mCameraV2Renderer.getSurfaceTextrue();
-    }
-
-    public void updateSegRes(Bitmap res) {
-        mCameraV2Renderer.updateSegRes(res);
+        return mCameraV2Renderer.getSurfaceTexture();
     }
 }

Android/source/app/src/main/assets/model/tenginekit_landmark_2d.tmfile

@@ -3,7 +3,6 @@
 
 import android.app.Activity;
 import android.content.Context;
-import android.graphics.Bitmap;
 import android.graphics.ImageFormat;
 import android.graphics.SurfaceTexture;
 import android.hardware.camera2.CameraAccessException;
@@ -26,10 +25,6 @@
 
 import com.tenginekit.engine.core.TengineKitSdk;
 import com.tenginekit.tenginedemo.Constant;
-
-import org.jetbrains.annotations.Nullable;
-
-import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -61,21 +56,17 @@ public void setSurfaceCreated(boolean surfaceCreated) {
     public boolean isSurfaceCreated = false;
     private FrameDataCallBack mFrameDataCallBack = null;
 
-    public void updateSegRes(@Nullable Bitmap res) {
-        mSurfaceView.updateSegRes(res);
-    }
-
-
     public interface FrameDataCallBack {
         void onFrameData(byte[] data, int width, int height);
     }
 
 
     public CameraV2Manager(Activity activity, boolean useFront, Size size,
-                           CameraV2GLSurfaceView surfaceView, FrameDataCallBack callBack) {
+                           CameraV2GLSurfaceView surfaceView, FrameDataCallBack callBack, CameraV2BaseRenderer renderer) {
         mActivity = activity;
         mSurfaceView = surfaceView;
-        surfaceView.init(this, false, activity);
+        renderer.setUp(surfaceView, this, activity);
+        mSurfaceView.init(renderer);
         startCameraThread();
         setupCamera(useFront, size.getWidth(), size.getHeight());
         mFrameDataCallBack = callBack;

Android/source/app/src/main/assets/texture/skin_gray.png

@@ -53,7 +53,7 @@ public synchronized void draw(final Canvas canvas) {
     @Override
     void processResults(Object results) {
         if (!drawCircle || results == null) return;
-        if (results instanceof List) {
+        if (results instanceof List && (((List<?>) results).get(0) instanceof List)) {
             trackedObjects = (List<List<TenginekitPoint>>) results;
         }
     }