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.

Sign up for GitHub

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

Jump to bottom

Rework EbmlVoid internals #255

Merged
merged 13 commits into from
Feb 24, 2024
Merged

Rework EbmlVoid internals #255

merged 13 commits into from
Feb 24, 2024

Conversation

robUx4
Copy link
Contributor

@robUx4 robUx4 commented Feb 18, 2024

  • Honor the filtering of elements (void or replacement) that are not allowed to be written.
  • Rework the algorithm to compute the new data size/size length combination of the Void element

@robUx4
cache the size of the Void element after replacement
5d47021 
It won't change after the initial computation.
@robUx4
replace 1 with EBML_ID_LENGTH(Id_EbmlVoid) for better comprehension
627bcea 
It's a constexpr that equals 1.
@robUx4
simplify test to write new (smaller) EbmlVoid
f605f58 
Either it's 0 when we the replacement element fully replaced the EbmlVoid. Or we have a valid size.
@robUx4
cache the size of the elements being replaced
3c6bf6e
@robUx4
use ElementSize() to get the size of the element replacing the Void
abbb283 
It may be filtered out which will result in a size of 0.
@robUx4
return early if the element to replace with has a size of 0
12e5aad 
Return an error since the replacement didn't happen.
The result is used that way in mkvtoolnix.
@robUx4
use ElementSize() to get the size of the element that will be voided
a8c6b40 
Even if it would be filtered out, we want to know its actual size.
@robUx4
cache the original size of the Void element being replaced
f8cd243
@robUx4
move the Void element final size computation in a function
0a0dde3
@robUx4
use helper function to compute the Void header in ReplaceWith()
cc14687
@robUx4
replace calls in SetVoidSize by internal values
bdf1d0c
@robUx4
only set the Size/Size Length on the Void element once it's computed
7d5d83d 
And expand/shrink the values that can be safely changed based on the context.
@robUx4
don't overwrite an element with Void if Void can't be written
cd29958 
The head would not render anyway, so we should return a proper error.
@robUx4 robUx4 requested a review from mbunkus February 18, 2024 14:38
@robUx4 robUx4 mentioned this pull request Feb 18, 2024
Merged
@mbunkus mbunkus merged commit c58256e into Matroska-Org:master Feb 24, 2024
15 checks passed
@robUx4 robUx4 deleted the void_replace branch February 24, 2024 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mbunkus mbunkus mbunkus approved these changes

Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@robUx4 @mbunkus