Expose separate rows from PlaneMutSlice #1043
Merged
Conversation
This file contains hidden or 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
rom1v
force-pushed
the
planemutslice
branch
3 times, most recently
from
4d940ba to
633fe00
Compare
Collaborator
|
Landed the cdef fix, needs one more rebase sorry ;_; |
rom1v
force-pushed
the
planemutslice
branch
3 times, most recently
from
b05dc55 to
db53522
Compare
Collaborator
tdaede
reviewed
Feb 27, 2019
src/plane.rs
Outdated
| // cannot directly return self.ps.row(row) due to lifetime issue | ||
| let range = self.ps.slice_range(row); | ||
| Some(&self.ps.plane.data[range]) | ||
| let range = PlaneSlice::slice_range(&self.plane, self.x, self.y); |
Collaborator
There was a problem hiding this comment.
Would it make more sense for slice_range to be a method on plane?
Collaborator
Author
There was a problem hiding this comment.
Yes, you're right. Now that it is refactored that way, it is not related to PlaneSlice anymore.
tdaede
reviewed
Feb 27, 2019
| assert!(dst.len() >= (ysize - 1) * out_stride + xsize); | ||
| assert!(input.len() >= ((ysize + 3) * in_stride + xsize + 4) as usize); | ||
| cdef_filter_block(dst.as_mut_ptr(), | ||
| assert!(out_slice.rows_iter().len() >= (8 * by >> ydec) + ysize); |
Collaborator
There was a problem hiding this comment.
Is there a more direct way to get len() than producing an iterator first?
Collaborator
Author
There was a problem hiding this comment.
Currently, no, but we can add rows_count() (or similar) on PlaneMutSlice.
I did not do that because it's only used in assert!().
Collaborator
There was a problem hiding this comment.
The assert could be a debug_assert!() in case.
Collaborator
Author
There was a problem hiding this comment.
When should we call assert!() vs debug_assert!() in rav1e?
Here, we call an unsafe code using raw pointers, which is undefined if this assertion fails.
Collaborator
There was a problem hiding this comment.
Ideally we can move to debug_assert!() all the cases in which:
- We want to document the behavior, but
- We have tests to make sure we do not break it
- The code isn't user-facing. When it is, I'd keep the assert and document when it could panic.
Make RowsIter depend on Plane instead of PlaneSlice, so that we can reuse it for PlaneMutSlice.
Currently, many functions access rectangular regions of planes (spanning multiple rows) via a primitive slice to the whole plane along with the stride information. This strategy is not compatible with tiling, since this borrows the memory belonging to other tiles. Like for PlaneSlice, add methods to PlaneMutSlice to access rows separately. See <xiph#631 (comment)>.
Implement traits Index and IndexMut to access PlaneMutSlice rows as if
it was a two-dimensional array.
Thay way, we can write:
plane_slice[8][8] = 1;
let row = &mut plane_slice[5];
row[3] = 42;
Add rows_iter() and rows_iter_mut() to iterate over PlaneMutSlice rows.
This will help to use Plane and PlaneSlice in tests.
The function required a multirows slice with stride information, which will become incompatible with PlaneMutSlice. It was already unsafe, so just replace the slice parameter by a raw pointer.
The number of rows to copy in the bottom was incorrect (it used yorigin, which is the number of rows in the "top padding").
Add unit test to make sure we will not break Plane::pad() when we change its implementation not to use PlaneMutSlice.
We have access to the whole underlying buffer from there. This avoids to call methods returning multirows mutable slices from the PlaneMutslice, so we can then remove these methods.
Remove as_mut_slice() and similar methods from PlaneMutSlice which expose slices spanning multiple rows.
tdaede
approved these changes
Feb 28, 2019
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
This PR is to
PlaneMutSlicewhat #1035 was toPlaneSlice.It is written over #1040 (so ignore the first commit).