mirror of
https://github.com/opencv/opencv.git
synced 2024-11-24 11:10:21 +08:00
7bdc618697
❗ Potential conflicts with #25958 C-API cleanup: highgui, videoio #26025 ❗ Merge with: opencv/opencv_contrib#3780 This PR removes usage of C-API from highgui and videoio modules. Only source code is affected, tests were not using obsolete API. It should be possible to backport these changes to 4.x branch preserving removed public headers and source files (`*_c.h` and `*_c.cpp`). #### Checklist I tried to verify as many backends as possible, though these checks were not as thorough as I'd like them to be. Below is the checklist covering all modified backends with their statuses. > 🔹 - small changes > 🟢 - consider working > ⚪ - considered untested ##### highgui Pass | Backend | Local check | CI check -----|---------|-------------|--------- 🟢 | GTK2 | build + test, plugin build | build + test ❔ 🟢 | GTK3 | build + test, plugin build | build + test 🟢 | QT | build + test, plugin build | ⚪ | Wayland 🔹 | | 🟢 | WIN32 🔹 | | build + test 🟢 | Cocoa 🔹 | | build + test ⚪ | WinRT | | ##### videoio Pass | Backend | Local check | CI check -----|---------|-------------|--------- 🟢 | Android Camera/MediaNDK 🔹 | | build 🟢 | Aravis | build | 🟢 | AVFoundation OSX | | build + test ⚪ | AVFoundation iOS | | build 🟢 | DC1394 | build | 🟢 | DShow 🔹 | | build 🟢 | FFMpeg | build, plugin build | build + test 🟢 | GPhoto 🔹 | build | 🟢 | GStreamer | build, plugin build | build + test 🟢 | Images | build | build + test 🟢 | MSMF 🔹 | | build + test 🟢 | OpenNI | build | 🟢 | PVAPI | build | 🟢 | V4L | build + test | build 🟢 | XIMEA | build | 🟢 | XINE 🔹 | build | #### Notes - local linux build checks performed using [this framework](https://github.com/mshabunin/opencv-videoio-build-check) - minor extra changes made in both `cap_avfoundation*.mm` to make them slightly more synchronized - it would be better to combine them into a single one in the future - configurations with plugins have been build but not tested - **moved unrelated changes to separate PRs** ~two issues have been fixed in separate commits:~ - ~imgproc: missing `cv::hal::` color conversion functions has been used in MediaSDK backend~ - ~videoio/V4L: wrong color conversion mode caused bad colors for NV12 camera input format (RGB instead of BGR)~ It would be nice to check following functionality manually: - [ ] OSX: camera input - [ ] iOS: camera and file input - [ ] WinRT: build, some testing - [x] Linux/Wayland: build |
||
|---|---|---|
| .. | ||
| cmake_uninstall.cmake.in | ||
| custom_hal.hpp.in | ||
| cv_cpu_config.h.in | ||
| cvconfig.h.in | ||
| dllmain.cpp.in | ||
| opencv_abi.xml.in | ||
| opencv_modules.hpp.in | ||
| opencv_run_all_tests_android.sh.in | ||
| opencv_run_all_tests_unix.sh.in | ||
| opencv_run_all_tests_windows.cmd.in | ||
| OpenCV-abi.mk.in | ||
| opencv-XXX.pc.in | ||
| OpenCV.mk.in | ||
| OpenCVConfig-ANDROID.cmake.in | ||
| OpenCVConfig-CUDA.cmake.in | ||
| OpenCVConfig-CUDALanguage.cmake.in | ||
| OpenCVConfig-IPPICV.cmake.in | ||
| OpenCVConfig-IPPIW.cmake.in | ||
| OpenCVConfig-version.cmake.in | ||
| OpenCVConfig.cmake.in | ||
| OpenCVConfig.root-ANDROID.cmake.in | ||
| OpenCVConfig.root-WIN32.cmake.in | ||
| pylint.cmake.in | ||
| setup_vars_linux.sh.in | ||
| setup_vars_macosx.sh.in | ||
| setup_vars_win32.cmd.in | ||
| vs_version.rc.in | ||
| xcode-launch-c.in | ||
| xcode-launch-cxx.in | ||