diff --git a/EOCV-Sim/src/main/java/io/github/deltacv/eocvsim/plugin/security/superaccess/SuperAccessDaemonClient.kt b/EOCV-Sim/src/main/java/io/github/deltacv/eocvsim/plugin/security/superaccess/SuperAccessDaemonClient.kt index 80d7a35..8eefdb8 100644 --- a/EOCV-Sim/src/main/java/io/github/deltacv/eocvsim/plugin/security/superaccess/SuperAccessDaemonClient.kt +++ b/EOCV-Sim/src/main/java/io/github/deltacv/eocvsim/plugin/security/superaccess/SuperAccessDaemonClient.kt @@ -155,7 +155,7 @@ class SuperAccessDaemonClient( } lock.withLock { - condition.await(3, java.util.concurrent.TimeUnit.SECONDS) + condition.await(5, java.util.concurrent.TimeUnit.SECONDS) } synchronized(cacheLock) { diff --git a/README.md b/README.md index faf8cc9..5df0bec 100644 --- a/README.md +++ b/README.md @@ -93,6 +93,14 @@ Join the [deltacv discord server](https://discord.gg/A3RMYzf6DA) ! ### Formerly, EOCV-Sim was hosted on a [personal account repo](https://github.com/serivesmejia/EOCV-Sim/). Released prior to 3.0.0 can be found there for historic purposes. +## [v3.8.2 - Synchronization bug fixes](https://github.com/deltacv/EOCV-Sim/releases/tag/v3.8.2) +- This is the 27th release for EOCV-Sim + - Internal changes: + - Opens streamer field access of StreamableOpenCvPipeline + - Bugfixes: + - Fixes incorrect buffer sharing in org.opencv.android.Utils, which caused funny flickering + - Restructures cache files into a single folder to avoid cluttering the plugins folder + ## [v3.8.1 - Shadow jar merge service files hotfix](https://github.com/deltacv/EOCV-Sim/releases/tag/v3.8.1) - This is the 26th release for EOCV-Sim - Bugfixes: diff --git a/Vision/src/main/java/org/opencv/android/Utils.java b/Vision/src/main/java/org/opencv/android/Utils.java index f85896d..7ffd26e 100644 --- a/Vision/src/main/java/org/opencv/android/Utils.java +++ b/Vision/src/main/java/org/opencv/android/Utils.java @@ -10,6 +10,7 @@ import java.nio.ByteBuffer; import java.util.HashMap; +import java.util.WeakHashMap; public class Utils { @@ -95,7 +96,7 @@ private static void nBitmapToMat2(Bitmap b, Mat mat, boolean unPremultiplyAlpha) } } - private static HashMap m2bDataMap = new HashMap<>(); + private static WeakHashMap m2bDataMap = new WeakHashMap<>(); private static void nMatToBitmap2(Mat src, Bitmap b, boolean premultiplyAlpha) { Mat tmp; diff --git a/build.gradle b/build.gradle index a8b77e8..bc4f9e4 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ plugins { allprojects { group 'com.github.deltacv' - version '3.8.1' + version '3.8.2' apply plugin: 'java'