Skip to content

Commit de8edb7

Browse files
authored
Merge pull request #4 from doggycoder/master
支持资源加密;代码清理;增加导出的计时
2 parents c78b80d + 4e35377 commit de8edb7

File tree

13 files changed

+22
-189
lines changed

13 files changed

+22
-189
lines changed

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AiyaEffectsSDK/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,5 @@ dependencies {
5656
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
5757
exclude group: 'com.android.support', module: 'support-annotations'
5858
})
59-
compile 'com.android.support:appcompat-v7:24.2.1'
6059
testCompile 'junit:junit:4.12'
6160
}
693 KB
Binary file not shown.
0 Bytes
Binary file not shown.
496 KB
Binary file not shown.
0 Bytes
Binary file not shown.
708 KB
Binary file not shown.
0 Bytes
Binary file not shown.

AiyaEffectsSDK/src/main/java/com/aiyaapp/camera/sdk/filter/PrepareFilter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import com.aiyaapp.camera.sdk.AiyaEffects;
1616
import com.aiyaapp.camera.sdk.base.ISdkManager;
17+
import com.aiyaapp.camera.sdk.base.Log;
1718

1819
/**
1920
* 用于接收图像流,并做人脸特征点定位的类。该类必须与{@link ProcessFilter}配合使用
@@ -72,9 +73,11 @@ public int getOutputTexture() {
7273
}
7374

7475
private byte[] getTrackData() {
76+
long t=System.currentTimeMillis();
7577
GLES20.glReadPixels(0, 0, AiyaEffects.getInstance().get(ISdkManager.SET_TRACK_WIDTH),
7678
AiyaEffects.getInstance().get(ISdkManager.SET_TRACK_HEIGHT) , GLES20.GL_RGBA,
7779
GLES20.GL_UNSIGNED_BYTE,tBuffer);
80+
Log.d("track read cost:"+(System.currentTimeMillis()-t));
7881
return tBuffer.array();
7982
}
8083

AiyaEffectsSDK/src/main/java/com/aiyaapp/camera/sdk/widget/AiyaCamera2.java

Lines changed: 0 additions & 175 deletions
This file was deleted.

0 commit comments

Comments
 (0)