feat(ffmpeg): implement new features of ffmpeg 7 #1040
+286
−3
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
This commit introduces several enhancements to how ffmpeg arguments are generated and processed, particularly with the introduction of support for ffmpeg version 7.0 and above. Key changes include: - Added dependency on `github.com/Masterminds/semver/v3` for semantic version comparison. - Implemented `GetFFmpegVersion` in `pkg/ffmpeg/ffmpeg.go` to fetch the current ffmpeg version. - Utilized `CompareVersions` from `pkg/core/helpers.go` to conditionally modify ffmpeg arguments based on the version check, specifically adding `-filter_threads` for versions 7.0+. - Introduced `MaxCPUThreads` in `pkg/core/helpers.go` to calculate optimal thread usage, which is now used to set `filter_threads` and `filter_complex_threads` parameters dynamically. - Added logging to report the detected ffmpeg version and modifications to default presets based on version checks. - Included unit tests for new helper functions in `pkg/core/helpers_test.go` and `pkg/ffmpeg/ffmpeg_test.go` to ensure correctness of version comparisons and argument adjustments. These changes aim to optimize ffmpeg performance by leveraging version-specific features and improving resource utilization based on system capabilities.
Replaced the use of github.com/Masterminds/semver/v3 with github.com/unascribed/FlexVer/go/flexver for version comparison in `CompareVersions` function within the core package. This change allows handling a broader range of version formats, including those prefixed with letters, by stripping any leading letter before performing the comparison. The update facilitates more flexible version comparison logic that can accommodate various versioning schemes beyond strict semantic versioning. The removal of semver and introduction of FlexVer necessitated updates to both go.mod and go.sum to reflect the dependency changes. Additionally, the `CompareVersions` function has been updated to strip a leading letter from version strings if present before comparing them using flexver.Compare, enabling it to handle versions prefixed with letters indicating special version types or pre-release status. This adjustment enhances the system's ability to compare version strings that may not strictly adhere to semantic versioning, such as those commonly found in certain projects or versioning systems, without compromising on the accuracy of comparisons for standard semantic versions.
Update `CompareVersions` function in `pkg/core/helpers.go` to use `flexver.CompareError` instead of `flexver.Compare`. This change introduces error handling for version comparison, ensuring that any errors encountered during the comparison process are gracefully handled by returning -1. Previously, the function lacked error handling, potentially leading to uncaught exceptions or inaccurate comparisons if `flexver.Compare` encountered an issue. This enhancement improves the reliability and robustness of version comparison logic within the application.
This commit introduces the inclusion of the FFmpeg version in the API response. The changes involve storing the FFmpeg version in a global variable within the application context and ensuring this version is locked alongside other information before responding to API requests. This enhancement aims to provide clients with more detailed system information, facilitating debugging and system monitoring. - A new global variable `FFmpegVersion` is declared in `app.go`, initialized as an empty string. - The FFmpeg version is now fetched and stored in `app.FFmpegVersion` during the initialization process in `ffmpeg.go`. - The `apiHandler` function in `api.go` has been updated to include `app.FFmpegVersion` in its response. This update allows clients to retrieve the FFmpeg version directly from the API, offering greater transparency regarding the server's capabilities and configurations.
This commit updates the index.html to include the FFmpeg version in the information displayed to the user. By extracting the FFmpeg version from the API response and appending it to the innerText of the `.info` element, users can now see the current FFmpeg version alongside the application version and configuration path. This enhancement improves transparency regarding the software versions being used, which can be crucial for debugging purposes or ensuring compatibility with specific media formats.
skrashevich
changed the title
|
I think it's better to leave choosing this value to user via |
|
I think shipping some free optimization for users is very nice. :) |
|
(Only few people understands ffmpeg args, not to mention very few people would know ffmpeg 7+ can use this optimization) |
|
@skrashevich perhaps you should bump ffmpeg in dockerfile too? |
It requires more careful research, as ffmpeg7 partially breaks backward compatibility. |
This commit introduces the ability to manually specify the FFmpeg version within the application's configuration, rather than solely relying on automatic detection. This enhancement facilitates greater control over the application's behavior when working with specific FFmpeg versions, especially in environments where automatic version detection might be unreliable or undesirable. Additionally, a default version ("6.0") is now set in the configuration defaults, ensuring consistent behavior across different setups.
This commit introduces the ability to manually specify the FFmpeg version within the application's configuration, rather than solely relying on automatic detection. This enhancement facilitates greater control over the application's behavior when working with specific FFmpeg versions, especially in environments where automatic version detection might be unreliable or undesirable. Additionally, a default version ("6.0") is now set in the configuration defaults, ensuring consistent behavior across different setups.
skrashevich
commented
May 7, 2024
Comment on lines
+36
to
+40
| if cfg.Mod["version"] == "6.0-default" { | ||
| app.FFmpegVersion, _ = parseArgs("").GetFFmpegVersion() | ||
| } else { | ||
| app.FFmpegVersion = cfg.Mod["version"] | ||
| } |
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.
This pull request introduces support for the new
filter_threadsandfilter_complex_threadsparameters in FFmpeg 7, specifically tailored to improve performance in thego2rtcmodule's handling of video streams. By leveraging enhanced multithreading capabilities, the updated integration optimizes processing speed and efficiency.Highlights
Version Detection and Adaptive Configuration: Implemented FFmpeg version detection to adaptively configure processing parameters. When FFmpeg 7.0 or newer is detected, additional parameters (
-filter_threads,-filter_complex_threads) are employed to improve performance without manual intervention.Codebase Updates:
github.com/Masterminds/semver/v3package to manage semantic versioning more effectively, aiding in the robust comparison of version strings.