Update FFmpeg to 7.0.1 #406
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
The nvidia test suite was never run after livepeer#393 so this breakage was not noticed.
* Set the encoder timebase using AVCodecContext.framerate instead of the decoder's AVCodecContext.time_base. The use of AVCodecContext.time_base is deprecated for decoding. See https://ffmpeg.org/doxygen/3.3/structAVCodecContext.html#ab7bfeb9fa5840aac090e2b0bd0ef7589 * Adjust the packet timebase as necessary for FPS pass through to match the encoder's expected timebase. For filtergraphs using FPS adjustment, the filtergraph output timebase will match the framerate (1 / framerate) and the encoder is configured for the same. However, for FPS pass through, the filtergraph's output timebase will match the input timebase (since there is no FPS adjustment) while the encoder uses the timebase detected from the decoder's framerate. Since the input timebase does not typically match the FPS (eg 90khz for mpegts vs 30fps), we need to adjust the packet timestamps (in container timebase) to the encoder's expected timebase. * For the specific case of FPS passthrough, preserve the original PTS as much as possible since we are trying to re-encode existing frames one-to-one. Use the opaque field for this, since it is already being populated with the original PTS to detect sentinel packets during flushing. Without this, timestamps can be slightly "squashed" down when rescaling output packets to the muxer's timebase, due to the loss of precision (eg, demuxer 90khz -> encoder 30hz -> muxer 90khz)
emranemran
approved these changes
Jul 10, 2024
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #406 +/- ##
===================================================
+ Coverage 49.88901% 50.20216% +0.31315%
===================================================
Files 12 12
Lines 1802 1484 -318
===================================================
- Hits 899 745 -154
+ Misses 852 689 -163
+ Partials 51 50 -1 see 12 files with indirect coverage changes Continue to review full report in Codecov by Sentry.
|
Closed
Closed
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.
Updates to the latest ffmpeg release (7.0.1) and adjust unit tests to match some slightly changed behaviors in the CLI that is used for testing. This also uncovered a bug that was fixed as described in #405 but is also included in this PR (see commit message).
The unit tests all pass with zero timestamp adjustments, so this update should be reasonably backwards-compatible with older LPMS. In fact, the updated LPMS transcoder still passes the full test suite even when the test suite is running the old ffmpeg CLI. The unit test changes are only there to make the tests pass when running with the new CLI, mostly changes in a few ffprobe fields and command-line options.
Commits
Pre-Merge
n7.0.1-livepeerbranch, updateinstall_ffmpeg.shin this PR if necessary - fixup with fbbd746Post-Merge
install_ffmpeg.shto point to the LPMS script