RFC: Jpeg2000 OpenJPEG port by StefanBruens · Pull Request #16494 · opencv/opencv

StefanBruens · 2020-02-03T18:49:14Z

resolves #5849
relates #14058

Currently missing/incomplete:

ci_branch=pr16494
buildworker:Linux x64=linux-4
buildworker:Linux OpenCL=linux-2

alalek

Thank you for the contribution!

modules/imgcodecs/src/grfmt_jpeg2000_openjpeg.cpp

cmake/OpenCVFindLibsGrfmt.cmake

asmorkalov · 2020-02-04T05:20:42Z

@StefanBruens Great job! Could you make find_package for new format silent. See CI bot warnings: https://pullrequest.opencv.org/buildbot/builders/precommit_linux64/builds/24663/steps/cmake/logs/stdio.
Also Imgcodecs module contains some tests for image IO in Jpeg2000 format that are guarded by defined(HAVE_JASPER) && defined(OPENCV_IMGCODECS_ENABLE_JASPER_TESTS) macros. Could you enable them for OpenJPEG too to have automated regression testing with CI bot too.

alalek · 2020-02-04T11:34:26Z

Please ignore CMake warnings for now. I need to upgrade builders and their configurations first.

Let enable tests for OpenJPEG first.

modules/imgcodecs/test/test_grfmt.cpp

modules/imgcodecs/test/test_read_write.cpp

CMakeLists.txt

modules/imgcodecs/src/loadsave.cpp

StefanBruens · 2020-02-06T18:32:13Z

The Mac build already uses the OpenJPEG path.

It fails due to the unimplemented RGB->gray conversion when IMREAD_GRAY is used.

Should this just use cv::cvtColor, or fail?

alalek · 2020-02-06T19:40:09Z

cvtColor call is allowed in imgcodecs module. Yes, you can use it.

StefanBruens · 2020-02-06T21:23:56Z

Last remaining error:

CMake Warning at /build/precommit_linux64/ci/cmake_checks/cmake_checks.cmake:105 (message):
  Manual validation is requied.  Variable is not defined: HAVE_OPENJPEG
Call Stack (most recent call first):
  /build/precommit_linux64/ci/cmake_checks/precommit_linux64/POST_FINALIZE.cmake:115 (build_validate_enabled_flag)
  cmake/OpenCVUtils.cmake:52 (include)
  CMakeLists.txt:1596 (ocv_cmake_hook)

Currently, the following input color spaces and depth conversions are supported: - 8 bit -> 8 bit - 16 bit -> 16 bit (IMREAD_UNCHANGED, IMREAD_ANYDEPTH) - RGB(a) -> BGR - RGBA -> BGRA (IMREAD_UNCHANGED) - Y(a) -> Y(a) (IMREAD_ANYCOLOR, IMREAD_GRAY, IMREAD_UNCHANGED)) - YCC -> Y (IMREAD_GRAY)

alalek · 2020-02-07T10:58:42Z

HAVE_OPENJPEG

Please ignore this for now (this issue is related to infrastructure which will be updated before merge).

There are several packages of OpenJPEG on Ubuntu 16.04:

libopenjpeg-dev (installed on "Linux x64" build configuration)
libopenjp2-7-dev (installed on "Linux OpenCL" build configuration)

Looks like they have different versions of OpenJPEG: 1.5 vs 2.1

Please adapt CMake to check applicable version of OpenJPEG (perhaps >= 2.0).
Try something like this

find_package(OpenJPEG 2.0 QUIET)

or check version after that:

if(NOT OPENJPEG_MAJOR_VERSION VERSION_LESS "2")
  ... use OpenJPEG ...
endif()

This enables OpenJPEG based JPEG2000 imread support by default, which can be disabled by -DWITH_OPENJPEG=OFF. In case OpenJPEG is enabled and found, any checks for Jasper are skipped.

…ANGED With IMREAD_UNCHANGED, values are kept from the input image, without it components are downscaled to CV_8U range.

Support IMREAD_GRAY when input color space is RGB or unspecified. Support YUV input color space for BGR output.

StefanBruens · 2020-02-07T14:45:56Z

find_package(OpenJPEG 2.0 QUIET)

No OpenJPEGVersion.cmake -> manual check required.

asmorkalov · 2020-02-20T09:04:11Z

@StefanBruens Do you have a chance to finish your patch? it brings a lot of value to the library.

Removed trailing whitespaces

Images with depth CV_8U and CV_16U are supported, with 1 to 4 channels.

- Removed code duplication - Added error handlers - Extracted functions

modules/imgcodecs/src/grfmt_jpeg2000_openjpeg.cpp

…d requirements - Removed channels split in copyFromMatImpl. With ChannelsIterator no allocations are performed. - Split whole loop into 2 parts in copyToMat -> where std::copy and std::transforms are called.

VadimLevin · 2020-03-17T16:36:03Z

@alalek I've fixed all issues with the memory management in this PR and cherry-picked changes from #16524. Can you proceed with the review?

The only thing that makes this PR red is CMake warning about HAVE_OPENJPEG

alalek

Looks good to me!

modules/imgcodecs/src/grfmt_jpeg2000_openjpeg.cpp

alalek · 2020-03-20T18:36:53Z

modules/imgcodecs/src/grfmt_jpeg2000_openjpeg.cpp

+
+bool Jpeg2KOpjDecoder::readHeader()
+{
+    stream_.reset(opj_stream_create_default_file_stream(m_filename.c_str(), OPJ_STREAM_READ));


m_filename.c_str()

Looks like imdecode() from in-memory buffers is not supported at this moment.

Added support, based on the following PR:

PR 583

PR 1212

- Changed `nullptr` in CV_LOG* functions to `NULL` - Added `falls through` comment in decoder color space `switch` - Added warning about unsupported parameters for the encoder

alalek

Well done! Thank you 👍

alalek · 2020-03-27T21:59:43Z

Updated I/O tests (#16922) show large output from OpenJPEG encoding process. Looks like lossless compression is applied.

We need to tune default compression parameters. PSNR 30-35 threshold on mentioned tests should be enough for default compression values.

arogozhnikov · 2020-03-31T06:28:05Z

I see this is very recent change (only 4 days ago), but I'm interested in testing openjpeg for my case (uint16 grayscale) to read/write from python.
When should I expect this functionality available in distribution? Thanks!

asmorkalov · 2020-04-01T12:52:34Z

OpenCV 4.3.0 is coming soon.

Jpeg2000 OpenJPEG port * OpenJPEG based JPEG2000 decoder implementation Currently, the following input color spaces and depth conversions are supported: - 8 bit -> 8 bit - 16 bit -> 16 bit (IMREAD_UNCHANGED, IMREAD_ANYDEPTH) - RGB(a) -> BGR - RGBA -> BGRA (IMREAD_UNCHANGED) - Y(a) -> Y(a) (IMREAD_ANYCOLOR, IMREAD_GRAY, IMREAD_UNCHANGED)) - YCC -> Y (IMREAD_GRAY) * Check for OpenJPEG availability This enables OpenJPEG based JPEG2000 imread support by default, which can be disabled by -DWITH_OPENJPEG=OFF. In case OpenJPEG is enabled and found, any checks for Jasper are skipped. * Implement precision downscaling for precision > 8 without IMREAD_UNCHANGED With IMREAD_UNCHANGED, values are kept from the input image, without it components are downscaled to CV_8U range. * Enable Jpeg2K tests when OpenJPEG is available * Add support for some more color conversions Support IMREAD_GRAY when input color space is RGB or unspecified. Support YUV input color space for BGR output. * fix: problems with unmanaged memory * fix: CMake warning - HAVE_OPENJPEG is undefined Removed trailing whitespaces * fix: CMake find_package OpenJPEG add minimal version * Basic JPEG2K encoder Images with depth CV_8U and CV_16U are supported, with 1 to 4 channels. * feature: Improved code for OpenJPEG2000 encoder/decoder - Removed code duplication - Added error handlers - Extracted functions * feature: Update conversion openjpeg array from/to Mat * feature: Extend ChannelsIterator to fulfill RandomAccessIterator named requirements - Removed channels split in copyFromMatImpl. With ChannelsIterator no allocations are performed. - Split whole loop into 2 parts in copyToMat -> where std::copy and std::transforms are called. * fix: Applied review comments. - Changed `nullptr` in CV_LOG* functions to `NULL` - Added `falls through` comment in decoder color space `switch` - Added warning about unsupported parameters for the encoder * feature: Added decode from in-memory buffers. Co-authored-by: Vadim Levin <vadim.levin@xperience.ai>

alalek reviewed Feb 3, 2020

View reviewed changes

modules/imgcodecs/src/grfmt_jpeg2000_openjpeg.cpp Outdated Show resolved Hide resolved

cmake/OpenCVFindLibsGrfmt.cmake Outdated Show resolved Hide resolved

StefanBruens force-pushed the jpeg2000_openjpeg_port branch from f9026c8 to fbe7e0f Compare February 3, 2020 21:33

StefanBruens force-pushed the jpeg2000_openjpeg_port branch from fbe7e0f to 86142b0 Compare February 4, 2020 12:48

alalek reviewed Feb 5, 2020

View reviewed changes

modules/imgcodecs/test/test_grfmt.cpp Show resolved Hide resolved

modules/imgcodecs/test/test_read_write.cpp Outdated Show resolved Hide resolved

CMakeLists.txt Show resolved Hide resolved

modules/imgcodecs/src/loadsave.cpp Outdated Show resolved Hide resolved

StefanBruens force-pushed the jpeg2000_openjpeg_port branch 4 times, most recently from 8677157 to e7f039a Compare February 6, 2020 16:19

StefanBruens force-pushed the jpeg2000_openjpeg_port branch from fa7677c to 2b0cee3 Compare February 7, 2020 03:34

StefanBruens mentioned this pull request Feb 7, 2020

RFC: OpenJPEG based Jpeg2000 encoder #16524

Closed

StefanBruens added 4 commits February 7, 2020 15:41

Check for OpenJPEG availability

22e98e3

This enables OpenJPEG based JPEG2000 imread support by default, which can be disabled by -DWITH_OPENJPEG=OFF. In case OpenJPEG is enabled and found, any checks for Jasper are skipped.

Implement precision downscaling for precision > 8 without IMREAD_UNCH…

e0c0a82

…ANGED With IMREAD_UNCHANGED, values are kept from the input image, without it components are downscaled to CV_8U range.

Enable Jpeg2K tests when OpenJPEG is available

12d4518

Add support for some more color conversions

6d6424e

Support IMREAD_GRAY when input color space is RGB or unspecified. Support YUV input color space for BGR output.

StefanBruens force-pushed the jpeg2000_openjpeg_port branch from 2b0cee3 to 6d6424e Compare February 7, 2020 18:40

asmorkalov added the Hackathon https://opencv.org/opencv-hackathon-starts-next-week/ label Feb 28, 2020

asmorkalov assigned VadimLevin Mar 12, 2020

fix: problems with unmanaged memory

1a8d94e

asmorkalov added the pr: Discussion Required label Mar 13, 2020

fix: CMake warning - HAVE_OPENJPEG is undefined

e25a538

Removed trailing whitespaces

VadimLevin force-pushed the jpeg2000_openjpeg_port branch from e857531 to 98f498e Compare March 13, 2020 07:36

VadimLevin force-pushed the jpeg2000_openjpeg_port branch from 98f498e to c37fd9a Compare March 13, 2020 07:48

fix: CMake find_package OpenJPEG add minimal version

6f928f6

VadimLevin force-pushed the jpeg2000_openjpeg_port branch from c37fd9a to 6f928f6 Compare March 13, 2020 08:14

StefanBruens and others added 3 commits March 13, 2020 15:16

Basic JPEG2K encoder

f65e028

Images with depth CV_8U and CV_16U are supported, with 1 to 4 channels.

feature: Improved code for OpenJPEG2000 encoder/decoder

43fc141

- Removed code duplication - Added error handlers - Extracted functions

feature: Update conversion openjpeg array from/to Mat

49d156b

StefanBruens commented Mar 16, 2020

View reviewed changes

modules/imgcodecs/src/grfmt_jpeg2000_openjpeg.cpp Show resolved Hide resolved

VadimLevin force-pushed the jpeg2000_openjpeg_port branch from e97fae5 to 6054d18 Compare March 17, 2020 15:06

feature: Extend ChannelsIterator to fulfill RandomAccessIterator name…

c9ff248

…d requirements - Removed channels split in copyFromMatImpl. With ChannelsIterator no allocations are performed. - Split whole loop into 2 parts in copyToMat -> where std::copy and std::transforms are called.

VadimLevin force-pushed the jpeg2000_openjpeg_port branch from 6054d18 to c9ff248 Compare March 17, 2020 15:25

asmorkalov removed the pr: Discussion Required label Mar 20, 2020

alalek reviewed Mar 20, 2020

View reviewed changes

VadimLevin added 2 commits March 26, 2020 08:55

fix: Applied review comments.

13c6259

- Changed `nullptr` in CV_LOG* functions to `NULL` - Added `falls through` comment in decoder color space `switch` - Added warning about unsupported parameters for the encoder

feature: Added decode from in-memory buffers.

80838b6

VadimLevin force-pushed the jpeg2000_openjpeg_port branch from 42ccb46 to 80838b6 Compare March 26, 2020 08:45

alalek approved these changes Mar 27, 2020

View reviewed changes

alalek merged commit 8d78400 into opencv:master Mar 27, 2020

jubalh mentioned this pull request Mar 27, 2020

State of jasper jasper-software/jasper#208

Closed

VadimLevin mentioned this pull request Aug 26, 2020

Added OpenJPEG source code as a part of 3rdparty #18194

Merged

6 tasks

alalek mentioned this pull request Sep 21, 2020

imgcodecs(openjpeg): add checks for input #18374

Merged

c64emulator mentioned this pull request Jun 20, 2023

libjasper isn't part of Debian any more ArdescoConsulting/Telramian#8

Open

Uh oh!

Conversation

StefanBruens commented Feb 3, 2020 • edited by alalek Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alalek left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

asmorkalov commented Feb 4, 2020

Uh oh!

alalek commented Feb 4, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

StefanBruens commented Feb 6, 2020

Uh oh!

alalek commented Feb 6, 2020

Uh oh!

StefanBruens commented Feb 6, 2020

Uh oh!

alalek commented Feb 7, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

StefanBruens commented Feb 7, 2020

Uh oh!

asmorkalov commented Feb 20, 2020

Uh oh!

Uh oh!

VadimLevin commented Mar 17, 2020

Uh oh!

alalek left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

alalek Mar 20, 2020

Choose a reason for hiding this comment

Uh oh!

VadimLevin Mar 26, 2020

Choose a reason for hiding this comment

Uh oh!

alalek left a comment

Choose a reason for hiding this comment

Uh oh!

alalek commented Mar 27, 2020

Uh oh!

arogozhnikov commented Mar 31, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

asmorkalov commented Apr 1, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

StefanBruens commented Feb 3, 2020 •

edited by alalek

Loading

alalek commented Feb 7, 2020 •

edited

Loading

arogozhnikov commented Mar 31, 2020 •

edited

Loading