Merge pull request #24 from doggycoder/master

pull request

Author: aiyaapp

AiyaEffectsSDK/build.gradle

@@ -8,7 +8,7 @@ android {
     buildToolsVersion "25.0.1"
 
     defaultConfig {
-        minSdkVersion 18
+        minSdkVersion 16
         targetSdkVersion 25
         versionCode rootProject.ext.vCode
         versionName rootProject.ext.vName

AiyaEffectsSDK/libs/arm64-v8a/libAiyaJniWrapper.so

@@ -63,6 +63,7 @@ private native int nTrack(byte[] rgbabuffer, int width, int height, float[] outf
         System.loadLibrary("simd");
         System.loadLibrary("aftk");
         System.loadLibrary("assimp");
+        System.loadLibrary("gameplay");
         System.loadLibrary("ayeffects");
         System.loadLibrary("AiyaJniWrapper");
     }

AiyaEffectsSDK/libs/arm64-v8a/libaftk.so

@@ -8,6 +8,7 @@
 package com.aiyaapp.camera.sdk;
 
 import android.annotation.SuppressLint;
+import com.aiyaapp.camera.sdk.etest.EData;
 import java.io.File;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -67,8 +68,13 @@ public class AiyaEffects implements ISdkManager {
 
     private int mMode=0;
 
+    private int oxEye=0;
+    private int thinFace=0;
+    private int beautyLevel=0;
+
     private boolean isResourceReady=false;
     private Semaphore mSemaphore;
+    private boolean isBeautyNeedTrack=false;
 
     private Object assetManager;
 
@@ -244,12 +250,32 @@ public void set(String key, int value) {
             case SET_TRACK_HEIGHT:
                 mTrackHeight=value;
                 break;
+            case SET_BEAUTY_LEVEL:
+                beautyLevel=value;
+                mAiyaCameraJni.set(key,value);
+                break;
             case SET_MODE:
                 this.mMode=value;
                 break;
             case SET_TRACK_FORCE_CLOSE:
                 this.forceCloseTrack=value;
                 break;
+            case SET_OXEYE:
+                oxEye=value;
+                isBeautyNeedTrack=oxEye>0||thinFace>0;
+                if (isBeautyNeedTrack&&beautyLevel==0){
+                    mAiyaCameraJni.set(SET_BEAUTY_LEVEL,1);
+                }
+                mAiyaCameraJni.set(key, value);
+                break;
+            case SET_THIN_FACE:
+                thinFace=value;
+                isBeautyNeedTrack=oxEye>0||thinFace>0;
+                if (isBeautyNeedTrack&&beautyLevel==0){
+                    mAiyaCameraJni.set(SET_BEAUTY_LEVEL,1);
+                }
+                mAiyaCameraJni.set(key, value);
+                break;
             case SET_ACTION:
                 switch (value){
                     case ACTION_REFRESH_PARAMS_NOW:
@@ -270,38 +296,46 @@ public void set(String key, Object obj) {
         }
     }
 
+    public boolean isNeedTrack(){
+        return (currentEffect!=null||isBeautyNeedTrack)&&forceCloseTrack==FALSE;
+    }
+
     @Override
     public void track(final byte[] trackData, final float[] info, final int trackIndex) {
         if(isResourceReady){
             mTrackExecutor.execute(new Runnable() {
                 @Override
                 public void run() {
-                    if(currentEffect==null||forceCloseTrack==TRUE){
+                    if((currentEffect==null&&!isBeautyNeedTrack)||forceCloseTrack==TRUE){
+                        EData.data.setTrackCode(2);
                         mSemaphore.release();
                         return;
                     }
                     long start=System.currentTimeMillis();
                     int trackCode=mAiyaCameraJni.track(trackData,mTrackWidth,mTrackHeight,info,
                         trackIndex);
                     Log.e("track------------------------>"+(System.currentTimeMillis()-start));
+
+                    Log.e("info","info----:"+info[0]+"/"+info[1]+"/"+info[10]+"/"+info[11]);
+
                     if(mTrackCallback!=null){
                         mTrackCallback.onTrack(trackCode,info);
                     }
                     mSemaphore.release();
                 }
             });
+            try {
+                mSemaphore.acquire();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
         }
 
     }
 
     @Override
     public void process(int textureId, int trackIndex) {
         if(isResourceReady){
-            try {
-                mSemaphore.acquire();
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
             if(!isSetParam){
                 setParameters(input,output);
             }
@@ -313,13 +347,13 @@ public void process(int textureId, int trackIndex) {
             if(mProcessCallback!=null){
                 mProcessCallback.onFinished();
             }
-            if(mMode==MODE_GIFT&&ret==STATE_EFFECT_END){
-                setEffect(null);
-            }
             if(ret==STATE_EFFECT_END){
                 mProcessEvent.strTag=currentEffect;
                 mObservable.notifyState(mProcessEvent);
             }
+            if(mMode==MODE_GIFT&&ret==STATE_EFFECT_END){
+                setEffect(null);
+            }
         }
     }
 

AiyaEffectsSDK/libs/arm64-v8a/libassimp.so

@@ -0,0 +1,87 @@
+package com.aiyaapp.camera.sdk;
+
+import android.content.Context;
+import android.telephony.TelephonyManager;
+import com.aiyaapp.camera.sdk.base.Assets;
+import com.aiyaapp.camera.sdk.base.Log;
+import java.io.File;
+
+/**
+ * Created by aiya on 2017/7/9.
+ */
+
+public class AiyaEffectsJni {
+
+    private static AiyaEffectsJni instance;
+
+    private AiyaCameraJni mAiyaJni;
+
+    private AiyaEffectsJni(){
+        mAiyaJni=new AiyaCameraJni();
+    }
+
+    public static AiyaEffectsJni getInstance(){
+        if(instance==null){
+            synchronized(AiyaEffectsJni.class){
+                if(instance==null){
+                    instance=new AiyaEffectsJni();
+                }
+            }
+        }
+        return instance;
+    }
+
+    public boolean init(Context context,String appKey) {
+        File cacheFilePath=context.getExternalFilesDir(null);
+        if (cacheFilePath == null) {
+            cacheFilePath=context.getFilesDir();
+        }
+        TelephonyManager tm=(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        String DEVICE_ID=tm.getDeviceId();
+        if (DEVICE_ID == null) {
+            DEVICE_ID=android.os.Build.SERIAL;
+        }
+        Log.e("start prepare resource");
+        String configPath=cacheFilePath.getAbsolutePath() + "/config";
+        boolean pb;
+        if (new File(configPath).exists()) {
+            pb=true;
+        } else {
+            Assets assets=new Assets(context);
+            pb=assets.doCopy();
+        }
+        Log.e("prepare resource success:" + pb);
+        return pb
+            && mAiyaJni.init(context, configPath, configPath, context.getPackageName(), DEVICE_ID, appKey)
+            == 0;
+    }
+
+    public void track(byte[] rgbabuffer, int width, int height, float[] outfdp,int trackIndex){
+        mAiyaJni.track(rgbabuffer, width, height, outfdp, trackIndex);
+    }
+
+    public void setParameters(int width, int height, int format, int orientation, int flip,int outWidth, int outHeight, int outFormat, int outOrientation, int outFlip) {
+        mAiyaJni.setParameters(width, height, format, orientation, flip, outWidth, outHeight, outFormat, outOrientation, outFlip);
+    }
+
+    public void set(String key,int value){
+        mAiyaJni.set(key, value);
+    }
+
+    public void set(String key,Object obj){
+        mAiyaJni.set(key, obj);
+    }
+
+    public void setEffect(String effectJson){
+        mAiyaJni.setEffect(effectJson);
+    }
+
+    public int processFrame(int textureId,int width,int height,int trackIndex){
+        return mAiyaJni.processFrame(textureId, width, height, trackIndex);
+    }
+
+    public void release() {
+        mAiyaJni.release();
+    }
+
+}

AiyaEffectsSDK/libs/arm64-v8a/libayeffects.so

@@ -17,8 +17,10 @@ public interface ISdkManager {
     String SET_BEAUTY_LEVEL="beauty_level";     //美颜等级，1-6，不在范围内表示关闭美颜
     String SET_BEAUTY_TYPE="beauty_type";       //美颜类型，0,1,4,5
     String SET_EFFECT_ON="effects_on";          //特效开关1开0关
-    String SET_OXEYE="oxeye";                   //是否大眼
-    String SET_THIN_FACE="thin_face";           //是否瘦脸
+    String SET_OXEYE="SetBigEyeScale";          //大眼，0-100
+    String SET_THIN_FACE="SetSlimFaceScale";    //瘦脸，0-100
+
+    String SET_EFFECT_FLIP="EnableVFlip";       //effect是否翻转
 
     String SET_TRACK_FORCE_CLOSE="track_force_close";   //人脸捕获强制关闭
 
@@ -36,6 +38,8 @@ public interface ISdkManager {
 
     String SET_ASSETS_MANAGER="assets_manager"; //AssetsManager
 
+    String SET_LOG="LogLevel";
+
     int ACTION_REFRESH_PARAMS_NOW=1;            //刷新params,需要在GL线程中执行
 
     int STATE_EFFECT_END=0x00040000;            //特效播放结束
@@ -44,6 +48,15 @@ public interface ISdkManager {
     int MODE_ORNAMENT=0;                        //饰品
     int MODE_GIFT=1;                            //礼物
 
+    int BEAUTY_TYPE_SUPER =1;
+    int BEAUTY_TYPE_SNAKE =2;
+    int BEAUTY_TYPE_MASK  =3;
+    int BEAUTY_TYPE_SUPER2P =4;
+    int BEAUTY_TYPE_DXLB  =5;
+    int BEAUTY_TYPE_B612   =6;
+    int BEAUTY_TYPE_FACECUT=7;
+    int BEAUTY_TYPE_NORMAL=8;
+
     int TRUE=1;
     int FALSE=0;
 //
@@ -82,7 +95,7 @@ public interface ISdkManager {
     /**
      * 人脸追踪，必须在GL环境中调用
      * @param trackData 需要追踪的原始图片数据
-     * @param info 追踪结果
+     * @param info 追踪结果，69个特征点，每两个浮点表示一个特征点，info长度200
      */
     void track(byte[] trackData, float[] info, int trackIndex);
 

AiyaEffectsSDK/libs/armeabi-v7a/libAiyaJniWrapper.so

@@ -7,6 +7,8 @@
  */
 package com.aiyaapp.camera.sdk.base;
 
+import com.aiyaapp.camera.sdk.AiyaEffects;
+
 /**
  * Description:
  */
@@ -19,6 +21,7 @@ private Log(){}
 
     public static void debug(boolean isDebug){
         Log.isDebug=isDebug;
+        AiyaEffects.getInstance().set(ISdkManager.SET_LOG,isDebug?0x03:0x07);
     }
 
     public static void e(String info){

AiyaEffectsSDK/libs/armeabi-v7a/libaftk.so

@@ -18,7 +18,7 @@ public static class d{
         private long drawTime=0;
         private float fps;
         private int dealTime;
-        private int trackCode;
+        private int trackCode=-1;
         private float cameraFps;
 
         private long renderRequestTime=0;

AiyaEffectsSDK/libs/armeabi-v7a/libassimp.so

@@ -107,7 +107,7 @@ private void myDraw(){
                 EData.data.getDealTime(),EData.data.getCameraFps()),40,40, mPaint);
             try {
                 mCanvas.drawText(String.format(Locale.CHINA,"Mem=%04dM，Cpu=%.3f%%,track:%b",memSize,
-                    cpuRate,EData.data.getTrackCode()==1),
+                    cpuRate,EData.data.getTrackCode()==0),
                     40,70,mPaint);
             }catch (Exception e){
                 e.printStackTrace();

AiyaEffectsSDK/libs/armeabi-v7a/libayeffects.so

@@ -127,6 +127,11 @@ public static float[] scale(float[] m,float x,float y){
         return m;
     }
 
+    public static float[] translate(float[] m,float x,float y){
+        Matrix.translateM(m,0,x,y,1);
+        return m;
+    }
+
     public static float[] getOriginalMatrix(){
         return new float[]{
             1,0,0,0,

AiyaEffectsSDK/libs/x86/libAiyaJniWrapper.so

@@ -27,7 +27,7 @@ public class PrepareFilter extends AFilter {
     private AiyaFilter mFilter;
     private int width=0;
     private int height=0;
-    private float[] infos = new float[20];
+    private float[] infos = new float[200];
     private int nowTextureIndex=0;
 
     private int fTextureSize = 2;
@@ -89,10 +89,14 @@ public void draw() {
         }
         mFilter.setTextureId(getTextureId());
         EasyGlUtils.bindFrameTexture(fFrame[0],fTexture[nowTextureIndex]);
-        GLES20.glViewport(0,0, AiyaEffects.getInstance().get(ISdkManager.SET_TRACK_WIDTH),
-            AiyaEffects.getInstance().get(ISdkManager.SET_TRACK_HEIGHT));
-        mFilter.draw();
-        AiyaEffects.getInstance().track(getTrackData(), infos, nowTextureIndex);
+        if(AiyaEffects.getInstance().isNeedTrack()){
+            GLES20.glViewport(0,0, AiyaEffects.getInstance().get(ISdkManager.SET_TRACK_WIDTH),
+                AiyaEffects.getInstance().get(ISdkManager.SET_TRACK_HEIGHT));
+            mFilter.draw();
+            AiyaEffects.getInstance().track(getTrackData(), infos, nowTextureIndex);
+        }else{
+            AiyaEffects.getInstance().track(null, infos, nowTextureIndex);
+        }
         GLES20.glViewport(0,0,width,height);
         mFilter.draw();
         EasyGlUtils.unBindFrameBuffer();