Commit Graph

39 Commits

Author SHA1 Message Date
Alexander Smorkalov
3a55f50133 Merge branch 4.x 2024-02-12 14:20:35 +03:00
Alexander Smorkalov
145981c526 Build warning fix in Tutorial4-OpenCL. 2024-01-31 12:51:28 +03:00
Alexander Smorkalov
decf6538a2 Merge branch 4.x 2024-01-23 17:06:52 +03:00
Alexander Smorkalov
c739117a7c Merge branch 4.x 2024-01-19 17:32:22 +03:00
Alexander Smorkalov
fde99e68c0 Removed Android AIDL from build scrips and tutorials as it's not needed since 4.9.0. 2024-01-10 16:27:52 +03:00
Alexander Smorkalov
e5d1309fcf Fixed typo in Android build scripts. 2023-12-28 16:42:01 +03:00
Alexander Panov
9434c89ba0
Merge pull request #24715 from AleksandrPanov:update_android_opencl_sample
Update Android OpenCL sample #24715

Update Android OpenCL sample and tutorial text.

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [x] There is a reference to the original bug report and related work
- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
2023-12-20 16:23:00 +03:00
Alexander Smorkalov
b259342737
Merge pull request #24639 from asmorkalov:as/android_ocl_rework
Refreshed OpenCL sample for Android
2023-12-05 18:51:34 +03:00
Alexander Smorkalov
d36b959dd1 Drop Adnroid.mk and Application.mk in samples as they are not used with Gradle. 2023-12-04 16:06:33 +03:00
Alexander Smorkalov
7f3b6c177f Refreshed OpenCL sample for Android. 2023-12-04 14:54:32 +03:00
alexlyulkov
6c57ce9e09
Merge pull request #24473 from alexlyulkov:al/samples_with_maven
Updated Android samples for modern Android studio. Added OpenCV from Maven support. #24473

Updated samples for recent Android studio:

- added namespace field that is required in build.gradle files
- replaced _switch_ by _if-else_ because it doesn't work with constants from resources
- added missed log library dependency in face-detection/jni/CMakeLists.txt
- use local.properties to define NDK location

Added support for OpenCV from Maven. Now you can choose 3 possible sources of OpenCV lib in settings.gradle: SDK path, local Maven repository, public Maven repository. (Creating Maven repository from SDK is added here #24456 )

There are differences in project configs for SDK and Maven versions:

- different dependencies in build.gradle
- different OpenCV library names in CMakeLists.txt
- SDK version requires OpenCV_DIR definition

Requires:
- https://github.com/opencv/ci-gha-workflow/pull/124
- https://github.com/opencv-infrastructure/opencv-gha-dockerfile/pull/26
2023-11-17 14:17:17 +03:00
Alexander Alekhin
eae5fd81e5 android: add android:exported="true" 2022-10-23 12:11:10 +00:00
Alexander Alekhin
f791cf825f Merge pull request #16486 from alalek:cmake_use_target_compile_features 2020-02-08 20:01:12 +00:00
Alexander Alekhin
01c1b341a8 cmake: enable C++11 implicitly 2020-02-03 17:45:37 +03:00
hannesa2
57c9991413
Merge pull request #16481 from hannesa2:DeleteOldAndroidManifest.xml
* delete old AndroidManifrst.xml

* fix tutorial generation
2020-02-03 16:34:03 +03:00
Hannes Achleitner
afc8dd5661 remove Eclipse relicts in Android sample 2020-01-15 07:19:58 +01:00
Hannes Achleitner
2da7360b63 Remove Android Eclipse relicts 2019-12-24 07:38:12 +01:00
Otto Seiskari
3a1ccd5f43 Remove fullscreen android:theme where it hides the menu
Many of the Android samples rely on an options menu to work properly
but, at least on newer devices, the menu is permanently hidden by the
Android theme "Theme.NoTitleBar.Fullscreen", which means that most
of the examples were dysfunctional.
2019-03-18 21:23:47 +02:00
Alexander Alekhin
2b35c1708b android: gradle-based package and samples
- drop hello-android sample
2018-12-19 14:59:48 +03:00
Alexander Alekhin
1913482cf5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-11-10 20:50:26 +00:00
tompollok
2da56d5af6 refactoring catching all exceptions as const ref 2018-11-08 19:59:47 +03:00
Alexander Alekhin
c6aa97c9aa next(android): java3 -> java4 2018-04-10 18:09:54 +03:00
Alexander Alekhin
8533b45ce9 cmake: Java/Android SDK refactoring 2018-01-13 02:12:39 +00:00
Andrey Pavlenko
24ca6aaada fix build with CMake
now it builds by the command:
`cmake.exe -Wno-dev -GNinja -DCMAKE_MAKE_PROGRAM="path\to\ninja\ninja.exe" -DCMAKE_TOOLCHAIN_FILE=../opencv3/platforms/android/android.toolchain.cmake -DANDROID_ABI="armeabi-v7a with NEON" -DANDROID_SDK_TARGET=21 -DANDROID_NATIVE_API_LEVEL=14 -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DBUILD_ANDROID_EXAMPLES=ON -DINSTALL_ANDROID_EXAMPLES=ON -DWITH_OPENCL=YES -DANDROID_OPENCL_SDK=path\to\OpenCL ../opencv`
2015-10-08 13:48:46 +03:00
Andrey Pavlenko
23fea91e84 minor fixes 2015-10-08 12:37:59 +03:00
Andrey Pavlenko
a041105491 refactoring Tutorial-4 using new OpenCV CameraGLSurfaceView 2015-10-08 01:26:54 +03:00
Andrey Pavlenko
74fcefedcb giving a chance for OpenCL 1.1 devices 2015-08-27 14:05:32 +03:00
Andrey Pavlenko
8031742817 unused imports clean-up 2015-08-27 14:05:31 +03:00
Andrey Pavlenko
43b76e548b adding NO_PROCESSING (i.e. just preview) mode 2015-08-27 14:05:31 +03:00
Andrey Pavlenko
016011fdf8 fixing start faulure on some devices; syncronization improvements 2015-08-27 14:05:31 +03:00
Alexander Alekhin
03bab0fc0d tutorial-4-opencl: enable build with OpenCV 2015-08-13 13:32:23 +03:00
Alexander Alekhin
e1ad86c1fa android samples: update way to attach native part of OpenCV
OPENCV_ANDROID_SDK - OpenCV Android SDK location (or OpenCV build dir)
Can be passed via ndk-build parameter or environment variable.
2015-08-12 18:37:29 +03:00
Andrey Pavlenko
56bde913d4 adding mode switching via menu 2015-07-31 03:39:26 +03:00
Andrey Pavlenko
9ab291ea1c adding displaying FPS 2015-07-31 01:52:10 +03:00
Andrey Pavlenko
0185cb27eb excluding libOpenCL.so from the APK 2015-07-30 23:18:45 +03:00
Andrey Pavlenko
c8f863dfc5 minor fixes 2015-07-29 00:13:35 +03:00
Andrey Pavlenko
0e4bb2b49f adding OpenCV with TAPI (UMats) 2015-07-27 04:04:56 +03:00
Andrey Pavlenko
274aba1a89 adding OpenCL processing (Image2D-to-Image2D only, others will be added later) 2015-07-27 02:57:01 +03:00
Andrey Pavlenko
2a6d4b6ee2 Camera and Camera2 preview is rendered via OpenGL textures and can be modified on CPU via C++ code. No OpenCL yet. 2015-07-27 01:07:56 +03:00