Make combination of video + audio streams more robust; fix incompatibility with pyav >= 13.0.0
#3953
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 rewrites the remuxing and combination of the video + audio streams that have been produced throughout
Scene.render
, which is happening in theSceneFileWriter.combine_to_movie
method. The rewritten version now works (at least locally) forpyav >= 12.0.0
, while the previous version apparently only worked forpyav >= 12.0.0, pyav < 13.0.0
.As the RTD render images apparently predominantly had a more recent release of pyav, this is what broke the docbuilld for recent builds.
The rewritten version
mp4
output, instantiating the stream directly from the stream given in the auxiliary audio file broke rendering, so now we instantiate it by passing codec name and sample rate explicitly.