5.x merge 4.x #3885
Merged
5.x merge 4.x #3885
+38
−31
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
…e FFmpeg dll has been updated.
The cvInvSqrt code replacement is taken from 5.x
Remove useless C headers
…_ffmpeg_features `cudacodec`: Enable features available with updated ffmpeg dll
… the yuv frames passed to VideoWriter occupy the full or limited range as defined by the Annex E of the ITU-T Specification.
…add_full_range_flag `cudacodec::VideoWriter` add flag for writing full range luma chroma video
build: suppress warning
Fix bugs in checker_detector.cpp after resolving conflicts from PR opencv#3599 opencv#3877 ### This is the pull request for fixing some bugs in "Color Checker detection" + The link to pretrained tensorflow model for detecting Macbeth Color-checker: https://drive.google.com/drive/folders/1JNWlmyfZKxiYQoYk6f0RzcGtHuiZq1Pz #### 1, Detecting color-checker using Neural network When loading the pretrained Macbeth color-checker detector model, and set it successfully to CCheckerDetector, ``` Ptr<CCheckerDetector> detector = CCheckerDetector::create(); if (!detector->setNet(net)) { cout << "Loading Model failed: Aborting" << endl; return 0; } ``` then ``` if(!detector->process(image, cv::mcc::MCC24, color_checker_roi, 1, true, params)) { std::cout<<"Color-checker not found\n"; } Ptr<mcc::CChecker> checker = detector->getBestColorChecker(); Ptr<CCheckerDraw> cdraw = CCheckerDraw::create(checker); cdraw->draw(image); ``` + problem 1: cdraw function failed to draw the correct result due to the following code block failed to update box in checker: ``` for (Ptr<CChecker> checker : checkers){ for (cv::Point2f &corner : checker->getBox()) corner += static_cast<cv::Point2f>(region.tl() + innerRegion.tl()); ... } ``` the corrected and test pass version is: ``` for (Ptr<CChecker>& checker : checkers){ std::vector<cv::Point2f> restore_box; for (cv::Point2f& corner : checker->getBox()) { corner += static_cast<cv::Point2f>(region.tl() + innerRegion.tl()); restore_box.emplace_back(corner); } checker->setBox(restore_box); } ... ``` 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
…e which requires fourcc hvc1
…ter_version_checks cudacodec: fix VideoWriter version check bug introduced in opencv#3711
…h265_quicktime_compatibility `cudacodec` - VideoWriter h265 QuickTime compatibility
asmorkalov
force-pushed
the
5.x-merge-4.x
branch
from
ee8528f to
6de28c2
Compare
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.
Extra: opencv/opencv_extra#1237
Main repo: opencv/opencv#26939
Note: Have to add opencv_dnn to ML module samples dependency list to resolve in-tree build issues.
#3867 from cudawarped:cudacodec_enable_win32_ffmpeg_features
#3868 from cudawarped:cudacodec_videowriter_add_full_range_flag
#3870 from vrabaud:remove_c
#3876 from tomoaki0705:warning_endif_directive
#3880 from cudawarped:cudacodec_fix_videowriter_version_checks
#3882 from cudawarped:cudacodec_videowriter_h265_quicktime_compatibility
Previous "Merge 4.x": #3871