Skip to content

Commit

Permalink
fix type errors in jni
Browse files Browse the repository at this point in the history
  • Loading branch information
@cijiugechu
cijiugechu committed Apr 15, 2024
1 parent 587cc02 commit f70fa25
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 36 deletions.
4 changes: 2 additions & 2 deletions src/android/java/gpupixel/src/main/java/com/pixpark/gpupixel/GPUPixel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ public static void copyAssetsToFiles(Context context, String oldPath, String ne

// Source
public static native long nativeSourceAddTarget(final long classID, final long targetClassID, final int texID, final boolean isFilter);
public static native boolean nativeSourceRemoveTarget(final long classID, final long targetClassID, final boolean isFilter);
public static native boolean nativeSourceRemoveAllTargets(final long classID);
public static native void nativeSourceRemoveTarget(final long classID, final long targetClassID, final boolean isFilter);
public static native void nativeSourceRemoveAllTargets(final long classID);
public static native boolean nativeSourceProceed(final long classID, final boolean bUpdateTargets);
public static native int nativeSourceGetRotatedFramebuferWidth(final long classID);
public static native int nativeSourceGetRotatedFramebuferHeight(final long classID);
Expand Down
68 changes: 34 additions & 34 deletions src/android/jni/jni_gpupixel.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,25 @@ std::list<std::shared_ptr<Filter>> filter_list_;

extern "C" jlong Java_com_pixpark_gpupixel_GPUPixel_nativeSourceImageNew(
JNIEnv* env,
jobject) {
jclass) {
return (uintptr_t)(new SourceImage());
};

extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeSourceImageDestroy(
JNIEnv* env,
jobject,
jclass,
jlong classId){};

extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeSourceImageFinalize(
JNIEnv* env,
jobject,
jclass,
jlong classId) {
((SourceImage*)classId)->releaseFramebuffer(false);
};

extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeSourceImageSetImage(
JNIEnv* env,
jobject,
jclass,
jlong classId,
jobject bitmap) {
char* pData = 0;
Expand All @@ -57,27 +57,27 @@ extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeSourceImageSetImage(

extern "C" jlong Java_com_pixpark_gpupixel_GPUPixel_nativeSourceCameraNew(
JNIEnv* env,
jobject) {
jclass) {
return (uintptr_t)(new SourceCamera());
};

extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeSourceCameraDestroy(
JNIEnv* env,
jobject,
jclass,
jlong classId){

};

extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeSourceCameraFinalize(
JNIEnv* env,
jobject,
jclass,
jlong classId) {
((SourceCamera*)classId)->releaseFramebuffer(false);
};

extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeSourceCameraSetFrame(
JNIEnv* env,
jobject,
jclass,
jlong classId,
jint width,
jint height,
Expand All @@ -91,14 +91,14 @@ extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeSourceCameraSetFrame(

extern "C" jlong Java_com_pixpark_gpupixel_GPUPixel_nativeSourceRawInputNew(
JNIEnv* env,
jobject) {
jclass) {
return 0;
};

extern "C" void
Java_com_pixpark_gpupixel_GPUPixel_nativeSourceRawInputUploadBytes(
JNIEnv* env,
jobject,
jclass,
jlong classId,
jintArray jPixel,
jint width,
Expand All @@ -112,15 +112,15 @@ Java_com_pixpark_gpupixel_GPUPixel_nativeSourceRawInputUploadBytes(
extern "C" void
Java_com_pixpark_gpupixel_GPUPixel_nativeSourceRawInputSetRotation(
JNIEnv* env,
jobject,
jclass,
jlong classId,
jint rotation) {
((SourceRawDataInput*)classId)->setRotation((RotationMode)rotation);
};

extern "C" jlong Java_com_pixpark_gpupixel_GPUPixel_nativeSourceAddTarget(
JNIEnv* env,
jobject,
jclass,
jlong classId,
jlong targetClassId,
jint texID,
Expand All @@ -138,7 +138,7 @@ extern "C" jlong Java_com_pixpark_gpupixel_GPUPixel_nativeSourceAddTarget(

extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeSourceRemoveTarget(
JNIEnv* env,
jobject,
jclass,
jlong classId,
jlong targetClassId,
jboolean isFilter) {
Expand All @@ -150,14 +150,14 @@ extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeSourceRemoveTarget(

extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeSourceRemoveAllTargets(
JNIEnv* env,
jobject,
jclass,
jlong classId) {
((Source*)classId)->removeAllTargets();
};

extern "C" jlong Java_com_pixpark_gpupixel_GPUPixel_nativeSourceProceed(
extern "C" jboolean Java_com_pixpark_gpupixel_GPUPixel_nativeSourceProceed(
JNIEnv* env,
jobject,
jclass,
jlong classId,
jboolean bUpdateTargets) {
return ((Source*)classId)->proceed(bUpdateTargets, Util::nowTimeMs());
Expand All @@ -166,23 +166,23 @@ extern "C" jlong Java_com_pixpark_gpupixel_GPUPixel_nativeSourceProceed(
extern "C" jint
Java_com_pixpark_gpupixel_GPUPixel_nativeSourceGetRotatedFramebuferWidth(
JNIEnv* env,
jobject,
jclass,
jlong classId) {
return ((Source*)classId)->getRotatedFramebufferWidth();
};

extern "C" jint
Java_com_pixpark_gpupixel_GPUPixel_nativeSourceGetRotatedFramebuferHeight(
JNIEnv* env,
jobject,
jclass,
jlong classId) {
return ((Source*)classId)->getRotatedFramebufferHeight();
};

extern "C" jbyteArray
Java_com_pixpark_gpupixel_GPUPixel_nativeSourceCaptureAProcessedFrameData(
JNIEnv* env,
jobject,
jclass,
jlong classId,
jlong upToFilterClassId,
jint width,
Expand All @@ -207,20 +207,20 @@ Java_com_pixpark_gpupixel_GPUPixel_nativeSourceCaptureAProcessedFrameData(

extern "C" jlong Java_com_pixpark_gpupixel_GPUPixel_nativeTargetViewNew(
JNIEnv* env,
jobject obj) {
jclass obj) {
return (uintptr_t)(new TargetView());
};

extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeTargetViewFinalize(
JNIEnv* env,
jobject,
jclass,
jlong classId){

};

extern "C" void
Java_com_pixpark_gpupixel_GPUPixel_nativeTargetViewOnSizeChanged(JNIEnv* env,
jobject,
jclass obj,
jlong classId,
jint width,
jint height) {
Expand All @@ -229,7 +229,7 @@ Java_com_pixpark_gpupixel_GPUPixel_nativeTargetViewOnSizeChanged(JNIEnv* env,

extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeTargetViewSetFillMode(
JNIEnv* env,
jobject,
jclass,
jlong classId,
jint fillMode) {
((TargetView*)classId)->setFillMode((TargetView::FillMode)fillMode);
Expand All @@ -245,7 +245,7 @@ Java_com_pixpark_gpupixel_GPUPixel_nativeTargetViewSetMirror(JNIEnv *env, jclass

extern "C" jlong Java_com_pixpark_gpupixel_GPUPixel_nativeFilterCreate(
JNIEnv* env,
jobject obj,
jclass obj,
jstring jFilterClassName) {
const char* filterClassName = env->GetStringUTFChars(jFilterClassName, 0);

Expand All @@ -258,7 +258,7 @@ extern "C" jlong Java_com_pixpark_gpupixel_GPUPixel_nativeFilterCreate(

extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeFilterDestroy(
JNIEnv* env,
jobject obj,
jclass obj,
jlong classId){
for(auto ft : filter_list_) {
if(classId == (jlong)ft.get()){
Expand All @@ -269,14 +269,14 @@ extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeFilterDestroy(

extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeFilterFinalize(
JNIEnv* env,
jobject obj,
jclass obj,
jlong classId) {
((Filter*)classId)->releaseFramebuffer(false);
};

extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeFilterSetPropertyFloat(
JNIEnv* env,
jobject obj,
jclass obj,
jlong classId,
jstring jProperty,
jfloat value) {
Expand All @@ -287,7 +287,7 @@ extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeFilterSetPropertyFloat(

extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeFilterSetPropertyInt(
JNIEnv* env,
jobject obj,
jclass obj,
jlong classId,
jstring jProperty,
jint value) {
Expand All @@ -299,7 +299,7 @@ extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeFilterSetPropertyInt(
extern "C" void
Java_com_pixpark_gpupixel_GPUPixel_nativeFilterSetPropertyString(
JNIEnv* env,
jobject obj,
jclass obj,
jlong classId,
jstring jProperty,
jstring jValue) {
Expand All @@ -312,25 +312,25 @@ Java_com_pixpark_gpupixel_GPUPixel_nativeFilterSetPropertyString(

extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeContextInit(
JNIEnv* env,
jobject obj){
jclass obj){

};

extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeContextDestroy(
JNIEnv* env,
jobject obj) {
jclass obj) {
GPUPixelContext::destroy();
};

extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeContextPurge(
JNIEnv* env,
jobject obj) {
jclass obj) {
GPUPixelContext::getInstance()->purge();
};

extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeYUVtoRBGA(
JNIEnv* env,
jobject obj,
jclass obj,
jbyteArray yuv420sp,
jint width,
jint height,
Expand Down Expand Up @@ -364,7 +364,7 @@ extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeYUVtoRBGA(

extern "C" void Java_com_pixpark_gpupixel_GPUPixel_nativeSetLandmarkCallback (
JNIEnv* env,
jobject obj,
jclass obj,
jobject source,
jlong classId) {

Expand Down

0 comments on commit f70fa25

Please sign in to comment.