优化zbar的流程

Author: devilsen

czxing/src/main/cpp/CMakeLists.txt

@@ -34,9 +34,9 @@ set_target_properties(tegra_hal PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}
 #set_target_properties(opencv_java4 PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}/libopencv_java4.so)
 
 # 导入zbar
-add_library(iconv SHARED IMPORTED)
+#add_library(iconv SHARED IMPORTED)
 add_library(zbar_croe SHARED IMPORTED)
-set_target_properties(iconv PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}/libiconv.so)
+#set_target_properties(iconv PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}/libiconv.so)
 set_target_properties(zbar_croe PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../../libs/${ANDROID_ABI}/libzbarjni.so)
 
 find_library(
@@ -47,7 +47,7 @@ target_link_libraries(
         czxing
         ZXingCore
 
-        iconv
+#        iconv
         zbar_croe
 
         opencv_imgproc

czxing/src/main/cpp/ImageScheduler.cpp

@@ -15,6 +15,8 @@ ImageScheduler::ImageScheduler(JNIEnv *env, MultiFormatReader *_reader,
     this->env = env;
     this->reader = _reader;
     this->javaCallHelper = javaCallHelper;
+    zbarScanner = new ImageScanner();
+    zbarScanner->set_config(ZBAR_QRCODE, ZBAR_CFG_ENABLE, 1);
     qrCodeRecognizer = new QRCodeRecognizer();
     stopProcessing.store(false);
     isProcessing.store(false);
@@ -24,6 +26,7 @@ ImageScheduler::~ImageScheduler() {
     DELETE(env);
     DELETE(reader);
     DELETE(javaCallHelper);
+    DELETE(zbarScanner);
     DELETE(qrCodeRecognizer);
     frameQueue.clear();
     delete &isProcessing;
@@ -209,8 +212,8 @@ void ImageScheduler::decodeAdaptivePixels(const Mat &gray) {
     if (result.isValid()) {
         javaCallHelper->onResult(result);
     } else {
-//        decodeZBar(gray);
-        recognizerQrCode(gray);
+        decodeZBar(gray);
+//        recognizerQrCode(gray);
     }
 }
 
@@ -219,32 +222,25 @@ void ImageScheduler::decodeZBar(const Mat &gray) {
     auto height = static_cast<unsigned int>(gray.rows);
 
     const void *raw = gray.data;
-    ImageScanner zbarScanner;
-    zbarScanner.set_config(ZBAR_QRCODE, ZBAR_CFG_ENABLE, 1);
-
     Image image(width, height, "Y800", raw, width * height);
-    int n = zbarScanner.scan(image);
+    int n = zbarScanner->scan(image);
 
     // extract results
-    if (image.symbol_begin() == image.symbol_end()) {
-        image.set_data(nullptr, 0);
-        recognizerQrCode(gray);
-        return;
-    }
-
-    Image::SymbolIterator symbol = image.symbol_begin();
-    for (; symbol != image.symbol_end(); ++symbol) {
-        LOGE("zbar Code Type = %s , Data = %s", symbol->get_type_name().c_str(),
-             symbol->get_data().c_str());
+    if (n > 0) {
+        Image::SymbolIterator symbol = image.symbol_begin();
+        LOGE("zbar Code Data = %s", symbol->get_data().c_str());
 
-        if (symbol->get_type() == zbar_symbol_type_e::ZBAR_QRCODE){
+        if (symbol->get_type() == zbar_symbol_type_e::ZBAR_QRCODE) {
             Result result(DecodeStatus::NoError);
             result.setFormat(BarcodeFormat::QR_CODE);
             result.setText(ANSIToUnicode(symbol->get_data()));
             javaCallHelper->onResult(result);
+            image.set_data(nullptr, 0);
         }
+    } else {
+        image.set_data(nullptr, 0);
+        recognizerQrCode(gray);
     }
-    image.set_data(nullptr, 0);
 }
 
 void ImageScheduler::recognizerQrCode(const Mat &mat) {
@@ -274,7 +270,7 @@ void ImageScheduler::recognizerQrCode(const Mat &mat) {
 
 }
 
-Result ImageScheduler::decodePixels(const Mat& mat) {
+Result ImageScheduler::decodePixels(const Mat &mat) {
     try {
 //        int width = mat.cols;
 //        int height = mat.rows;

czxing/src/main/cpp/ImageScheduler.h

@@ -67,6 +67,7 @@ class ImageScheduler {
     std::atomic<bool> isProcessing{};
     std::atomic<bool> stopProcessing{};
     double cameraLight{};
+    ImageScanner *zbarScanner;
     QRCodeRecognizer *qrCodeRecognizer;
     SafeQueue<FrameData> frameQueue;