diff --git a/3rdparty/ippicv/ippicv.cmake b/3rdparty/ippicv/ippicv.cmake index 7bfcf66993..48901a1547 100644 --- a/3rdparty/ippicv/ippicv.cmake +++ b/3rdparty/ippicv/ippicv.cmake @@ -17,9 +17,15 @@ function(download_ippicv root_var) set(OPENCV_ICV_NAME "ippicv_2022.0.0_lnx_intel64_20240904_general.tgz") set(OPENCV_ICV_HASH "63717ee0f918ad72fb5a737992a206d1") else() - set(IPPICV_COMMIT "7f55c0c26be418d494615afca15218566775c725") - set(OPENCV_ICV_NAME "ippicv_2021.12.0_lnx_ia32_20240425_general.tgz") - set(OPENCV_ICV_HASH "85ffa2b9ed7802b93c23fa27b0097d36") + if(ANDROID) + set(IPPICV_COMMIT "c7c6d527dde5fee7cb914ee9e4e20f7436aab3a1") + set(OPENCV_ICV_NAME "ippicv_2021.10.1_lnx_ia32_20231206_general.tgz") + set(OPENCV_ICV_HASH "d9510f3ce08f6074aac472a5c19a3b53") + else() + set(IPPICV_COMMIT "7f55c0c26be418d494615afca15218566775c725") + set(OPENCV_ICV_NAME "ippicv_2021.12.0_lnx_ia32_20240425_general.tgz") + set(OPENCV_ICV_HASH "85ffa2b9ed7802b93c23fa27b0097d36") + endif() endif() elseif(WIN32 AND NOT ARM) set(OPENCV_ICV_PLATFORM "windows") diff --git a/platforms/android/build_sdk.py b/platforms/android/build_sdk.py index 687038125e..9de579e5fc 100755 --- a/platforms/android/build_sdk.py +++ b/platforms/android/build_sdk.py @@ -138,7 +138,7 @@ class ABI: def __str__(self): return "%s (%s)" % (self.name, self.toolchain) def haveIPP(self): - return self.name == "x86_64" + return self.name == "x86" or self.name == "x86_64" def haveKleidiCV(self): return self.name == "arm64-v8a" diff --git a/platforms/android/default.config.py b/platforms/android/default.config.py index 2d0b45d15e..9c7b9ad0ef 100644 --- a/platforms/android/default.config.py +++ b/platforms/android/default.config.py @@ -2,5 +2,5 @@ ABIs = [ ABI("2", "armeabi-v7a", None, 21, cmake_vars=dict(ANDROID_ABI='armeabi-v7a with NEON')), ABI("3", "arm64-v8a", None, 21, cmake_vars=dict(ANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES='ON')), ABI("5", "x86_64", None, 21, cmake_vars=dict(ANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES='ON')), - ABI("4", "x86", None, 21, cmake_vars=dict(WITH_IPP='OFF')), + ABI("4", "x86", None, 21), ] diff --git a/platforms/android/fastcv.config.py b/platforms/android/fastcv.config.py index c96b534e68..e1a86a5ad8 100644 --- a/platforms/android/fastcv.config.py +++ b/platforms/android/fastcv.config.py @@ -2,5 +2,5 @@ ABIs = [ ABI("2", "armeabi-v7a", None, 21, cmake_vars=dict(ANDROID_ABI='armeabi-v7a with NEON', WITH_FASTCV='ON')), ABI("3", "arm64-v8a", None, 21, cmake_vars=dict(ANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES='ON', WITH_FASTCV='ON')), ABI("5", "x86_64", None, 21, cmake_vars=dict(ANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES='ON')), - ABI("4", "x86", None, 21, cmake_vars=dict(WITH_IPP='OFF')), + ABI("4", "x86", None, 21), ]