-
-
Notifications
You must be signed in to change notification settings - Fork 56.2k
(5.x) Merge 4.x #21371
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
(5.x) Merge 4.x #21371
Conversation
This file contains hidden or 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
In case of very small negative h (e.g. -1e-40), with the current implementation, you will go through the first condition and end up with h = 6.f, and will miss the second condition.
* Update drawing.cpp optimize FillEdgeCollection function * Update drawing.cpp optimize FillEdgeCollection,remove sort_flag
G-API: oneVPL Implement asynchronous MFP demux data provider * Add dummy dmux * Initial commit for draft versionn * Demux for low res file works * Add media source resolver to work over incorrect MIME * Add MFP Demux logger * stash changes * Extend IDataProvider with CodecId, Add troubleshooting info * Add IDapaProvider dispatcher * Add ComPtrGuard wrappers * Add new unit test scope for MFP demux & Add minor changes * Enhance UTs * Remove ATL header * Remove ATL another one * Fix build * Add static for some methods * Initial commit * Add async demuxing * Apply tdd idea * Intro IDataProvider changes: +fetch_bitstream, -fetch_data * Fix UTs * Remove IDataProvider::CodecId & Fix EOF hang * Remove sync demux * Remove mfp async dependencies * Remove VPL dependencies from IDataProvider declaration * Apply comments * Fix compilation * Suppress unused warning * Apply some comments * Apply some comments * Apply comments
* Update how_to_use_OpenCV_parallel_for_new.markdown Fix an incorrect jump link in the tutorial how_to_use_OpenCV_parallel_for_new. * Update how_to_use_OpenCV_parallel_for_new.markdown Update the URL of the tutorial code.
since u and v Pixel ptr have been swapped the compare condition should be updated too
[GSoC] OpenCV.js: Accelerate OpenCV.js DNN via WebNN * Add WebNN backend for OpenCV DNN Module Update dnn.cpp Update dnn.cpp Update dnn.cpp Update dnn.cpp Add WebNN head files into OpenCV 3rd partiy files Create webnn.hpp update cmake Complete README and add OpenCVDetectWebNN.cmake file add webnn.cpp Modify webnn.cpp Can successfully compile the codes for creating a MLContext Update webnn.cpp Update README.md Update README.md Update README.md Update README.md Update cmake files and update README.md Update OpenCVDetectWebNN.cmake and README.md Update OpenCVDetectWebNN.cmake Fix OpenCVDetectWebNN.cmake and update README.md Add source webnn_cpp.cpp and libary libwebnn_proc.so Update dnn.cpp Update dnn.cpp Update dnn.cpp Update dnn.cpp update dnn.cpp update op_webnn update op_webnn Update op_webnn.hpp update op_webnn.cpp & hpp Update op_webnn.hpp Update op_webnn update the skeleton Update op_webnn.cpp Update op_webnn Update op_webnn.cpp Update op_webnn.cpp Update op_webnn.hpp update op_webnn update op_webnn Solved the problems of released variables. Fixed the bugs in op_webnn.cpp Implement op_webnn Implement Relu by WebNN API Update dnn.cpp for better test Update elementwise_layers.cpp Implement ReLU6 Update elementwise_layers.cpp Implement SoftMax using WebNN API Implement Reshape by WebNN API Implement PermuteLayer by WebNN API Implement PoolingLayer using WebNN API Update pooling_layer.cpp Update pooling_layer.cpp Update pooling_layer.cpp Update pooling_layer.cpp Update pooling_layer.cpp Update pooling_layer.cpp Implement poolingLayer by WebNN API and add more detailed logs Update dnn.cpp Update dnn.cpp Remove redundant codes and add more logs for poolingLayer Add more logs in the pooling layer implementation Fix the indent issue and resolve the compiling issue Fix the build problems Fix the build issue FIx the build issue Update dnn.cpp Update dnn.cpp * Fix the build issue * Implement BatchNorm Layer by WebNN API * Update convolution_layer.cpp This is a temporary file for Conv2d layer implementation * Integrate some general functions into op_webnn.cpp&hpp * Update const_layer.cpp * Update convolution_layer.cpp Still have some bugs that should be fixed. * Update conv2d layer and fc layer still have some problems to be fixed. * update constLayer, conv layer, fc layer There are still some bugs to be fixed. * Fix the build issue * Update concat_layer.cpp Still have some bugs to be fixed. * Update conv2d layer, fully connected layer and const layer * Update convolution_layer.cpp * Add OpenCV.js DNN module WebNN Backend (both using webnn-polyfill and electron) * Delete bib19450.aux * Add WebNN backend for OpenCV DNN Module Update dnn.cpp Update dnn.cpp Update dnn.cpp Update dnn.cpp Add WebNN head files into OpenCV 3rd partiy files Create webnn.hpp update cmake Complete README and add OpenCVDetectWebNN.cmake file add webnn.cpp Modify webnn.cpp Can successfully compile the codes for creating a MLContext Update webnn.cpp Update README.md Update README.md Update README.md Update README.md Update cmake files and update README.md Update OpenCVDetectWebNN.cmake and README.md Update OpenCVDetectWebNN.cmake Fix OpenCVDetectWebNN.cmake and update README.md Add source webnn_cpp.cpp and libary libwebnn_proc.so Update dnn.cpp Update dnn.cpp Update dnn.cpp Update dnn.cpp update dnn.cpp update op_webnn update op_webnn Update op_webnn.hpp update op_webnn.cpp & hpp Update op_webnn.hpp Update op_webnn update the skeleton Update op_webnn.cpp Update op_webnn Update op_webnn.cpp Update op_webnn.cpp Update op_webnn.hpp update op_webnn update op_webnn Solved the problems of released variables. Fixed the bugs in op_webnn.cpp Implement op_webnn Implement Relu by WebNN API Update dnn.cpp for better test Update elementwise_layers.cpp Implement ReLU6 Update elementwise_layers.cpp Implement SoftMax using WebNN API Implement Reshape by WebNN API Implement PermuteLayer by WebNN API Implement PoolingLayer using WebNN API Update pooling_layer.cpp Update pooling_layer.cpp Update pooling_layer.cpp Update pooling_layer.cpp Update pooling_layer.cpp Update pooling_layer.cpp Implement poolingLayer by WebNN API and add more detailed logs Update dnn.cpp Update dnn.cpp Remove redundant codes and add more logs for poolingLayer Add more logs in the pooling layer implementation Fix the indent issue and resolve the compiling issue Fix the build problems Fix the build issue FIx the build issue Update dnn.cpp Update dnn.cpp * Fix the build issue * Implement BatchNorm Layer by WebNN API * Update convolution_layer.cpp This is a temporary file for Conv2d layer implementation * Integrate some general functions into op_webnn.cpp&hpp * Update const_layer.cpp * Update convolution_layer.cpp Still have some bugs that should be fixed. * Update conv2d layer and fc layer still have some problems to be fixed. * update constLayer, conv layer, fc layer There are still some bugs to be fixed. * Update conv2d layer, fully connected layer and const layer * Update convolution_layer.cpp * Add OpenCV.js DNN module WebNN Backend (both using webnn-polyfill and electron) * Update dnn.cpp * Fix Error in dnn.cpp * Resolve duplication in conditions in convolution_layer.cpp * Fixed the issues in the comments * Fix building issue * Update tutorial * Fixed comments * Address the comments * Update CMakeLists.txt * Offer more accurate perf test on native * Add better perf tests for both native and web * Modify per tests for better results * Use more latest version of Electron * Support latest WebNN Clamp op * Add definition of HAVE_WEBNN macro * Support group convolution * Implement Scale_layer using WebNN * Add Softmax option for native classification example * Fix comments * Fix comments
…_enchancement Add capacity to Videocapture to return the extraData from FFmpeg when required * Update rawMode to append any extra data recieved during the initial negotiation of an RTSP stream or during the parsing of an MPEG4 file header. For h264[5] RTSP streams this ensures the parameter sets if available are always returned on the first call to grab()/read() and has two purposes: 1) To ensure the parameter sets are available even if they are not transmitted in band. This is common for axis ip camera's. 2) To allow callers of VideoCapture::grab()[read()] to write to split the raw stream over multiple files by appending the parameter sets to the begining of any new files. For (1) there is no alternative, for (2) if the parameter sets were provided in band it would be possible to parse the raw bit stream and search for the parameter sets however that would be a lot of work when that information is already provided by FFMPEG. For MPEG4 files this information is only suplied in the header and is required for decoding. Two properties are also required to enable the raw encoded bitstream to be written to multiple files, these are; 1) an indicator as to whether the last frame was a key frame or not - each new file needs to start at a key frame to avoid storing unusable frame diffs, 2) the length in bytes of the paramater sets contained in the last frame - required to split the paramater sets from the frame without having to parse the stream. Any call to VideoCapture::get(CAP_PROP_LF_PARAM_SET_LEN) returning a number greater than zero indicates the presense of a parameter set at the begining of the raw bitstream. * Adjust test data to account for extraData * Address warning. * Change added property names and remove paramater set start code check. * Output extra data on calls to retrieve instead of appending to the first packet. * Reverted old test case and added new one to evaluate new functionality. * Add missing definition. * Remove flag from legacy api. Add property to determine if returning extra data is supported. Always allow extra data to be returned on calls to cap.retrieve() Update test case. * Update condition which indicates CAP_PROP_CODEC_EXTRADATA_INDEX is not supported in test case. * Include compatibility for windows dll if not updated. Enforce existing return status convention. * Fix return error and missing test constraints.
Avoid `SyntaxWarning` on Python >= 3.8 ``` >>> "convolutional" == "convolutional" True >>> "convolutional" is "convolutional" <stdin>:1: SyntaxWarning: "is" with a literal. Did you mean "=="? True ``` Related to opencv#21121
…amples G-API: Cleaning samples * parseSSD + removed render details from gcpukernel * self-rev * Applying comment * Added operators * warnings
…issues [G-API] Fixed Coverity issues * Fixed Coverity issues - VectorRef&OpaqueRef m_kind = CV_UNKNOWN - added same-type overload for saturate() - sanitized resize value in ByteMemoryInStream::operator>> (std::string& str) - handled throws from ~GStreamingExecutor() * Catching exception by const ref * Addressing Sergey's comments * Applied enable_if semanitcs to saturate(x, round) too * Removed uncaught_exception, made destructor noexcept back * Split Fluid ConvertTo to multiple functions to avoid ifs; added CV_ALWAYS_INLINE * Added FIXME to address throwings from stop() * Fix standalone * Addressing comments * Guarded SIMD optimizations properly * Removed excess parameter from simd_impl functions
…ew_issue [G-API] Fix issue of getting 1D Mat out of RMat::View * Fix issue of getting 1D Mat out of RMat::View - added test - fixed for standalone too (removed Assert(dims.empty())) * Fixed asVeiw() function for standalone * Put more detailed comment
* GitHub Action to lint Python code * Move from automatic events to manual ones * flake8: Do not look for undefined names
Warning fixes for quaternion headers * warning fixes for quaternion headers * a/T(x) => a * T(1/x)
- re-enable quantized models tests
The Qt backend directly calls some OpenGL functions (glClear, glHint, glViewport), but since OCV 4.5.5 the GL libraries are no longer part of the global extra dependencies. When linking with "-Wl,--no-undefined" this causes linker errors: `opencv-4.5.5/modules/highgui/src/window_QT.cpp:3307: undefined reference to `glClear'` Fixes: opencv#21346 Related issues: opencv#21299
- exceptions are catched by fallback CPU path - OPENCV_OPENCL_ABORT_ON_BUILD_ERROR (disabled by default)
…on_kernel_build_error_3.4
GAPI: Move Resize kernel from core to imgproc * Move Resize kernel from core to imgproc * Applied style comments * Adding backward compatibility * Applied Asya PR
…on_kernel_build_error
This was referenced Dec 30, 2021
👍 |
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.
218 PRs:
#17889 from ZhengQiushi:my_3.4
#19721 from MaximMilashchenko:Audio
#20406 from MarkGHX:gsoc_2021_webnn
#20614 from mshabunin:use-onevpl-load
#20658 from smbz:lstm_optimisation
#20664 from anna-khakimova:ak/resize_simd
#20709 from AsyaPronina:asyadev/integrate_gstreamer_source
#20733 from rogday:argmaxnd
#20738 from sivanov-work:merge_master_vpl_dev_select
#20773 from sivanov-work:merge_vpl_source_unite
#20836 from alexgiving:atrutnev/rename_Adapter_to_IAdapter
#20856 from TolyaTalamanov:at/cfg-batch-size
#20857 from alexgiving:atrutnev/move_API_samples
#20870 from pkubaj:master
#20875 from Harvey-Huang:master
#20877 from rogday:simple_layers
#20879 from Wehzie:patch-1
#20882 from flytogcp:flytogcp-patch-1
#20883 from rogday:eltwise_refactoring
#20892 from alalek:issue_20888
#20894 from alalek:core_simd_int64_ctor_sse
#20895 from sergiud:avx-error-immediate
#20897 from ThalesGroup:master
#20900 from zchrissirhcz:3.4-hwfeatures-support-qnx
#20901 from sivanov-work:merge_source_unite_perf_mod
#20903 from alalek:samples_fix_nothreads_build
#20904 from Crayon-new:fix_bug_in_maxLayer
#20906 from alalek:backport_20903
#20908 from alalek:4.x_drop_legacy
#20910 from lukasalexanderweber:sift_fix
#20912 from AleksandrPanov:fix_findMinEnclosingTriangle
#20914 from anna-khakimova:ak/simd_div
#20916 from Harvey-Huang:32bit_rgb
#20918 from TolyaTalamanov:at/fix-empty-map-importNetwork
#20919 from berak:patch-1
#20920 from alalek:hotfix_clang_abi
#20921 from sivanov-work:atl_patch
#20922 from alexgiving:atrutnev/align_expect_assert_macros
#20924 from alexgiving:atrutnev/fix_gkernel_documentation
#20925 from TolyaTalamanov:at/enable-2d-inputs-giebackend
#20933 from shubham-shahh:master
#20934 from SinM9:spectrogram_samples
#20935 from crywang:dnn_face
#20937 from mpashchenkov:mp/ocv-gapi-warnings
#20940 from alalek:cmake_fix_samples_parallel_backend
#20942 from MaximMilashchenko:AudioPatch
#20947 from alalek:cmake_find_package_quiet
#20950 from Harvey-Huang:master
#20954 from shengyu7697:remove-redundant-semicolon
#20957 from sturkmen72:update-documentation
#20958 from noahstier:3.4_tvl1_optimization
#20960 from alalek:fix_icc_support_3.4
#20961 from alalek:fix_msvc_clang
#20967 from alalek:fix_msvc_clang_unused_parameter
#20969 from alalek:fix_msvc_clang_warning_noreturn
#20970 from s-trinh:update_Bayer_naming
#20971 from alalek:cmake_build_type_use_release
#20972 from Isydmr:correct-db-text-detector-drive-links
#20976 from alalek:issue_20968
#20977 from JulieBar:remap_overflow
#20978 from cudawarped:videocapture_read_raw_enchancement
#20980 from alalek:highgui_fix_cvGetWindowImageRect_3.4
#20982 from alalek:highgui_drop_cvGetWindowImageRect_4.x
#20987 from zcx-xxx:master
#20990 from alalek:fix_warnings_msvc_clang_dshow_3.4
#20995 from mpashchenkov:mp/ocv-gapi-tdp-skip
#20998 from alalek:update_protobuf_3.19.1
#20999 from alalek:dnn_replace_deprecated_calls
#21003 from APrigarina:add_test_qrdetect_fix
#21005 from nikpappas:bug-samples-falsecolor-trackbar
#21007 from alalek:cmake_dnn_fix_wrong_tengine_order
#21009 from alalek:dnn_skip_tests_32bit
#21011 from vrabaud:3.4
#21012 from hanliutong:rvv_clang
#21016 from alalek:issue_21002
#21020 from lukasalexanderweber:squash
#21022 from sivanov-work:async_mfp_demux
#21024 from anna-khakimova:ak/simd_mul
#21025 from alalek:issue_21004
#21027 from anonymouss:4.x
#21028 from AleksandrPanov:fix_markers_parse_in_gen_pattern.py
#21030 from tv3141:fix_seg_fault_houghlinespointset
#21032 from alalek:js_tracker_mil
#21039 from SegaraRai:use-pragma-message
#21040 from alexgiving:atrutnev/rename_RMatAdapter
#21041 from sivanov-work:gin_gout_concept
#21048 from ffontaine:4.x
#21049 from sivanov-work:vpl_dx11_merge
#21063 from vrabaud:3.4_h_clamping
#21064 from alalek:doc_videoio_api_preference_3.4
#21067 from NickJackolson:nickjackolson/imread-warning
#21074 from vrabaud:3.4_rect
#21077 from alalek:js_test_pin_cli_table
#21081 from alalek:issue_17261
#21083 from OrestChura:oc/fix_coverity_vino_issues
#21086 from hanliutong:rvv-dnn
#21088 from rogday:onnx_tests
#21092 from alalek:core_logger_show_timestamp
#21094 from Ryyyc:patch-2
#21103 from OrestChura:oc/fix_1D_Mat_RMat_View_issue
#21106 from mpashchenkov:mp/ocv-gapi-clean-samples
#21107 from take1014:remove_assert_21038
#21108 from ShuangLiu1992:patch-1
#21110 from alalek:update_libjpeg-turbo
#21112 from vrabaud:3.4_luv_overflow
#21114 from dwardor:patch-1
#21119 from anna-khakimova:ak/simd_addc
#21121 from cclauss:patch-2
#21123 from cclauss:patch-3
#21126 from alalek:dnn_test_ie_update_4.x
#21128 from cclauss:patch-3
#21130 from cclauss:print-function
#21131 from cclauss:codespell
#21133 from alalek:dnn_test_ie_update_3.4
#21134 from alalek:gapi_fix_build_ie_msvs2015
#21142 from alalek:dnn_two_inputs_ocl_fp16_3.4
#21145 from MaximMilashchenko:AudioUpdate
#21147 from mjmdavis:4.x
#21150 from alexgiving:atrutnev/fluid_perf
#21152 from rogday:fix_defaults
#21153 from alalek:build_warnings_msvs2017
#21154 from pccvlab:MatMul_with_two_inputs
#21157 from alexgiving:atrutnev/move_resize
#21158 from anna-khakimova:ak/simd_subC
#21159 from rogday:ceil_mode
#21160 from rogday:elu_alpha
#21161 from rogday:elu_alpha_4x
#21162 from rogday:softmax_simplification
#21163 from rogday:transpose_default
#21164 from rogday:sum_identity
#21165 from utibenkei:fix_android_ndk_camera_order_of_u_and_v
#21166 from rayonnant14:issue_21105
#21167 from alalek:dnn_test_reenable_ov_2021_4
#21170 from JJJoonngg:4.x
#21172 from alalek:dnn_test_drop_non_cpu_int8
#21173 from alalek:3.4_dnn_test_reenable_ov_2021_4
#21174 from APrigarina:fix_qr_encoder
#21176 from rogday:eltwise_layers
#21177 from anna-khakimova:ak/simd_mulc
#21178 from alalek:cmake_fix_soversion
#21180 from tezz-io:4.x
#21182 from mshabunin:split-cv2cpp
#21188 from UncleLLD:fix-markdown-error
#21190 from rogday:acts
#21193 from alalek:imgproc_test_bitexact_cvtcolor_yuv
#21194 from whalenpt:qt_opengl_build_fix
#21197 from SinM9:speech_recognition_python
#21202 from alalek:videoio_msmf_update_camera
#21204 from anna-khakimova:ak/move_simd_absdiffc
#21205 from anna-khakimova:ak/fix_for_muldouble_gpu
#21208 from rogday:argminmax_dnn
#21212 from OrestChura:oc/fix_openvino_standalone_build
#21213 from alalek:issue_20850_case1
#21218 from alalek:cmake_gapi_gstreamer_option
#21219 from asenyaev:asen/remove_distutils
#21222 from asenyaev:asen/replace_distutils_copy_tree
#21224 from UncleLLD:fix-cvtColor-error
#21227 from sbwilson:fix_framework_unicode_headers
#21228 from alalek:issue_21198
#21230 from sivanov-work:gapi_win32_vpl_fix
#21231 from alexgiving:atrutnev/SIMD_SubRC_fluid
#21235 from jonay2000:fix-docs
#21246 from pccvlab:square
#21247 from rogday:coverity_fix
#21250 from alalek:videoio_msmf_update_camera_3.4
#21251 from vrabaud:3.4_bayer
#21253 from cabelo:allRrealsense
#21254 from alalek:build_opencv_winpack_dldt_2021.4.2
#21256 from zchrissirhcz:fix-3.4-pyramid-tutorial
#21257 from alalek:imgproc_cvtcolor_lab_fix_nan
#21258 from eplankin:fix_threshold_to_zero_ipp_bug
#21259 from rogday:random_fixes
#21261 from alalek:dnn_onnx_test_filter_update
#21264 from MaximMilashchenko:AudioGStreamer
#21265 from alalek:dnn_onnx_test_filter_update_4.x
#21267 from mshabunin:fix-kw-2021-12
#21268 from pccvlab:tf_Arg
#21269 from mshabunin:fix-hardening-o3
#21271 from vrabaud:3.4_clip
#21275 from stal12:CCL_improvements
#21277 from alalek:backport_21267
#21279 from cabelo:new-example-intelrealsense
#21280 from alalek:update_version_3.4.17-pre#21281 from alalek:update_version_4.5.5-pre#21282 from alalek:dnn_test_vulkan_skip
#21283 from rogday:flatten_fix
#21294 from mshabunin:fix-gst-audio
#21295 from alalek:update_ffmpeg_3.4
#21296 from alalek:update_ffmpeg_4.x
#21297 from rogday:div_fix
#21301 from alalek:coverity_fixes_4.x
#21302 from alalek:issue_21299_3.4
#21303 from alalek:issue_21299_4.x
#21305 from alalek:cmake_plugins_lowercase_internal_names
#21306 from aBITnav:patch-1
#21313 from alalek:fix_links_3.4
#21314 from alalek:fix_links_4.x
#21318 from alexgiving:atrutnev/move_GKernelPackage
#21319 from savuor:backport_levmarqfromscratch
#21320 from catree:solvePnP_doc_page
#21321 from alalek:dnn_test_decompose_dynamic_axes
#21322 from alalek:dnn_catch_errors
#21323 from alalek:dnn_do_not_rebuilt_network_in_setInput
#21325 from APrigarina:fix_asift_sample
#21327 from alalek:imgcodecs_openexr_runtime_disabled
#21329 from alalek:cmake_openexr_find_package
#21330 from alalek:fix_highgui_gtk_mouse_callbacks
#21331 from alalek:issue_21289
#21335 from alalek:dnn_onnx_dump_input_output
#21336 from alalek:dnn_pooling_check_array_indexes
#21339 from AsyaPronina:asyadev/wa_valgrind_issues
#21341 from alalek:issue_20930_3.4
#21343 from alalek:dnn_onnx_handle_domains
#21347 from StefanBruens:fix_qt_opengl_link
#21354 from alalek:samples_python_3.10
#21356 from alalek:core_ocl_option_to_abort_on_kernel_build_error
#21360 from alalek:core_ocl_option_to_abort_on_kernel_build_error_3.4
Previous "Merge 4.x": #20886