(5.x) Merge 4.x #3142
Merged
(5.x) Merge 4.x #3142
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
The cvv module is compiled conditionally on HAVE_QT5. But in opencv commit 87d4970 this variable was renamed to HAVE_QT, so the module is never compiled. Also check if QT_VERSION_MAJOR >= 5
- Fix opencv bunny path for viz sample 3 - Fix viz sample 2 for proper rotation based on video in here[1] [1]: https://docs.opencv.org/4.5.3/d8/df0/tutorial_widget_pose.html
Add Radon transform function to ximgproc * resolve rebash conflict * add test for hough_space_transform * add perf for hough_space_transform * add sample for hough_space_transform * fix compatible issue and trailing space * fix EOF issue * resolve rebash conflict * update radon transform fix always cropping corner when rotate transpose the output - now each column is integral add support for float number add comment * add float type to perf test * add float type to accu test * update document * fix trailing space * resolve rebase conflict * Resolve coding style issues
* New superpixel algorithm (F-DBSCAN) Implementation of a new superpixel algorithm, "Accelerated superpixel image segmentation with a parallelized DBSCAN algorithm". * Update scansegment.hpp added newline at end of file * Update scansegment.cpp added newline at end of file * Update scansegment.cpp bug fixes * Update scansegment.cpp bug fixes * Update scansegment.hpp bug fixes * Update scansegment.cpp bug fixes * Update scansegment.hpp trailing whitespace removal * Update scansegment.cpp bug fixes * Update scansegment.cpp bug fixes * Update scansegment.cpp editing changes * Update scansegment.hpp editing changes * Update scansegment.hpp minor edits * Update scansegment.cpp bug fixes * Update scansegment.cpp inserted @addtogroup block * Update scansegment.cpp bug fixes * Update scansegment.hpp bug fixes * Update scansegment.hpp indents removed * Update scansegment.cpp extra indents removed * Update scansegment.cpp license agreement updated * Update scansegment.hpp license agreement updated * Update ximgproc.bib * Update scansegment.hpp reference moved to ximgproc.bib * Update scansegment.cpp reference moved to ximgproc.bib * Update scansegment.hpp c++ def removed * Update scansegment.hpp changed threads param * Update scansegment.cpp changed threads param * Update scansegment.cpp tab indents replaced with 4 spaces * Update scansegment.cpp bug fixes * Update scansegment.hpp removed trailing whitespace * Update scansegment.cpp replace malloc with autobuffer * Update scansegment.hpp updated header guard * Update scansegment.cpp bug fix * Update scansegment.cpp bug fixes * Update scansegment.cpp fixed process threads to the number of slices * Update scansegment.cpp bug fixes * Update scansegment.cpp C++ 11 lambdas used instead of cv::ParallelLoopBody * Update scansegment.cpp changed neighbours location buffer to array * Update scansegment.cpp remove whitespace * Update scansegment.cpp RAW pointers removed * Update scansegment.cpp bug fixes * ximgproc(ScanSegment): coding style, add smoke test * Update scansegment.hpp added citation * Update scansegment.cpp bug fixes
Add writing encoded video streams to disk when streaming from RTSP sources using cudacodec * Add missing codecs to cudacodec which uses Nvidia Video Codec SDK including checks to ensure codec used in input video file is supported on the current device. * Update cudacoded to 1) automatically write the raw encoded video stream to a video file and, 2) use less GPU memory by more closely mirroring the Nvidia samples. Specifically querying the decoder for the number of decode surfaces (h265 commonly uses 4) instead of always using 20 and not using adaptive deinterlacing when the video sequence is progressive. Additional updates to mirror the Nvidia sample include initializing the decoder so that HandleVideoSequence() gets called every time before the decoder is initialized, ensuring all the parameters for the decoder are provided by nvcudec. Added facility to decode AV1, not tested as VideoCapture doesn't return a valid fourcc for this. Add facility to decode MPEG4 video - requires modification to VideoCapture see pull request. * Prevent adding parameter sets twice and add zero padding to output files to that they play in vlc. Notes: VideoCapture - returns mpeg as the codec for mpeg4 files, so files written as .m4v from mpeg4 sources cannot currently be decoded. This is also true for AV1 sources where cap.get(CAP_PROP_FOURCC) returns 0. Added mpeg4 test file which can be decoded when VideoCapture adds the extra_data. * Update to account for the extraData being passed from cap.retrieve instead of appended to the first packet. * Update to be compatible with changes to VideoCapture * Remove redundant test. * Add check to ensure retrieve is successful. * Remove writeToFile and allow VideoReader to return raw encoded data at the same time as decoded frames. * Fix missing documentation.
- Got rid of texture unit for xSobel mode; - Implemented NORMALIZED_RESPONSE mode.
…tion photos, add tests, add aruco_samples_utility.hpp
…s_ratio Uniqueness ratio support for cuda::StereoBM * Naive implementation of uniqueness ratio option for cuda::StereoBM. * Optimized memory consumption in cuda::stereoBM with uniqueness check. * Got rid of line_disps array. * Reduced line_ssds. * Apply streams for all parts of cuda::stereoBM::compute. * Added perf test for CUDA stereoBM with uniqueness check. * Optimized global memory transactions. * Restored sync data transfers as they use stack variables. * Do not use constant memory in stereoBM to exclude stream races. * Code review fixes.
matches Ogre and makes more sense given float render targets are possible.
HashTSDF fixes backported * HashTSDF fixes backported * typo fixed
…ms_to_videoreader Pass cv::VideoCaptureProperties to VideoReader FFmpeg source * Add missing codecs to cudacodec which uses Nvidia Video Codec SDK including checks to ensure codec used in input video file is supported on the current device. * Allow VideoCaptureProperties to be passed to VideoCapture on initialization. Include test for VideoReader but not for VideoCapture, assume pass through successful. Use propertyId instead of c++ keyword property. Remove unecessary error checks (parsers error is dependant on source) and output more informative exception. * Prevent, fall back to CuvidVideoSource if VideoCapture params are passed and initialization fails and add test for this. * Remove magic number from get methods, and make the types consistent with VideoCapture::get Fix documentation. * Add wrapper macro's and remove unecessary parameter from get().
|
👍 |
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.
32 PRs:
#3070 from asmorkalov:as/hw_optflow_destructor
#3072 from sergiomb2:master
#3079 from Kumataro:Kumataro-patch-1
#3081 from asmorkalov:as/stereo_bm_uniqueness_ratio
#3082 from sergiud:wordsize-undefined
#3083 from sergiud:win32-sfm-no-minmax-macros
#3089 from noahstier:tlv1_cuda_optimization
#3090 from kuloPo:add-hough_space_transform
#3091 from asmorkalov:as/async_warp
#3092 from aimbot6120:sample_optimization
#3093 from scloke:master
#3094 from thunderbirdtr:viz_samples
#3095 from JulieBar:remap_overflow
#3098 from cudawarped:rtsp_video_write
#3103 from aluaces:patch-1
#3107 from saurabheights:patch-1
#3110 from Kumataro:4.x_fix3108
#3112 from berak:ximgproc_fix_edge_drawing
#3113 from TracelessLe:master
#3120 from AleksandrPanov:fix-aruco-tutorial
#3121 from paroj:colorfu(dedicated port to 5.x is required)#3123 from sturkmen72:legacy_constants
#3124 from duanqn:duanqn/fix-typo
#3126 from AleksandrPanov:update_ArUco_tutorial
#3128 from alalek:cmake_fix_opengl
#3130 from ToFam:ed_segment_getter
#3132 from asmorkalov:as/stereo_prefilter
#3134 from asmorkalov:as/stereo_ub2
#3135 from paroj:ovisup
#3137 from savuor:backport_levmarqfromscratch
#3139 from cudawarped:pass_videocapture_params_to_videoreader
Main PR: opencv/opencv#21371
Previous "Merge 4.x": #3075