(5.x) Merge 4.x #22408
Merged
(5.x) Merge 4.x #22408
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
…tests_number Reduce G-API tests number * reduce number of G-API tests * reduce number of G-API tests * Address more comments from Dmitry.
Extended DNN testing in GHA * Extended DNN testing in GHA for 3.4 branch * Updated docker images in Linux GitHub Actions * Added OPENCV_DOWNLOAD_PATH flag for ARM build to use pre-downloaded binaries
…_camera_stream
* Added support for 4B RGB V4L2 pixel formats Added support for V4L2_PIX_FMT_XBGR32 and V4L2_PIX_FMT_ABGR32 pixel formats. * Added workaround for missing V4L2_PIX_FMT_ABGR32 and V4L2_PIX_FMT_XBGR32 defines
Some GStreamer elements may produce buffers with very non standard strides, offsets and/or even transport each plane in different, non-contiguous pointers. This non-standard layout is communicated via GstVideoMeta structures attached to the buffers. Given this, when a GstVideoMeta is available, one should parse the layout from it instead of generating a generic one from the caps. The GstVideoFrame utility does precisely this: if the buffer contains a video meta, it uses that to fill the format and memory layout. If there is no meta available, the layout is inferred from the caps.
The Emscripten library is not guaranteed to be fully loaded during the script element's onload event. Module.onRuntimeInitialized seems to be more reliable.
* Remove transpose for rvec after calibration * Change compare threshold from 110% to 10% for perViewErrors * Add transpose to goodRotMatrs load
* add prefixes to layer names and layer output names * dnn: OPENCV_DNN_ONNX_USE_LEGACY_NAMES runtime parameter Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
make it more obvious, that this is a '404', not a 'parsing' problem
This reverts commit a630ad7.
DNN: Reduce Layer (add dynamic batch and ReduceSum support)
This fixes the following error with mingw toolchain:
opencv/modules/videoio/src/cap_obsensor/obsensor_stream_channel_msmf.hpp:160:10: error: 'condition_variable' in namespace 'std' does not name a type
160 | std::condition_variable streamStateCv_;
| ^~~~~~~~~~~~~~~~~~
G-API: Bump ADE to version 0.1.2
This fixes the following error with mingw toolchain:
opencv/modules/videoio/src/cap_msmf.cpp:1020: error: 'wstring_convert' is not a member of 'std'
1020 | std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> conv;
| ^~~~~~~~~~~~~~~
opencv/modules/videoio/src/cap_ffmpeg_hw.hpp:230:26: error: 'wstring_convert' is not a member of 'std'
230 | std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> conv;
| ^~~~~~~~~~~~~~~
The locale header is required according to C++ standard.
See https://en.cppreference.com/w/cpp/locale/wstring_convert
…indows-build * Fix G-API OneVPL compilation * Fix macro __WIN32__ -> _WIN32
This was referenced Aug 21, 2022
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 (164):
#21372 from zihaomu:dnn_quantize_per_tensor
#21608 from zihaomu:depth2space
#21702 from mlourakis:4.x
#21818 from rogday:revert_renaming
#21843 from Rufflewind:doc
#21847 from lamm45:imgproc-tform-doc
#21856 from LaurentBerger:I21853
#21865 from rogday:nary_eltwise_layers
#21871 from xiongzhen:apply-predictor-to-lzw-only
#21882 from duanqn:improve-doc
#21883 from SergeyIvanov87:gapi_vpl_linux
#21888 from asenyaev:asen/workflow_only_windows_3.4
#21896 from asenyaev:asen/worflow_windows_4.x
#21904 from asenyaev:asen/fix_fork_url
#21905 from asenyaev:asen/fix_fork_url_4.x
#21907 from fengyuentau:workflow_arm_4.x
#21909 from dbudnikov:dbudnikov/reduce_gapi_tests_number
#21910 from zihaomu:fast_conv_ARM
#21914 from asenyaev:asen/fork_opencv_extra
#21915 from asenyaev:asen/fork_opencv_extra_4_x
#21916 from chenjunnn:patch-1
#21917 from asenyaev:asen/self_hosted_runner_linux_3.4
#21919 from asmorkalov:as/cuda_buffer_pool_python
#21920 from asenyaev:asen/contrib_fork_check
#21923 from victor1234:calib3d-undistortPoints-R-P-test
#21924 from fengyuentau:workflow_arm64_3.4
#21931 from victor1234:calib3d-add-undistortImagePoints
#21933 from Yulv-git:3.4-typos1
#21935 from Yulv-git:3.4-typos3
#21937 from Kumataro:4.x-fix-21911
#21940 from hakaboom:python_wrap
#21941 from cpoerschke:4.x-fix-imgproc-typos
#21943 from vrabaud:3.4_proc
#21954 from Darkyenus:patch-1
#21963 from hellodoge:imwrite_fix
#21964 from Julian-Sz:patch-1
#21970 from asenyaev:asen/filtering_tests_3.4
#21971 from asenyaev:asen/filtering_tests_4.x
#21974 from cxcorp:fix-js-test-globals
#21975 from asenyaev:asen/fix_terminating_windows_actions
#21977 from asenyaev:asen/win_contrib
#21980 from asenyaev:asen/move_variables_to_the_host
#21984 from xiong-jie-y:add_make_capture_for_camera_stream
#21986 from alalek:gha_fix_git_merge
#21987 from alalek:gapi_test_reduce_used_memory
#21988 from alalek:fix_warnings_gcc12_3.4
#21991 from fengyuentau:qconv_asympad
#21992 from tumicdq:v4l2
#21994 from asenyaev:asen/extra_dnn_testing
#21998 from alalek:gha_fix_git_merge_fixup_21986
#22001 from asenyaev:asen/move_workflows
#22005 from lukasalexanderweber:delete_stitching_tool
#22006 from rogday:21947_fix
#22008 from zachlowry:umat-format-string
#22013 from asenyaev:asen/move_workflows_4.x
#22018 from RidgeRun:gstreamer-consider-video-meta-if-available
#22019 from victor1234:calib3d-fix-cameracalibration-test
#22021 from victor1234:issue-10947_calib3d-update-fisheye-distortpoint-doc
#22024 from berak:patch-1
#22025 from AleksandrPanov:fix_samplingForVersion_multiplyingFactor
#22026 from alalek:update_version_3.4.18-pre
#22027 from alalek:update_version_4.6.0-pre
#22028 from alalek:build_warnings_4.x
#22030 from Kumataro:3.4-fix22029
#22033 from alalek:windows_skip_failed_videoio_tests
#22034 from alalek:update_ffmpeg_4.x
#22035 from mohawk2:patch-1
#22041 from nglee:fix_return_by_const_value
#22045 from victor1234:calib3d-fisheye-model-reference
#22047 from jlopezr:trackbar-ordered-in-mac
#22054 from asenyaev:asen/fix_matching_xcode_version
#22057 from mohawk2:typos
#22059 from Kumataro:3.4-fix21899
#22061 from alalek:imgproc_color_hsv_use_singleton
#22064 from Kumataro:3.4-fix22052
#22065 from cpoerschke:3.4-apps-visualisation-configurable-codec
#22079 from asmorkalov:as/calibration_save_frames
#22080 from vrabaud:fix_arm
#22089 from tailsu:sd/fix-displaymatrix-orientation
#22091 from mukai1011:3.4
#22100 from WanliZhong:issue_22015
#22102 from jwinarske:jw/xdg_shell
#22103 from fengyuentau:macOS_workflows_for_3.4
#22104 from fengyuentau:macOS_workflows_for_4.x
#22110 from asenyaev:asen/ios_workflow_4.x
#22111 from asenyaev:asen/ios_workflow_3.4
#22122 from zihaomu:gemm_onnx_bug_fix
#22124 from vrabaud:3.4_sanitizer
#22127 from catree:update_homography_tutorial
#22135 from rogday:force_reopen
#22137 from danopdev:issues-22126
#22146 from rogday:symcircles
#22147 from rogday:zoom_factor
#22148 from zihaomu:gemm_onnx_bug_fix_branch34
#22149 from seanm:sprintf
#22153 from vrabaud:opencv_drawing
#22156 from vpisarev:update_cvround
#22158 from lamm45:intro-typos
#22160 from sturkmen72:update_highgui
#22163 from philipphutterer:vcap-frame-type
#22169 from tomoaki0705:OrinCC
#22173 from ycs77:patch-2
#22176 from danopdev:doc-update-1
#22179 from hanliutong:new-rvv
#22182 from alalek:build_fix_warnings
#22183 from zihaomu:fastConv_ARMv7_compatible
#22184 from heavyrain-lzy:fixbug_pyrUp
#22185 from fengyuentau:ci_job_rename_3.4
#22186 from fengyuentau:ci_job_rename_4.x
#22189 from p12tic:document-calchist-overload
#22199 from zihaomu:bug_fix_22195
#22202 from tomoaki0705:fixWarnings
#22208 from vrabaud:34_calibinit
#22212 from SergeyIvanov87:gapi_vpl_multiple_devices
#22217 from CSharperMantle:CSharperMantle-patch-steady-clock
#22223 from klatism:mobile-dynamically-linked-libs
#22225 from scorpiozj:patch-1
#22228 from CSharperMantle:CSharperMantle-patch-std-shuffle
#22229 from zihaomu:bug_fix_22195_3_4
#22232 from tomoaki0705:dryCmake
#22234 from vrabaud:34_calib
#22246 from asenyaev:asen/fix_warning_lnx_arm64_3.4
#22249 from fengyuentau:fix_for_22221
#22250 from ocpalo:codec_fix
#22254 from longnguyen2004:mingw-strsafe
#22255 from r2d3:python_trackbar_macos
#22257 from rogday:save_frames_fix
#22266 from asenyaev:asen/rename_lin_arm_pipelines
#22267 from asenyaev:asen/rename_lin_arm_pipelines_4.x
#22269 from asenyaev:asen/fix_python_recursion
#22270 from tomoaki0705:fix_layout
#22271 from tomoaki0705:dotprod_neon
#22278 from hanliutong:fix
#22279 from asenyaev:asen/android_3.4
#22280 from asenyaev:asen/android_4.x
#22292 from hanliutong:fix
#22293 from mshabunin:fix-buffer-area-uas
#22295 from alalek:fixup_22246
#22296 from alalek:fixup_22153
#22298 from rogday:tutorial_fix
#22300 from komakai:fix-Mat-initWithSize
#22309 from asenyaev:asen/ubuntu14.04_workflow
#22311 from zihaomu:layer_fused_optmized_mish
#22313 from mateusztabaka:getline
#22317 from asenyaev:asen/docs_3.4
#22318 from asenyaev:asen/docs_4.x
#22324 from gmbows:typo_fix
#22325 from komakai:fix-quicklook
#22327 from hzcyf:4.x
#22330 from zihaomu:skip_too_long_in_debug_test_dnn
#22339 from asenyaev:asen/obsensor_fix_for_win
#22344 from ocpalo:libjpegturbo2.1.3
#22350 from alalek:rework_psabi_warning
#22357 from jspricke:missing_header
#22366 from lukasalexanderweber:4.x
#22370 from catree:fix_22242_filter2d_float_double_doc
#22376 from zihaomu:issue_22373
#22377 from Biswa96:condition_variable
#22393 from TolyaTalamanov:at/fix-gapi-vpl-windows-build
#22395 from hzcyf:infinite_loop_fix
#22396 from dmatveev:dm/ade-012
#22403 from Biswa96:add-locale-header
e951ede fix linkage issue when enable BUILD_opencv_world (#22312)
fc3e393 videoio: add support for obsensor (Orbbec RGB-D Camera ) (#22196)
Previous "Merge 4.x": #21903