apps/FastDeploy
1
0
Fork 0
mirror of https://github.com/PaddlePaddle/FastDeploy.git synced 2025-10-05 16:48:03 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[Android] Add PaddleSeg Android app example (#620)

Browse Source 
[Android] Add PaddleSeg Android app example
This commit is contained in:
DefTruth
2022-11-17 16:12:07 +08:00
committed by GitHub
parent cb4a4e09d8
commit 3c5e8cd95d
10 changed files with 675 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
java/android/fastdeploy/src/main/cpp/fastdeploy_jni/vision/results_jni.cc
View File

@@ -276,7 +276,7 @@ bool AllocateJavaSegmentationResultFromCxx(
const jclass j_seg_result_clazz = env->FindClass(
"com/baidu/paddle/fastdeploy/vision/SegmentationResult");
const jfieldID j_seg_label_map_id = env->GetFieldID(
j_seg_result_clazz, "mLabelMap", "[I");
j_seg_result_clazz, "mLabelMap", "[B");
const jfieldID j_seg_shape_id = env->GetFieldID(
j_seg_result_clazz, "mShape", "[J");
const jfieldID j_seg_contain_shape_map_id = env->GetFieldID(
@@ -292,10 +292,10 @@ bool AllocateJavaSegmentationResultFromCxx(
// mLabelMap int[] shape (n): [I
const auto &label_map_uint8 = c_result_ptr->label_map;
std::vector<int> label_map; // cast uint8 -> int32
label_map.assign(label_map_uint8.begin(), label_map_uint8.end());
jintArray j_seg_label_map_int_arr = env->NewIntArray(len);
env->SetIntArrayRegion(j_seg_label_map_int_arr, 0, len, label_map.data());
jbyteArray j_seg_label_map_byte_arr = env->NewByteArray(len);
env->SetByteArrayRegion(j_seg_label_map_byte_arr, 0, len,
reinterpret_cast<jbyte*>(const_cast<uint8_t*>(
label_map_uint8.data())));
// mShape long[] shape (2) (H,W): [J
const auto &shape = c_result_ptr->shape;
@@ -319,12 +319,13 @@ bool AllocateJavaSegmentationResultFromCxx(
}
// Set object fields
env->SetObjectField(j_seg_result_obj, j_seg_label_map_id, j_seg_label_map_int_arr);
env->SetObjectField(j_seg_result_obj, j_seg_label_map_id, j_seg_label_map_byte_arr);
env->SetObjectField(j_seg_result_obj, j_seg_shape_id, j_seg_shape_long_arr);
env->SetBooleanField(j_seg_result_obj, j_seg_initialized_id, JNI_TRUE);
// Release local Refs
env->DeleteLocalRef(j_seg_label_map_int_arr);
// env->DeleteLocalRef(j_seg_label_map_int_arr);
env->DeleteLocalRef(j_seg_label_map_byte_arr);
env->DeleteLocalRef(j_seg_shape_long_arr);
env->DeleteLocalRef(j_seg_result_clazz);
@@ -421,7 +422,6 @@ bool AllocateJavaFaceDetectionResultFromCxx(
return true;
}
bool AllocateJavaResultFromCxx(
JNIEnv *env, jobject j_result_obj, void *cxx_result,
vision::ResultType type) {
@@ -825,7 +825,7 @@ bool AllocateSegmentationResultFromJava(
const jclass j_seg_result_clazz_cc = env->FindClass(
"com/baidu/paddle/fastdeploy/vision/SegmentationResult");
const jfieldID j_seg_label_map_id_cc = env->GetFieldID(
j_seg_result_clazz_cc, "mLabelMap", "[I");
j_seg_result_clazz_cc, "mLabelMap", "[B");
const jfieldID j_seg_shape_id_cc = env->GetFieldID(
j_seg_result_clazz_cc, "mShape", "[J");
const jfieldID j_seg_contain_shape_map_id_cc = env->GetFieldID(
@@ -846,34 +846,25 @@ bool AllocateSegmentationResultFromJava(
return false;
}
jintArray j_seg_label_map_int_arr = reinterpret_cast<jintArray>(
jbyteArray j_seg_label_map_byte_arr = reinterpret_cast<jbyteArray>(
env->GetObjectField(j_seg_result_obj, j_seg_label_map_id_cc));
jlongArray j_seg_shape_long_arr = reinterpret_cast<jlongArray>(
env->GetObjectField(j_seg_result_obj, j_seg_shape_id_cc));
jboolean j_seg_contain_score_map =
env->GetBooleanField(j_seg_result_obj, j_seg_contain_shape_map_id_cc);
jfloatArray j_seg_score_map_float_arr = reinterpret_cast<jfloatArray>(
env->GetObjectField(j_seg_result_obj, j_seg_score_map_id_cc));
// Init cxx result
c_result_ptr->Clear();
const int label_len = env->GetArrayLength(j_seg_label_map_int_arr); // HxW
const int label_len = env->GetArrayLength(j_seg_label_map_byte_arr); // HxW
const int shape_len = env->GetArrayLength(j_seg_shape_long_arr); // 2
const int score_len = env->GetArrayLength(j_seg_score_map_float_arr); // 0 | HxW
c_result_ptr->label_map.resize(label_len);
c_result_ptr->shape.resize(shape_len);
if (j_seg_contain_score_map) {
c_result_ptr->contain_score_map = true;
c_result_ptr->score_map.resize(score_len);
}
// mLabelMap int[] shape (n): [I
std::vector<uint8_t> label_map_int8; // cast int32 -> uint8_t
jint *j_seg_label_map_int_ptr =
env->GetIntArrayElements(j_seg_label_map_int_arr, nullptr);
label_map_int8.assign(j_seg_label_map_int_ptr,j_seg_label_map_int_ptr + label_len);
std::memcpy(c_result_ptr->label_map.data(), label_map_int8.data(), label_len * sizeof(int));
env->ReleaseIntArrayElements(j_seg_label_map_int_arr, j_seg_label_map_int_ptr,0);
jbyte *j_seg_label_map_byte_ptr =
env->GetByteArrayElements(j_seg_label_map_byte_arr, nullptr);
std::memcpy(c_result_ptr->label_map.data(), j_seg_label_map_byte_ptr, label_len * sizeof(jbyte));
env->ReleaseByteArrayElements(j_seg_label_map_byte_arr, j_seg_label_map_byte_ptr,0);
// mShape long[] shape (2) (H,W): [J
jlong *j_seg_shape_long_ptr =
@@ -883,10 +874,19 @@ bool AllocateSegmentationResultFromJava(
// mScoreMap float[] shape (n): [F
if (j_seg_contain_score_map) {
jfloat *j_seg_score_map_float_ptr =
env->GetFloatArrayElements(j_seg_score_map_float_arr, nullptr);
std::memcpy(c_result_ptr->score_map.data(), j_seg_score_map_float_ptr, score_len * sizeof(float));
env->ReleaseFloatArrayElements(j_seg_score_map_float_arr, j_seg_score_map_float_ptr, 0);
jfloatArray j_seg_score_map_float_arr = reinterpret_cast<jfloatArray>(
env->GetObjectField(j_seg_result_obj, j_seg_score_map_id_cc));
if (j_seg_score_map_float_arr != NULL) {
const int score_len = env->GetArrayLength(j_seg_score_map_float_arr); // 0 | HxW
c_result_ptr->contain_score_map = true;
c_result_ptr->score_map.resize(score_len);
jfloat *j_seg_score_map_float_ptr =
env->GetFloatArrayElements(j_seg_score_map_float_arr, nullptr);
std::memcpy(c_result_ptr->score_map.data(), j_seg_score_map_float_ptr, score_len * sizeof(float));
env->ReleaseFloatArrayElements(j_seg_score_map_float_arr, j_seg_score_map_float_ptr, 0);
}
}
// Release local Refs

1
java/android/fastdeploy/src/main/cpp/fastdeploy_jni/vision/segmentation/paddleseg_model_jni.cc
View File

@@ -66,7 +66,6 @@ Java_com_baidu_paddle_fastdeploy_vision_segmentation_PaddleSegModel_predictNativ
fni::RenderingSegmentation(env, c_bgr, c_result, argb8888_bitmap,
save_image, weight, save_path);
}
return fni::NewJavaResultFromCxx(env, reinterpret_cast<void *>(&c_result),
vision::ResultType::SEGMENTATION);
}

4
java/android/fastdeploy/src/main/java/com/baidu/paddle/fastdeploy/vision/SegmentationResult.java
View File

@@ -4,7 +4,7 @@ import android.support.annotation.NonNull;
public class SegmentationResult {
// Init from native
public int[] mLabelMap;
public byte[] mLabelMap;
public float[] mScoreMap;
public long[] mShape;
public boolean mContainScoreMap = false;
@@ -18,7 +18,7 @@ public class SegmentationResult {
return mInitialized;
}
public void setLabelMap(@NonNull int[] labelMapBuffer) {
public void setLabelMap(@NonNull byte[] labelMapBuffer) {
if (labelMapBuffer.length > 0) {
mLabelMap = labelMapBuffer.clone();
}

1
java/android/fastdeploy/src/main/java/com/baidu/paddle/fastdeploy/vision/segmentation/PaddleSegModel.java
View File

@@ -81,7 +81,6 @@ public class PaddleSegModel {
public SegmentationResult predict(Bitmap ARGB8888Bitmap,
String savedImagePath,
float weight) {
// scoreThreshold is for visualizing only.
if (mCxxContext == 0) {
return new SegmentationResult();
}