Skip to content

Use QR code alignment markers#22891

Merged
asmorkalov merged 1 commit intoopencv:4.xfrom
AleksandrPanov:qr_add_alignment
Dec 15, 2022
Merged

Use QR code alignment markers#22891
asmorkalov merged 1 commit intoopencv:4.xfrom
AleksandrPanov:qr_add_alignment

Conversation

@AleksandrPanov
Copy link
Copy Markdown
Contributor

@AleksandrPanov AleksandrPanov commented Nov 30, 2022 •
edited
Loading

merge with opencv/opencv_extra#1024

Added detect QR code alignment marker (1 marker for 2-6 versions, 6 markers for 7-40 versions). Alignment marker uses to find the correct position of the fourth corner.

To check the correctness, a benchmark was launched:
qr.py.txt

No decode regression now.

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • 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
  • The PR is proposed to the proper branch
  • There is a reference to the original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake

@asmorkalov asmorkalov changed the title add alignment detect Use QR code alignment margkers Nov 30, 2022
@asmorkalov asmorkalov changed the title Use QR code alignment margkers Use QR code alignment markers Nov 30, 2022
asmorkalov
asmorkalov reviewed Dec 1, 2022
View reviewed changes
@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Dec 1, 2022

It makes sense to enable all disabled tests for QR codes first. Version estimation and alignment markers should make more tests stable.

@AleksandrPanov AleksandrPanov force-pushed the qr_add_alignment branch 2 times, most recently from 429adcc to 72a1a1f Compare December 1, 2022 21:02
@AleksandrPanov AleksandrPanov force-pushed the qr_add_alignment branch 3 times, most recently from 6f099ea to 171afaf Compare December 5, 2022 03:07
asmorkalov
asmorkalov reviewed Dec 5, 2022
View reviewed changes
@asmorkalov asmorkalov marked this pull request as ready for review December 6, 2022 08:18
@AleksandrPanov AleksandrPanov force-pushed the qr_add_alignment branch 2 times, most recently from 500a205 to c4a00da Compare December 6, 2022 19:40
@asmorkalov asmorkalov added this to the 4.7.0 milestone Dec 7, 2022
asmorkalov
asmorkalov reviewed Dec 8, 2022
View reviewed changes
@asmorkalov asmorkalov added the test label Dec 8, 2022
@AleksandrPanov AleksandrPanov mentioned this pull request Dec 8, 2022
Merged
@AleksandrPanov AleksandrPanov force-pushed the qr_add_alignment branch 2 times, most recently from 177f5d2 to aca6f07 Compare December 8, 2022 19:49
@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Dec 12, 2022

@alalek May we merge the patch?

alalek
alalek reviewed Dec 13, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW,
There is opencv_extra patch related to this (it should be marked on the first visible line instead of somewhere in the middle of description).
Test data size is >600kB for one test image.

modules/objdetect/test/test_qrcode.cpp Outdated
Comment on lines +31 to +35
std::string qrcode_images_multiple[] = {
"2_qrcodes.png", "3_close_qrcodes.png", "3_qrcodes.png", "4_qrcodes.png",
"2_qrcodes.png", /*"3_close_qrcodes.png",*/ "3_qrcodes.png", /*"4_qrcodes.png",*/
"5_qrcodes.png", "6_qrcodes.png", "7_qrcodes.png", "8_close_qrcodes.png"
};
// 3_close_qrcodes.png, 4_qrcodes.png DISABLED after PR #22891
Copy link
Copy Markdown
Member

@alalek alalek Dec 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some test cases are disabled (so it is formally a regression).

Copy link
Copy Markdown
Contributor Author

@AleksandrPanov AleksandrPanov Dec 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixing regression

modules/objdetect/test/test_qrcode.cpp Outdated

std::vector<Mat1b> straight_barcode;
qrcode.detectAndDecodeMulti(src, decoded_info, corners, straight_barcode);
EXPECT_EQ(decoded_info.size(), 9ull);
Copy link
Copy Markdown
Member

@alalek alalek Dec 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, wrong order.

Copy link
Copy Markdown
Contributor Author

@AleksandrPanov AleksandrPanov Dec 13, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reordered

@AleksandrPanov
Copy link
Copy Markdown
Contributor Author

AleksandrPanov commented Dec 13, 2022 •
edited
Loading

BTW, There is opencv_extra patch related to this (it should be marked on the first visible line instead of somewhere in the middle of description). Test data size is >600kB for one test image.

opencv_extra patch notes moved to first line, test image was scaled to 306.2 kB

There are 9 qr codes with big enough version in one test image (old test image 9_qrcodes.jpg has 290 kB size with low qrs version).

@AleksandrPanov AleksandrPanov force-pushed the qr_add_alignment branch 3 times, most recently from ec878b4 to cdc96b3 Compare December 13, 2022 18:22
asmorkalov
asmorkalov reviewed Dec 14, 2022
View reviewed changes
AleksandrPanov
AleksandrPanov commented Dec 14, 2022
View reviewed changes
modules/objdetect/perf/perf_qrcode_pipeline.cpp
straight_barcode_sort.push_back(result[i].second);
}
SANITY_CHECK(decoded_info_sort);
SANITY_CHECK(straight_barcode_sort);
Copy link
Copy Markdown
Contributor Author

@AleksandrPanov AleksandrPanov Dec 14, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some problem in 4_qrcodes.png, 8_close_qrcodes.png
This QRs correctly decoded, but there is no bitwise equality in straight_barcode and golds. I think this is an optional check. A successful decode should mean that the test has passed.

Copy link
Copy Markdown
Member

@alalek alalek Dec 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agreed

alalek
alalek approved these changes Dec 14, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you 👍

@asmorkalov asmorkalov merged commit 0153e79 into opencv:4.x Dec 15, 2022
@alalek alalek mentioned this pull request Jan 8, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@asmorkalov asmorkalov asmorkalov approved these changes

@alalek alalek alalek approved these changes

+1 more reviewer

@Samson-Mayeem Samson-Mayeem Samson-Mayeem approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

category: objdetect feature test

Projects

None yet

Milestone

4.7.0

Development

Successfully merging this pull request may close these issues.

4 participants

@AleksandrPanov @asmorkalov @alalek @Samson-Mayeem