Skip to content

Commit 803ebda

Browse files
author
马君
committed
add track only demo
1 parent 153a5ad commit 803ebda

File tree

25 files changed

+952
-62
lines changed

25 files changed

+952
-62
lines changed
-4 KB
Binary file not shown.
79 KB
Binary file not shown.
0 Bytes
Binary file not shown.
-8.96 KB
Binary file not shown.
0 Bytes
Binary file not shown.
91 KB
Binary file not shown.

AiyaEffectsSDK/src/main/java/com/aiyaapp/camera/sdk/AiyaCameraJni.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ private native int nTrack(byte[] rgbabuffer, int width, int height, float[] outf
6363
System.loadLibrary("simd");
6464
System.loadLibrary("aftk");
6565
System.loadLibrary("assimp");
66+
System.loadLibrary("gameplay");
6667
System.loadLibrary("ayeffects");
6768
System.loadLibrary("AiyaJniWrapper");
6869
}

AiyaEffectsSDK/src/main/java/com/aiyaapp/camera/sdk/AiyaEffects.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
package com.aiyaapp.camera.sdk;
99

1010
import android.annotation.SuppressLint;
11+
import com.aiyaapp.camera.sdk.etest.EData;
1112
import java.io.File;
1213
import java.util.concurrent.ExecutorService;
1314
import java.util.concurrent.Executors;
@@ -306,13 +307,17 @@ public void track(final byte[] trackData, final float[] info, final int trackInd
306307
@Override
307308
public void run() {
308309
if((currentEffect==null&&!isBeautyNeedTrack)||forceCloseTrack==TRUE){
310+
EData.data.setTrackCode(2);
309311
mSemaphore.release();
310312
return;
311313
}
312314
long start=System.currentTimeMillis();
313315
int trackCode=mAiyaCameraJni.track(trackData,mTrackWidth,mTrackHeight,info,
314316
trackIndex);
315317
Log.e("track------------------------>"+(System.currentTimeMillis()-start));
318+
319+
Log.e("info","info----:"+info[0]+"/"+info[1]+"/"+info[10]+"/"+info[11]);
320+
316321
if(mTrackCallback!=null){
317322
mTrackCallback.onTrack(trackCode,info);
318323
}
Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
package com.aiyaapp.camera.sdk;
2+
3+
import android.content.Context;
4+
import android.telephony.TelephonyManager;
5+
import com.aiyaapp.camera.sdk.base.Assets;
6+
import com.aiyaapp.camera.sdk.base.Log;
7+
import java.io.File;
8+
9+
/**
10+
* Created by aiya on 2017/7/9.
11+
*/
12+
13+
public class AiyaEffectsJni {
14+
15+
private static AiyaEffectsJni instance;
16+
17+
private AiyaCameraJni mAiyaJni;
18+
19+
private AiyaEffectsJni(){
20+
mAiyaJni=new AiyaCameraJni();
21+
}
22+
23+
public static AiyaEffectsJni getInstance(){
24+
if(instance==null){
25+
synchronized(AiyaEffectsJni.class){
26+
if(instance==null){
27+
instance=new AiyaEffectsJni();
28+
}
29+
}
30+
}
31+
return instance;
32+
}
33+
34+
public boolean init(Context context,String appKey) {
35+
File cacheFilePath=context.getExternalFilesDir(null);
36+
if (cacheFilePath == null) {
37+
cacheFilePath=context.getFilesDir();
38+
}
39+
TelephonyManager tm=(TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
40+
String DEVICE_ID=tm.getDeviceId();
41+
if (DEVICE_ID == null) {
42+
DEVICE_ID=android.os.Build.SERIAL;
43+
}
44+
Log.e("start prepare resource");
45+
String configPath=cacheFilePath.getAbsolutePath() + "/config";
46+
boolean pb;
47+
if (new File(configPath).exists()) {
48+
pb=true;
49+
} else {
50+
Assets assets=new Assets(context);
51+
pb=assets.doCopy();
52+
}
53+
Log.e("prepare resource success:" + pb);
54+
return pb
55+
&& mAiyaJni.init(context, configPath, configPath, context.getPackageName(), DEVICE_ID, appKey)
56+
== 0;
57+
}
58+
59+
public void track(byte[] rgbabuffer, int width, int height, float[] outfdp,int trackIndex){
60+
mAiyaJni.track(rgbabuffer, width, height, outfdp, trackIndex);
61+
}
62+
63+
public void setParameters(int width, int height, int format, int orientation, int flip,int outWidth, int outHeight, int outFormat, int outOrientation, int outFlip) {
64+
mAiyaJni.setParameters(width, height, format, orientation, flip, outWidth, outHeight, outFormat, outOrientation, outFlip);
65+
}
66+
67+
public void set(String key,int value){
68+
mAiyaJni.set(key, value);
69+
}
70+
71+
public void set(String key,Object obj){
72+
mAiyaJni.set(key, obj);
73+
}
74+
75+
public void setEffect(String effectJson){
76+
mAiyaJni.setEffect(effectJson);
77+
}
78+
79+
public int processFrame(int textureId,int width,int height,int trackIndex){
80+
return mAiyaJni.processFrame(textureId, width, height, trackIndex);
81+
}
82+
83+
public void release() {
84+
mAiyaJni.release();
85+
}
86+
87+
}

AiyaEffectsSDK/src/main/java/com/aiyaapp/camera/sdk/base/ISdkManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ public interface ISdkManager {
4747

4848
int MODE_ORNAMENT=0; //饰品
4949
int MODE_GIFT=1; //礼物
50-
51-
int BEAUTY_TYPE_NORMAL=0;
50+
5251
int BEAUTY_TYPE_SUPER =1;
5352
int BEAUTY_TYPE_SNAKE =2;
5453
int BEAUTY_TYPE_MASK =3;
5554
int BEAUTY_TYPE_SUPER2P =4;
5655
int BEAUTY_TYPE_DXLB =5;
5756
int BEAUTY_TYPE_B612 =6;
5857
int BEAUTY_TYPE_FACECUT=7;
58+
int BEAUTY_TYPE_NORMAL=8;
5959

6060
int TRUE=1;
6161
int FALSE=0;

0 commit comments

Comments
 (0)