From 8c6b1935c27a8c008f100502847fa0f0918e90da Mon Sep 17 00:00:00 2001 From: DefTruth <31974251+DefTruth@users.noreply.github.com> Date: Mon, 14 Nov 2022 12:50:15 +0800 Subject: [PATCH] [Android] fixed OcrMainActivity setting errors (#578) * [FlyCV] Add global SetProcLibCpuNumThreads method * [Android] Support segmentation and facedet in Android * [Android] add JNI instance check to j_runtime_option_obj * [Model] fixed ppseg flycv resize error * [FlyCV] fix FlyCV resize flags * [cmake] remove un-need lite compile option * [Android] add PaddleSegModel JNI and fix some bugs * [Android] bind PaddleSegModel via JNI * [Android] bind VisSegmentation via JNI * [Android] bind YOLOv5Face and SCRFD via JNI * [Android] fix NewJavaFaceDetectionResultFromCxx error * [Android] remove un-need option in Java RuntimeOption * [Android] fixed OcrMainActivity setting errors --- .../detection/DetectionMainActivity.java | 10 +++++++--- .../app/examples/ocr/OcrMainActivity.java | 18 +++++++++--------- .../main/res/layout/detection_camera_page.xml | 2 +- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/detection/DetectionMainActivity.java b/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/detection/DetectionMainActivity.java index c8d7cb09a..bc588f376 100644 --- a/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/detection/DetectionMainActivity.java +++ b/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/detection/DetectionMainActivity.java @@ -19,6 +19,7 @@ import android.provider.MediaStore; import android.support.annotation.NonNull; import android.support.v4.app.ActivityCompat; import android.support.v4.content.ContextCompat; +import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.view.Window; @@ -207,12 +208,15 @@ public class DetectionMainActivity extends Activity implements View.OnClickListe @Override public boolean onTextureChanged(Bitmap ARGB8888ImageBitmap) { + Log.d(TAG, "onTextureChanged: bitmap height: " + + ARGB8888ImageBitmap.getHeight() + " width: " + + ARGB8888ImageBitmap.getWidth()); String savedImagePath = ""; synchronized (this) { - savedImagePath = Utils.getDCIMDirectory() + File.separator + "result.png"; + savedImagePath = Utils.getDCIMDirectory() + File.separator + "result.jpg"; } - shutterBitmap = ARGB8888ImageBitmap.copy(Bitmap.Config.ARGB_8888,true); - originShutterBitmap = ARGB8888ImageBitmap.copy(Bitmap.Config.ARGB_8888,true); + shutterBitmap = ARGB8888ImageBitmap.copy(Bitmap.Config.ARGB_8888, true); + originShutterBitmap = ARGB8888ImageBitmap.copy(Bitmap.Config.ARGB_8888, true); boolean modified = false; DetectionResult result = predictor.predict( ARGB8888ImageBitmap, savedImagePath, DetectionSettingsActivity.scoreThreshold); diff --git a/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/ocr/OcrMainActivity.java b/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/ocr/OcrMainActivity.java index 4a230372f..55f729482 100644 --- a/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/ocr/OcrMainActivity.java +++ b/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/ocr/OcrMainActivity.java @@ -205,8 +205,8 @@ public class OcrMainActivity extends Activity implements View.OnClickListener, C } public void checkAndUpdateSettings() { - if (SettingsActivity.checkAndUpdateSettings(this)) { - String realModelDir = getCacheDir() + "/" + SettingsActivity.modelDir; + if (OcrSettingsActivity.checkAndUpdateSettings(this)) { + String realModelDir = getCacheDir() + "/" + OcrSettingsActivity.modelDir; String detModelName = "ch_PP-OCRv2_det_infer"; // String detModelName = "ch_ppocr_mobile_v2.0_det_infer"; String clsModelName = "ch_ppocr_mobile_v2.0_cls_infer"; @@ -234,13 +234,13 @@ public class OcrMainActivity extends Activity implements View.OnClickListener, C RuntimeOption detOption = new RuntimeOption(); RuntimeOption clsOption = new RuntimeOption(); RuntimeOption recOption = new RuntimeOption(); - detOption.setCpuThreadNum(SettingsActivity.cpuThreadNum); - clsOption.setCpuThreadNum(SettingsActivity.cpuThreadNum); - recOption.setCpuThreadNum(SettingsActivity.cpuThreadNum); - detOption.setLitePowerMode(SettingsActivity.cpuPowerMode); - clsOption.setLitePowerMode(SettingsActivity.cpuPowerMode); - recOption.setLitePowerMode(SettingsActivity.cpuPowerMode); - if (Boolean.parseBoolean(SettingsActivity.enableLiteFp16)) { + detOption.setCpuThreadNum(OcrSettingsActivity.cpuThreadNum); + clsOption.setCpuThreadNum(OcrSettingsActivity.cpuThreadNum); + recOption.setCpuThreadNum(OcrSettingsActivity.cpuThreadNum); + detOption.setLitePowerMode(OcrSettingsActivity.cpuPowerMode); + clsOption.setLitePowerMode(OcrSettingsActivity.cpuPowerMode); + recOption.setLitePowerMode(OcrSettingsActivity.cpuPowerMode); + if (Boolean.parseBoolean(OcrSettingsActivity.enableLiteFp16)) { detOption.enableLiteFp16(); clsOption.enableLiteFp16(); recOption.enableLiteFp16(); diff --git a/java/android/app/src/main/res/layout/detection_camera_page.xml b/java/android/app/src/main/res/layout/detection_camera_page.xml index af65ebc42..c4f79d2c9 100644 --- a/java/android/app/src/main/res/layout/detection_camera_page.xml +++ b/java/android/app/src/main/res/layout/detection_camera_page.xml @@ -15,7 +15,7 @@ + android:layout_height="wrap_content"/>