Skip to content

libjpeg upgrade to version 9f#25092

Merged
asmorkalov merged 7 commits intoopencv:4.xfrom
klatism:libjpeg-upgrade
Mar 28, 2024
Merged

libjpeg upgrade to version 9f#25092
asmorkalov merged 7 commits intoopencv:4.xfrom
klatism:libjpeg-upgrade

Conversation

@klatism
Copy link
Copy Markdown
Contributor

@klatism klatism commented Feb 25, 2024

Upgrade libjpeg dependency from version 9d to 9f.

  • 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

@klatism klatism mentioned this pull request Feb 26, 2024
Closed
6 tasks
@opencv-alalek
Copy link
Copy Markdown
Contributor

opencv-alalek commented Feb 26, 2024

Please create a temporary commit to trigger all CI builds with provided 3rdparty code.

Use ON here:

opencv/CMakeLists.txt

Line 230 in ae347ab

OCV_OPTION(OPENCV_FORCE_3RDPARTY_BUILD "Force using 3rdparty code from source" OFF)

Apply for all related PRs.

P.S. Commit should be removed after approval and before merge (through git rebase -i).

@opencv-alalek opencv-alalek added this to the 4.10.0 milestone Feb 26, 2024
@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Feb 26, 2024

Looks good to me in general. Couple of questions to @opencv-alalek , team:

  • Should we add other files from the release, that are not included in current build?
  • Does it make sense to update the library, if libjpeg-turbo is faster and used by default.

@opencv-alalek
Copy link
Copy Markdown
Contributor

opencv-alalek commented Feb 26, 2024

Should we add other files from the release, that are not included in current build?

We should not add files with source code which we don't use (like tests, testdata, tools, examples, etc).

Does it make sense to update the library, if libjpeg-turbo is faster and used by default.

libjpeg-turbo is faster if there is proper compiler support. However, windows still compiles jsimd_none.c.
AFAIK, libjpeg is deprecated as OpenCV's 3rdparty and it should be removed in 5.x.

@asmorkalov asmorkalov self-requested a review February 26, 2024 14:27
@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Feb 26, 2024

-DBUILD_JPEG_TURBO_DISABLE=ON is also needed to force libjpeg on CI. Looks like you have to add it to root CMakeLists.txt

@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Feb 27, 2024

Looks like libjpeg 9f and current libjpeg turbo decode some images slightly differently. The diverged VIT Tracker test uses jpeg images as input.

asmorkalov
asmorkalov approved these changes Feb 27, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@asmorkalov asmorkalov left a comment

Choose a reason for hiding this comment

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

👍 Looks good to me. JPEG inconsistency is not good in general, but expected.

@mshabunin
Copy link
Copy Markdown
Contributor

mshabunin commented Feb 27, 2024 •
edited
Loading

Test should be fixed:

opencv/modules/video/test/test_trackers.cpp

Line 169 in 0b3232a

checkTrackingAccuracy(tracker, 0.67);
Maybe replacing 0.67 with 0.65 will help?

@klatism
Copy link
Copy Markdown
Contributor Author

klatism commented Mar 2, 2024

@asmorkalov @mshabunin I'm not sure how I can continue on this PR. Any pointers are appreciated.

@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Mar 2, 2024

@klatism I'm looking on the issue now.

@klatism
Copy link
Copy Markdown
Contributor Author

klatism commented Mar 21, 2024

@asmorkalov, just checking in to see if there are any updates

@asmorkalov asmorkalov mentioned this pull request Mar 28, 2024
Merged
6 tasks
@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Mar 28, 2024

Addressed calib3d issue in #25282

@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Mar 28, 2024

@klatism I rebased your branch on top of 4.x and tuned test threshold a bit to pass tests.

@asmorkalov asmorkalov self-assigned this Mar 28, 2024
asmorkalov
asmorkalov approved these changes Mar 28, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@asmorkalov asmorkalov left a comment

Choose a reason for hiding this comment

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

👍

@asmorkalov asmorkalov merged commit f87e1ef into opencv:4.x Mar 28, 2024
@asmorkalov asmorkalov mentioned this pull request Apr 1, 2024
Merged
@FantasqueX FantasqueX mentioned this pull request May 5, 2024
Merged
6 tasks
klatism added a commit to klatism/opencv that referenced this pull request May 17, 2024
@klatism
Merge pull request opencv#25092 from klatism:libjpeg-upgrade
a1cfeee 
libjpeg upgrade to version 9f opencv#25092

Upgrade libjpeg dependency from version 9d to 9f.

- [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
- [ ] 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
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

@mshabunin mshabunin Awaiting requested review from mshabunin

@opencv-alalek opencv-alalek Awaiting requested review from opencv-alalek

Assignees

@asmorkalov asmorkalov

Labels

category: 3rdparty

Projects

None yet

Milestone

4.10.0

Development

Successfully merging this pull request may close these issues.

4 participants

@klatism @opencv-alalek @asmorkalov @mshabunin