Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix support for ANY_DATA in nvJPEG2K #4299

Merged
merged 2 commits into from
Sep 30, 2022

Conversation

szkarpinski
Copy link
Collaborator

Category:

Bug fix (non-breaking change which fixes an issue)

Description:

nvJPEG2K decoder was requesting unsupported conversion to ANY_DATA from the color conversion kernel. In this PR I adjust the decoder so that it doesn't attempt to convert colorspace in such case

Additional information:

Affected modules and functionalities:

Key points relevant for the review:

Tests:

  • Existing tests apply
  • New tests added
    • Python tests
    • GTests
    • Benchmark
    • Other
  • N/A

Checklist

Documentation

  • Existing documentation applies
  • Documentation updated
    • Docstring
    • Doxygen
    • RST
    • Jupyter
    • Other
  • N/A

DALI team only

Requirements

  • Implements new requirements
  • Affects existing requirements
  • N/A

REQ IDs: N/A

JIRA TASK: N/A

Signed-off-by: Szymon Karpiński <skarpinski@nvidia.com>
@mzient mzient self-assigned this Sep 29, 2022
@szkarpinski szkarpinski mentioned this pull request Sep 29, 2022
18 tasks
auto multiplier = calc_bpp_adjustment_multiplier(ctx.bpp, ctx.pixel_type);
Convert(out, "HWC", opts.format, decode_out, "CHW", format, ctx.cuda_stream,
Convert(out, "HWC", out_format, decode_out, "CHW", format, ctx.cuda_stream,
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we handle this inside Convert? Doing something like:

if (out_format == DALI_ANY_DATA) {
    out_format = in_format;
}

This way we handle it for all decoders, not only nvJPEG2k

@jantonguirao jantonguirao self-assigned this Sep 30, 2022
Signed-off-by: Joaquin Anton <janton@nvidia.com>
@jantonguirao
Copy link
Contributor

!build

@dali-automaton
Copy link
Collaborator

CI MESSAGE: [6053302]: BUILD STARTED

@dali-automaton
Copy link
Collaborator

CI MESSAGE: [6053302]: BUILD PASSED

@jantonguirao jantonguirao merged commit b5230a3 into NVIDIA:main Sep 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants