New public API pub fn expand_interlaced_row
#495
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
|
Example code that depends on the new API can be seen in http://review.skia.org/894576 |
adetaylor
reviewed
Aug 30, 2024
adetaylor
reviewed
Aug 30, 2024
adetaylor
reviewed
Aug 30, 2024
anforowicz
force-pushed
the
public-expand-interlaced-row-api
branch
from
40bf4e3
to
f6eadd4
Compare
This helps with the following things: * It means that after making `InterlaceInfo` public in a follow-up commit, `pass`, `line`, and `width` fields can remain private. * It means that a follow-up commit that refactors `adam7::expand_pass` to take a single `info` parameter doesn't allow passing an invalid `InterlaceInfo::Null` value. * It gives `Adam7Iterator` a nicer, named `Iterator::Item`.
Instead of passing `line_no` and `pass` as separate parameters, we can pass a single `&Adam7Info` parameter. This minor refactoring helps with: * Exposing a nice public API in a follow-up commit * Depending on `Adam7Info.width` in a follow-up commit
Instead of passing `line_no` and `pass` as separate parameters, we can pass a single `&Adam7Info` parameter. This minor refactoring helps with: * Cleaning up `fn expand_pass` by moving some of its complexity closer to where its needed (within `fn expand_adam7_bits`) * Preparing for changing the semantics of the `width` parameter of `fn expand_adam7_bits` in a follow-up commit, where we will stop depending on `width` for calculating the length of the returned iterator (depending on `Adam7Info.width` instead). See the follow-up commit for more details.
This commit refactors implementation of `expand_adam7_bits` so that it can accept `row_stride_in_bytes` that is different from the expanded width of the frame or image. This is helpful for making `expand_pass` work in scenarios where interlaced row needs to expanded into a bigger image (e.g. if the currently decoded frame is an animation frame that only takes a subregion of the whole image - in this case the stride between expanded rows is bigger than the size of expanded rows). And the above is helpful for exposing `expand_pass` through a public API that will hopefully pass the test of time...
This also exposes supporting items through the public API: `Adam7Info`, `InterlaceInfo`, `InterlacedRow`.
anforowicz
force-pushed
the
public-expand-interlaced-row-api
branch
from
f6eadd4
to
ac04cd3
Compare
HeroicKatora
approved these changes
Sep 9, 2024
|
Can you please hold off with publishing a new version of the This PR adds I'll try to push new commits/changes to the other PR today or tomorrow. |
hubot
pushed a commit
to google/skia
that referenced
this pull request
Sep 12, 2024
This is a clean-up / follow-up for http://review.skia.org/889877 where we implemented `onIncrementalDecode` but only for non-interlaced images. Note that this CL depends on new public APIs in the `png` crate (ones that are not yet present in `png-0.17.13`). Therefore this CL depends on having a post-0.17.3 crate version when building `FFI.rs`: * In the short-term this dependency is fulfilled by patching the crate in https://crrev.com/c/5825297 * In the long-term this dependency will be met by a new release of the `png` crate (the PR at image-rs/image-png#495 hasn't been released yet). Bug: chromium:356923435 Change-Id: I2787c2f5a9b256720e779ea0acc8737c87cee2c3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/894576 Commit-Queue: Łukasz Anforowicz <lukasza@google.com> Reviewed-by: Brian Osman <brianosman@google.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.
Currently users of
Reader.next_interlaced_rowcan't handle interlaced rows without re-implementing significant chunks of thepngcrate. This PR resolves this by exposing a new public API:pub fn expand_interlaced_row+pub enum InterlaceInfo.