Support applying orientation in Convert #4219
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Szymon Karpiński <skarpinski@nvidia.com>
Signed-off-by: Szymon Karpiński <skarpinski@nvidia.com>
staniewzki
reviewed
Sep 2, 2022
dali/imgcodec/util/convert.cc
Outdated
| @@ -25,8 +25,8 @@ namespace imgcodec { | |||
|
|
|||
| void Convert(SampleView<CPUBackend> out, TensorLayout out_layout, DALIImageType out_format, | |||
| ConstSampleView<CPUBackend> in, TensorLayout in_layout, DALIImageType in_format, | |||
| TensorShape<> roi_start, TensorShape<> roi_end) { | |||
| const auto &out_shape = out.shape(); | |||
| TensorShape<> roi_start, TensorShape<> roi_end, Orientation orientation) { | |||
There was a problem hiding this comment.
Suggested change
| TensorShape<> roi_start, TensorShape<> roi_end, Orientation orientation) { | |
| const ROI &roi, Orientation orientation) { |
Adjusting this now that we have the ROI type would be nice.
There was a problem hiding this comment.
Good idea. Done!
Signed-off-by: Szymon Karpiński <skarpinski@nvidia.com>
Signed-off-by: Szymon Karpiński <skarpinski@nvidia.com>
Signed-off-by: Szymon Karpiński <skarpinski@nvidia.com>
klecki
approved these changes
Sep 7, 2022
jantonguirao
approved these changes
Sep 20, 2022
|
!build |
|
CI MESSAGE: [5958642]: BUILD STARTED |
|
CI MESSAGE: [5958656]: BUILD STARTED |
|
CI MESSAGE: [5958642]: BUILD FAILED |
Signed-off-by: Joaquin Anton <janton@nvidia.com>
|
!build |
|
CI MESSAGE: [5958656]: BUILD FAILED |
|
CI MESSAGE: [5958717]: BUILD STARTED |
|
CI MESSAGE: [5958717]: BUILD PASSED |
staniewzki
pushed a commit
to staniewzki/DALI
that referenced
this pull request
Sep 21, 2022
Images may be stored in an orientation other than the actual one and contain a tag (see EXIF orientation) indicating that the image should be transformed (for example rotated) after decoding. In this PR I extend Convert function with an ability to rectify an image according to the orientation information. Additional information: The implemented solution is not the fastest one, but is definitely the simplest: I adjust the strides, sizes and pointer of the output tensor in such a way, that the data is stored there in appropriate order. A function responsible for that is `ApplyOrientation`. Not all decoders use the high-level Convert, some (such as TIFF) use lower-level version. In this case `ApplyOrientation` can be used directly in order to modify the strides, sizes and pointer. Signed-off-by: Szymon Karpiński <skarpinski@nvidia.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Category:
New feature (non-breaking change which adds functionality)
Description:
Images may be stored in an orientation other than the actual one and contain a tag (see EXIF orientation) indicating that the image should be transformed (for example rotated) after decoding.
In this PR I extend
Convertfunction with an ability to rectify an image according to the orientation information.Additional information:
The implemented solution is not the fastest one, but is definetely the simplest: I adjust the strides, sizes and pointer of the output tensor in such a way, that the data is stored there in appropriate order. A function responsible for that is
ApplyOrientation.Not all decoders use the high-level
Convert, some (such as TIFF) use lower-level version. In thiscase
ApplyOrientationcan be used directly in order to modify the strides, sizes and pointer.Affected modules and functionalities:
imgcodec/util/convert*. Another (optional) parameterorientationwas added toConvertKey points relevant for the review:
Tests:
Checklist
Documentation
DALI team only
Requirements
REQ IDs: N/A
JIRA TASK: DALI-2995