Improve QR code version estimation #22695
Merged
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
asmorkalov
changed the title
AleksandrPanov
force-pushed
the
qr_improve_version_detect
branch
from
3240ebc to
53964a3
Compare
AleksandrPanov
force-pushed
the
qr_improve_version_detect
branch
4 times, most recently
from
82a247a to
0a8c040
Compare
asmorkalov
reviewed
Nov 18, 2022
AleksandrPanov
force-pushed
the
qr_improve_version_detect
branch
from
0a8c040 to
8566b76
Compare
asmorkalov
reviewed
Nov 21, 2022
AleksandrPanov
force-pushed
the
qr_improve_version_detect
branch
from
8550665 to
ea53a7b
Compare
AleksandrPanov
force-pushed
the
qr_improve_version_detect
branch
2 times, most recently
from
a6d055e to
091f3e6
Compare
asmorkalov
reviewed
Nov 24, 2022
asmorkalov
reviewed
Nov 24, 2022
alalek
reviewed
Nov 24, 2022
AleksandrPanov
force-pushed
the
qr_improve_version_detect
branch
4 times, most recently
from
2ea256c to
79c63c6
Compare
asmorkalov
reviewed
Nov 25, 2022
AleksandrPanov
force-pushed
the
qr_improve_version_detect
branch
from
79c63c6 to
4b41946
Compare
asmorkalov
reviewed
Nov 28, 2022
AleksandrPanov
force-pushed
the
qr_improve_version_detect
branch
from
3d0a706 to
ed3810f
Compare
rogday
reviewed
Nov 28, 2022
| * findPatternsVerticesPoints() may be erroneous, so they are checked. | ||
| */ | ||
| static inline std::pair<int, int> matchPatternPoints(const vector<Point> &finderPattern, | ||
| const vector<Point2f> cornerPointsQR) { |
There was a problem hiding this comment.
Looks like it should be a reference
| sqrt(normL2Sqr<float>(cornerPointsQR[0] - cornerPointsQR[3]))*0.5f; | ||
| const float maxRelativeDistance = .1f; | ||
|
|
||
| if (distanceToOrig/originalQrSide > maxRelativeDistance) |
There was a problem hiding this comment.
Not sure, looks suspicious: squared distance is divided by mean of distances
| vector<vector<Point>> finderPatterns; | ||
| double numModulesX = 0., numModulesY = 0.; | ||
| bool flag = findPatternsVerticesPoints(finderPatterns); | ||
| if (flag) { |
There was a problem hiding this comment.
Nit: negate the condition to reduce nesting.
| double numModulesX = 0., numModulesY = 0.; | ||
| bool flag = findPatternsVerticesPoints(finderPatterns); | ||
| if (flag) { | ||
| vector<double> pattern_distance(4); |
| if (flag) { | ||
| vector<double> pattern_distance(4); | ||
| for (auto& pattern : finderPatterns) { | ||
| auto indexes = matchPatternPoints(pattern, original_points); |
There was a problem hiding this comment.
Nit: name both elements of the pair so that's easier to read.
Comment on lines
+2527
to
+2528
| if (roundingError < thresholdFinderPattern) | ||
| useFinderPattern = true; |
There was a problem hiding this comment.
useFinderPattern = (roundingError < thresholdFinderPattern);
| bool useCode = false; | ||
| int versionByCode = 7; | ||
| if (cvRound(versionByFinderPattern) >= 7 || versionByTransition >= 7) { | ||
| vector<std::pair<double, int>> versionAndDistances; |
There was a problem hiding this comment.
Why do we need this? Should be pair bestVersion instead, then push_back -> bestVersion = std::min(bestVersion, ...);
| version_size = 21 + (version - 1) * 4; | ||
| CV_LOG_INFO(NULL, "QR corners: " << original_points[0] << " " << original_points[1] << " " << original_points[2] << | ||
| " " << original_points[3]); | ||
| if ( !(0 < version && version <= 40) ) { return false; } |
There was a problem hiding this comment.
Nit: if ( version <= 0 || version > 40) { return false; } looks far more readable
Comment on lines
+2269
to
+2271
| if (1.f - minSide / maxSide > patternMaxRelativeLen) | ||
| return false; | ||
| return true; |
There was a problem hiding this comment.
return (1.f - minSide / maxSide <= patternMaxRelativeLen);
Merged
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
QR codes with version 7 or greater store a special 18 bit code with the version number of the code:
https://www.thonky.com/qr-code-tutorial/format-version-information
https://www.thonky.com/qr-code-tutorial/format-version-tables
This PR reads this QR information to determine the version.
Also, to determine the version of QR codes < 7, added method with
getNumModules()function.To check the correctness, a benchmark was launched:
Logging from benchmark:
new_version.txt
base.txt
Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
Patch to opencv_extra has the same branch name.