Skip to content

imgcodecs: support IMWRITE_JPEG_LUMA/CHROMA_QUALITY with internal libjpeg-turbo#25647

Merged
asmorkalov merged 3 commits intoopencv:4.xfrom
Kumataro:fix25646
May 27, 2024
Merged

imgcodecs: support IMWRITE_JPEG_LUMA/CHROMA_QUALITY with internal libjpeg-turbo#25647
asmorkalov merged 3 commits intoopencv:4.xfrom
Kumataro:fix25646

Conversation

@Kumataro
Copy link
Copy Markdown
Contributor

@Kumataro Kumataro commented May 26, 2024

Close #25646

  • increase JPEG_LIB_VERSION for internal libjpeg-turbo from 62 to 70
  • add log when using IMWRITE_JPEG_LUMA/CHROMA_QUALITY with JPEG_LIB_VERSION<70
  • add document IMWRITE_JPEG_LUMA/CHROMA_QUALITY requests JPEG_LIB_VERSION >= 70

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

@Kumataro
Copy link
Copy Markdown
Contributor Author

Kumataro commented May 26, 2024

There are cmake warnings at Win64 and docs , but they means not found NASM. So I believe this warning is not releated with this patch.

https://pullrequest.opencv.org/buildbot/builders/precommit_windows64/builds/105633/steps/cmake/logs/warnings%20%281%29

CMake Warning at 3rdparty/libjpeg-turbo/src/simd/CMakeLists.txt:5 (message):

https://pullrequest.opencv.org/buildbot/builders/precommit_windows64/builds/105633/steps/cmake/logs/stdio

https://pullrequest.opencv.org/buildbot/builders/precommit_docs/builds/107350/steps/cmake/logs/stdio

-- Looking for a ASM_NASM compiler
-- Looking for a ASM_NASM compiler - NOTFOUND
-- Looking for assert.h
CMake Warning at 3rdparty/libjpeg-turbo/src/simd/CMakeLists.txt:5 (message):
  SIMD extensions disabled: could not find NASM compiler.  Performance will
  suffer.
Call Stack (most recent call first):
  3rdparty/libjpeg-turbo/src/simd/CMakeLists.txt:48 (simd_fail)


-- Looking for assert.h - found
-- Looking for fcntl.h

@Kumataro
Copy link
Copy Markdown
Contributor Author

Kumataro commented May 26, 2024

Maybe previous CI failed seems not be related this pull request.
Same phenomenon is happend other issue, and I can reproduce same phenomenon in my PC if NASM is missing.

I enabled OPENCV_FORCE_3RDPARTY_BUILD temporary.
If CI test is passed, I will revert it.

@asmorkalov asmorkalov added this to the 4.10.0 milestone May 27, 2024
opencv-alalek
opencv-alalek approved these changes May 27, 2024
View reviewed changes
Copy link
Copy Markdown
Contributor

@opencv-alalek opencv-alalek left a comment

Choose a reason for hiding this comment

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

Well done 👍 Thank you!

@asmorkalov asmorkalov merged commit b659351 into opencv:4.x May 27, 2024
@mshabunin mshabunin mentioned this pull request Jun 14, 2024
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

@opencv-alalek opencv-alalek opencv-alalek approved these changes

Assignees

@opencv-alalek opencv-alalek

Labels

category: imgcodecs category: 3rdparty

Projects

None yet

Milestone

4.10.0

Development

Successfully merging this pull request may close these issues.

3rdparty: libjpeg-turbo: IMWRITE_JPEG_LUMA/CHROMA_QUALITY doesn't work with internal libjpeg-turbo

3 participants

@Kumataro @asmorkalov @opencv-alalek