DevYK 3 лет назад
Родитель
Сommit
189ae79eb7

BIN
cmake-build-debug/CMakeFiles/ImageBlurDetection_debug.dir/main.cpp.o


BIN
cmake-build-debug/CMakeFiles/ImageBlurDetection_debug.dir/opencv/image_blur_detection.cpp.o


+ 0 - 20
cmake-build-debug/CMakeFiles/piaoquan_java_opencv.dir/CXX.includecache

@@ -6,26 +6,6 @@
 
 #IncludeRegexTransform: 
 
-/Library/Java/JavaVirtualMachines/jdk1.8.0_181.jdk/Contents/Home/include/darwin/jni_md.h
-
-/Library/Java/JavaVirtualMachines/jdk1.8.0_181.jdk/Contents/Home/include/jni.h
-stdio.h
--
-stdarg.h
--
-jni_md.h
-/Library/Java/JavaVirtualMachines/jdk1.8.0_181.jdk/Contents/Home/include/jni_md.h
-
-/Users/devyk/Data/Project/sample/github_code/OpenCVSample/jni/ImageBlurDetection.cpp
-ImageBlurDetection.h
-/Users/devyk/Data/Project/sample/github_code/OpenCVSample/jni/ImageBlurDetection.h
-
-/Users/devyk/Data/Project/sample/github_code/OpenCVSample/jni/ImageBlurDetection.h
-jni.h
-/Users/devyk/Data/Project/sample/github_code/OpenCVSample/jni/jni.h
-../opencv/image_blur_detection.h
-/Users/devyk/Data/Project/sample/github_code/OpenCVSample/opencv/image_blur_detection.h
-
 /Users/devyk/Data/Project/sample/github_code/OpenCVSample/opencv/image_blur_detection.cpp
 image_blur_detection.h
 /Users/devyk/Data/Project/sample/github_code/OpenCVSample/opencv/image_blur_detection.h

BIN
cmake-build-debug/CMakeFiles/piaoquan_java_opencv.dir/opencv/image_blur_detection.cpp.o


+ 2 - 2
cmake-build-debug/Testing/Temporary/LastTest.log

@@ -1,3 +1,3 @@
-Start testing: Feb 23 23:29 CST
+Start testing: Feb 23 23:36 CST
 ----------------------------------------------------------
-End testing: Feb 23 23:29 CST
+End testing: Feb 23 23:36 CST

BIN
java/out/production/java/com/bytesflow/opencv/media/test/OpenCVImageBlurTest.class


+ 1 - 1
java/src/com.bytesflow.opencv.media/test/OpenCVImageBlurTest.java

@@ -50,7 +50,7 @@ public class OpenCVImageBlurTest {
 
     private static void blurTest() {
         try {
-            String path = "/Users/devyk/Downloads/元宵节.jpg";
+            String path = "/Users/devyk/Downloads/black.png";
             int ret;
             ret = PQCVMediaProcessor.blurDetectionFromImagePath(path);
             System.out.println("PQCVMediaProcessor path = " + ret);

+ 3 - 3
main.cpp

@@ -4,8 +4,8 @@
 
 
 static void *detection_thread(void *arg) {
-//    const char *filename = "/Users/devyk/Downloads/IMG_3067.PNG";
-    const char *filename = "/Users/devyk/Downloads/black.png";
+    const char *filename = "/Users/devyk/Downloads/IMG_3067.PNG";
+//    const char *filename = "/Users/devyk/Downloads/black.png";
     FILE *fp = fopen(filename, "rb");
     if (!fp) return reinterpret_cast<void *>(-1);
     fseek(fp, 0L, SEEK_END);
@@ -14,7 +14,7 @@ static void *detection_thread(void *arg) {
     rewind(fp);
     uint8_t *data = (uint8_t *) malloc(sizeof(uint8_t) * size);
     size_t size2 = fread(data, size, 1, fp);
-//    printf("图片模糊度检测 %d \n", image_blur_detection("/Users/devyk/Downloads/IMG_3067.PNG"));
+    printf("图片模糊度检测 %d \n", image_blur_detection("/Users/devyk/Downloads/IMG_3067.PNG"));
     printf("图片模糊度检测 %d \n", bytes_blur_detection(data,size));
     free(data);
 //    printf("图片模糊度检测 %d \n", image_blur_detection("/Users/devyk/Downloads/black.png"));

+ 3 - 4
opencv/image_blur_detection.cpp

@@ -36,7 +36,7 @@ int doDetection(cv::Mat cvImage) {
             cv::Scalar mu, sigma;
             cv::meanStdDev(laplacianImage, mu, sigma);
             int blur_value = sigma.val[0] * sigma.val[0];
-            blur_value = blur_value < 100 ? image_color_ratio(grayCVImage) : blur_value;
+            blur_value = blur_value < DEFAULT_BLUR_THRESHOLD ? image_color_ratio(grayCVImage) : blur_value;
             cvImage.release();
             grayCVImage.release();
             return blur_value;
@@ -51,7 +51,7 @@ static bool cmp_value(const std::pair<long, long> left, const std::pair<long, lo
 }
 
 int image_color_ratio(cv::Mat image) {
-    int num = 0;//记录颜色的像素点
+    int num = 0;
     std::map<long, long> colors;
     for (int i = 0; i < image.rows; ++i) {
         for (int j = 0; j < image.cols; ++j) {
@@ -76,8 +76,7 @@ int image_color_ratio(cv::Mat image) {
                 break;
             }
         }
-
-        float i = maxCount * 1.0f / (image.rows * image.cols);
+        float i = (float )maxCount / (float )(image.rows * image.cols);
         if (i >= DEFAULT_PIX_THRESHOLD) {
             num = DEFAULT_BLUR_THRESHOLD + 1;
         };

BIN
output/bin/ImageBlurDetection_debug


BIN
output/lib/libpiaoquan_java_opencv.dylib