(5.x) Merge 4.x #23113
Merged
(5.x) Merge 4.x #23113
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DNN: bug fixed in Winograd
android: add android:exported="true"
android: update build scripts
Do not fail tests in Yolo v7 model was not found
libav for jetson tk1 does not provide libavutil/display.h
android: add configuration for NDK 25 and Android API 32 (12L)
4.x: Added ARM64 debug configuration to CI.
Reset cuda runtime error code to cudasuccess on runtime failure.
…URE_OPTIONS and OPENCV_FFMPEG_WRITER_OPTIONS are set
…riables Dump the values of OPENCV_FFMPEG_CAPTURE_OPTIONS and OPENCV_FFMPEG_WRITER_OPTIONS to debug log
Redesign the SIMD macro.
Update CMake rules to include Nvidia Video Codec SDK encoding libs
Preventing: gapi_async_test.cpp:448:26: error: ‘sleep_for’ is not a member of ‘std::this_thread’
DNN: let Quant and Dequant of ONNX_importer support the Constant input. * let Quant and Dequant support the Constant input. * fix negative value of axis.
no lambda whitespace fixing build Java tests
ORB constructor is failing to set the very important protected parameter fastThreshold, so binding this method is necessary.
…uco_to_main_objdetect merge with opencv/opencv_contrib#3394 move Charuco API from contrib to main repo: - add CharucoDetector: ``` CharucoDetector::detectBoard(InputArray image, InputOutputArrayOfArrays markerCorners, InputOutputArray markerIds, OutputArray charucoCorners, OutputArray charucoIds) const // detect charucoCorners and/or markerCorners CharucoDetector::detectDiamonds(InputArray image, InputOutputArrayOfArrays _markerCorners, InputOutputArrayOfArrays _markerIds, OutputArrayOfArrays _diamondCorners, OutputArray _diamondIds) const ``` - add `matchImagePoints()` for `CharucoBoard` - remove contrib aruco dependencies from interactive-calibration tool - move almost all aruco tests to objdetect ### 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 - [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake
This was referenced Jan 8, 2023
alalek
commented
Jan 8, 2023
| @@ -95,26 +97,6 @@ namespace cv { namespace cuda | |||
| { | |||
| return (total + grain - 1) / grain; | |||
| } | |||
|
|
|||
| template<class T> inline void bindTexture(const textureReference* tex, const PtrStepSz<T>& img) | |||
There was a problem hiding this comment.
@cudawarped @asmorkalov Please take a look (cleanup after #22963)
|
👍 |
6 tasks
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PRs (253):
#20367 from augustinmanecy:features2d-rw
#20379 from zihaomu:stackblur
#21738 from rogday:gather
#21745 from alalek:dnn_plugin_openvino
#21934 from Yulv-git:3.4-typos2
#21942 from pglotov:add-blob-contours
#21945 from driftee:fix-3rdparty_carotene_blur
#21966 from Harvey-Huang:Unicode_Path
#22017 from xiong-jie-y:py_onnx
#22037 from xiong-jie-y:py_gapi_add_state_kernel
#22040 from CNClareChen:4.x
#22074 from bwang30:opencv-warpAffine-ippiw
#22128 from ocpalo:multipage_img_decoder
#22130 from catree:homography_tutorial_add_exercise
#22145 from danopdev:issues-22141
#22164 from lamm45:hough-angles
#22194 from heavyrain-lzy:fixbug_pyrup
#22226 from ocpalo:libspng
#22227 from danopdev:issue-22198
#22236 from mizo:v4l2-multi-planar-v2
#22248 from cudawarped:ffmpeg_rtsp_low_fps
#22285 from asenyaev:asen/disabled_compiling_warnings_3.4
#22286 from asenyaev:asen/disabled_compiling_warnings_4.x
#22290 from fengyuentau:naive_yolov7
#22306 from zihaomu:qgemm_and_squeeze_opset13_onnximporter
#22329 from chinery:stitching-py-fixes
#22332 from komakai:android-cam-stride
#22333 from cudawarped:fix_for_21101
#22337 from zihaomu:load_ONNX_fp16_as_fp32
#22343 from komakai:android_cam_polling
#22346 from fengyuentau:mat1d_part1
#22347 from bu3w:filter-camera-streaming-by-format
#22353 from hanliutong:more-rvv-intrin
#22358 from AleksandrPanov:qrcode_x86_arm
#22362 from fengyuentau:conv_asym_pad_fuse
#22368 from AleksandrPanov:move_contrib_aruco_to_main_objdetect
#22371 from kianelbo:patch-1
#22372 from ocpalo:libjpegturbo_nasm
#22382 from AleksandrPanov:qrcode_x86_arm_34
#22404 from Kumataro:3.4-fix22388_2
#22407 from Biswa96:cmake-pkgconfig-mingw
#22410 from zihaomu:silu_support
#22411 from zihaomu:remove_whitespace
#22412 from asenyaev/asen/carotene_warnings_macos_arm64
#22425 from AleksandrPanov:qrcode_test_arm
#22429 from hanliutong:more-rvv-intrin
#22432 from dmatveev:dm/ade_012a
#22436 from Harvey-Huang:4-bit_palette_color
#22440 from zihaomu:fix_conv_bug
#22443 from catree:feat_calibrate_camera_exe_initial_guess
#22444 from catree:feat_calibrate_camera_exe_initial_guess_4.x
#22448 from Ichini24:reshape-permutations-fix
#22451 from dmatveev:dm/abstract_execs
#22454 from zihaomu:bug_fix_22450
#22456 from TolyaTalamanov:at/onevpl-fixes-linux
#22462 from Biswa96:fix-directx-check
#22463 from hanliutong:rvv
#22466 from sturkmen72:patch-4
#22474 from alalek:fix_msvs_warning_ffmpeg_test
#22475 from cabelo:yolov4_models
#22478 from WanliZhong:nary_eltwise_cuda
#22479 from scottchou007:master
#22480 from gr8jam/fix/pattern_tools:undesiarabe_behaviour_on_windows
#22482 from Glutamat42:tutorial_generalized_hough_transform
#22494 from TolyaTalamanov:at/expose-all-core-to-python
#22495 from cpoerschke:4.x-issue-22483
#22497 from ocpalo:patch-1
#22498 from alalek:update_ffmpeg_4.x
#22501 from cabelo:oak-devices-docs
#22503 from danopdev:android-video-writter
#22504 from hflemmen:fix-broken-link
#22505 from asmorkalov:as/matcher_score_thresh
#22507 from TolyaTalamanov:at/replace-mfx-major-version-assert-to-warning
#22508 from sunshinemyson:TIMVX
#22511 from alalek:dnn_build_warning_gcc12
#22512 from alalek:build_warning_gcc12_uninitialized
#22516 from ocpalo:patch-1
#22518 from TolyaTalamanov:at/expand-modeling-tool-to-support-config-in-yml
#22519 from stefan-spiss:stereo_calib_per_obj_extr_ret
#22520 from hanliutong:hsv
#22521 from asmorkalov/as:cuddn_version_non_cache
#22523 from fengyuentau:update_mirrors_220916
#22526 from paroj:pyrect
#22527 from paroj:misc
#22529 from fengyuentau:scatter_scatternd
#22531 from zihaomu:stop_rely_name
#22535 from sashashura:patch-2
#22539 from catree:feat_homography_tutorial_gif
#22542 from TolyaTalamanov:at/expand-performance-report-with-metrics
#22547 from dkurt:riscv_toolchain
#22552 from alvoron:ocv_ov_instruction
#22554 from WanliZhong:slice_axes_no_seq
#22558 from hanliutong:signmask
#22559 from smirnov-alexey:as/vpl_ocl
#22560 from fengyuentau:enable_issue_template_chooser_with_templates
#22562 from cudawarped:add_bindings_to_cuda_fastNlMeansDenoising
#22566 from asmorkalov:as/libjpeg_turbo_linkage_warning
#22568 from asmorkalov:as/webp_warning
#22570 from alalek:fix_riscv_opt_path
#22572 from catree:feat_improve_doc_calib3d
#22577 from zihaomu:Disable_winograd_branch_in_tryquantize
#22580 from seanm:Wextra-semi
#22583 from TolyaTalamanov:at/add-cfg-output-precision-for-ie-backend
#22584 from vrabaud:msan
#22585 from opencv:zm/remove-code-1
#22588 from TolyaTalamanov:at/sync-ie-request-pool
#22589 from ocpalo:imagecollection_warnings
#22593 from zihaomu:optimize_wino
#22594 from ZhaoChuyang:pr_test_for_22253
#22596 from TolyaTalamanov:at/add-num-iter
#22600 from alalek:cmake_opt_force_targets
#22601 from cpoerschke:4.x-issue-22595
#22606 from savuor:doc_fix_lmsolver
#22611 from zihaomu:greaterOrEqual
#22613 from erasta:patch-1
#22615 from cudawarped:nvcuvenc
#22617 from changh95:4.x
#22629 from asenyaev:asen/cuda_pipeline
#22633 from cudawarped:fix_3361
#22635 from hzawary:4.x
#22637 from alalek:docs_fix_links_generation_22572
#22639 from WanliZhong:issue#22625
#22643 from sturkmen72:cosmetic
#22651 from mshabunin:script-doc
#22652 from rogday:cuda_test_fixes
#22653 from WanliZhong:issue22597
#22654 from asenyaev:asen/cuda_trigger_4.x
#22656 from dkurt:halide_fixes
#22659 from AleksandrPanov:qr_reduce_extra_adaptiveThreshold
#22661 from catree:fix_AKAZE_bib_pages
#22662 from catree:fix_chessboard_img
#22666 from zihaomu:support_onnx_qdq_model
#22667 from zihaomu:bug_fix_in_winograd
#22672 from ramasilveyra:docs/remove-dup-v4
#22675 from CSBVision:patch-2
#22683 from alalek:android_activity_export
#22684 from alalek:android_update
#22687 from asmorkalov:as/yolo7_test
#22689 from asmorkalov:as/ubuntu14_tk1_ffmpeg
#22690 from alalek:android_config_ndk25
#22692 from asmorkalov:as/arm_debug_4x
#22695 from AleksandrPanov:qr_improve_version_detect
#22702 from kallaballa:ffmpeg_environment_variables
#22706 from kallaballa:libavdevice_for_ffmpeg_v4l2
#22712 from dmatveev:dm/fix_va_headers
#22717 from alalek:issue_22716
#22718 from zihaomu:improve_stackblur
#22725 from zihaomu:fix_infinit_loop_in_tf
#22726 from JopKnoppers:master
#22727 from su77ungr:patch-1
#22735 from TolyaTalamanov:at/expose-all-imgproc-to-python
#22737 from fwcd:activate-cocoa-window-on-top
#22739 from zihaomu:remove_never_used_code
#22744 from WanliZhong:fix_gitcode_mirror
#22761 from reunanen:fix-floodFill-for-very-large-images
#22771 from kallaballa:opencl_hls_and_hsv_conversions_bug
#22775 from WanliZhong:issue22713
#22790 from reunanen:add-capability-to-set-DWA-compression-level-in-OpenEXR-encoding
#22792 from tailsu:sd/avfoundation-orientation-meta
#22796 from ClayXrex:patch-1
#22801 from alalek:update_zlib
#22802 from zihaomu:fix_infinit_loop_in_tf_34
#22804 from dan-masek:fix_issue_22765
#22805 from dan-masek:fix_issue_22766
#22806 from dan-masek:fix_issue_22767
#22808 from zihaomu:nanotrack
#22809 from fengyuentau:tile
#22811 from alalek:core_check_bool
#22814 from AleksandrPanov:log_qr_version
#22816 from cudawarped/remove_windows_cuda_dll_warning
#22828 from WanliZhong:improve_matmul
#22830 from alalek:issue_22752
#22831 from mshabunin:fix-gapi-test-crash
#22838 from dan-masek:fix_issue_22837
#22839 from zchrissirhcz:fix-typo-3.4
#22840 from zihaomu:optimze_conv_memory_usage
#22842 from asmorkalov:as/pr_22737_backport
#22855 from kallaballa:print_cl_status_on_fail
#22857 from fengyuentau:batched_nms
#22865 from cpoerschke:3.4-issue-22860
#22866 from asmorkalov:as/error_formatting
#22873 from WanliZhong:issue22859
#22875 from asmorkalov:as/cl_error_code_fix
#22880 from cudawarped:remember_cudacodec_lib_locations
#22882 from zihaomu:gemm_first_const
#22885 from asmorkalov:as/new_qt_icons
#22888 from alalek:dnn_ov_fix_custom_layers
#22891 from AleksandrPanov:qr_add_alignment
#22894 from mshabunin:ffmpeg-16bit
#22898 from fengyuentau:slice_neg_steps
#22899 from mshabunin:fix-videoio-plugin
#22905 from zihaomu:clean_up_conv3d_1d
#22907 from partheee:patch-1
#22910 from alalek:cmake_pkg_config_ignore_atomic
#22914 from tozanski:tomoz/ransac-bugfix
#22919 from asmorkalov:as/gstreamer_read_timeout
#22922 from alalek:fix_riscv_intrin_rvv
#22924 from alalek:logger_strip_base_dir
#22928 from alalek:riscv_toolchains
#22930 from MaximMilashchenko:gstreamer_support
#22932 from alalek:cmake_drop_libjpeg_simd_warning
#22933 from alalek:fixup_22894
#22934 from alalek:fix_filestorage_binding
#22935 from alalek:gapi_error
#22936 from hzcyf:orbbec_new_cam_support
#22937 from asmorkalov:as/issue_22893
#22939 from stopmosk:21826-python-bindings-for-videocapturewaitany
#22940 from alalek:build_warnings_msvc
#22942 from alalek:videoio_test_update_hw_checks
#22946 from VadimLevin:dev/vlevin/avfoundation-stable-multicamera-index
#22951 from zihaomu:update_nanotrack_comment
#22954 from VadimLevin:dev/vlevin/fix-merge-artifacts-in-python-misc-tests
#22955 from VadimLevin:dev/vlevin/handle-properties-with-keyword-names
#22957 from dkurt:new_openvino_api
#22958 from asmorkalov:as/ffmpeg_missing_include
#22959 from feuerste:parallel_mertens
#22962 from stopmosk:20465-dstchannels-does-not-cover-all-color-codes-1
#22963 from cudawarped:replace_texture_ref_with_texture_obj
#22965 from vrabaud:numpy_fix
#22966 from vrabaud:mm_pause_fix
#22967 from stopmosk:usac-maxiters-bugfix
#22971 from alalek:update_version_3.4.19-pre
#22972 from alalek:update_version_4.7.0-pre
#22979 from alalek:fix_videio_test_limit_threads
#22980 from alalek:samples_python_3.11
#22981 from alalek:core_freeze_cache_dir_prefix_4.x
#22986 from AleksandrPanov:move_contrib_charuco_to_main_objdetect
#22988 from vrabaud:mm_pause_fix
#22993 from alalek:fixup_21738
#22994 from alalek:gapi_build_issues
#22995 from alalek:dnn_fix_opencl_matmul
#22999 from mshabunin:ffmpeg-valgrind-supp
#23001 from alalek:videoio_init_vars
#23002 from alalek:issue_22206
#23004 from erasta:patch-2
#23005 from alalek:objdetect_cleanup_aruco_ptr_filestorage
#23008 from mshabunin:fix-yolov4-tiny-hash
#23009 from asmorkalov:as/aruco_js_update2
#23012 from cudawarped/fix_win32_cuda_warning
#23013 from vrabaud:mertens_fix
#23014 from alalek:ffmpeg_default_threads
#23017 from asmorkalov:as/qrcode_valgrind
#23028 from zihaomu:update_doc_nanotrack
#23029 from savuor:backport3_fix_fisheye_aspect_ratio
#23035 from alalek:update_ffmpeg_4.x
#23036 from asmorkalov:as/blobdetect_range_fix
#23037 from cudawarped:fix_for_cuda_12
#23039 from alalek:cmake_3.5_fix
#23043 from AlejandroSilvestri:patch-1
#23049 from alalek:issue_23048
#23050 from zihaomu:fix_memory
a2b3acf dnn: add the CANN backend (#22634)
bb64db9 Further optimization of Conv2D, fused Conv_Add_Activation, bring latest code from ficus OpConv.fx. (#22401)
Previous "Merge 4.x": #22408
Note: #22519 is not ported