build-aux: Fix incorrect HEVC vertical resolution on AMD VCN #11998
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
tytan652
suggested changes
Mar 25, 2025
build-aux/modules/30-ffmpeg.json
Outdated
Comment on lines
39
to
45
| { | ||
| "type": "patch", | ||
| "paths": [ | ||
| "../modules/patches/ffmpeg/0001-lavc-vaapi_encode-Query-surface-alignment.patch", | ||
| "../modules/patches/ffmpeg/0002-lavc-vaapi_encode_h265-Use-surface-alignment.patch" | ||
| ] | ||
| }, |
There was a problem hiding this comment.
Fix the formatting (only spaces) and look at https://github.com/obsproject/obs-studio/blob/ca762b946047631b74c4217e5d429973eae5856f/build-aux/modules/50-intel-media-sdk.json for path format
There was a problem hiding this comment.
Thanks tytan652. I've fixed the formatting and updated the path syntax with the latest push.
AMD VCN uses a different surface alignment compared to other GPUs for encoding, which required an upstream fix in Mesa, libva, FFmpeg, and the VCN firmware. This commit adds the FFmpeg patches to the flatpak build of OBS which is currently using FFmpeg version n7.1, however the patches were applied upstream after that release. libva API version 1.21 or higher is also required, which is satisfied by using KDE runtime 6.8. The incorrect 1920x1088 HEVC output resolution (instead of 1920x1080) resulted in streaming disconnects for Twitch Enhanced Broadcsating Linux users. Local file recording when using AMD VAAPI HEVC also outputs 1088 instead of 1080. This commit fixes both cases. Please refer to [1], [2], and [3] for context. The patches are taken from [2]. Note that the fix is applicable to flatpak builds only. Standalone and Debian package builds depend on the host library versions and will still have the problem until a version of FFmpeg with the fix is used. [1]: https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=11222 [2]: https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=13168 [3]: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10985
lexano-ivs
force-pushed
the
lexano/amd-vertical-fix
branch
from
2a936e0 to
b6f7d90
Compare
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.
The HEVC VCN encoder in AMD GPUs will output the incorrect vertical resolution in some cases, most importantly 1920x1080 will result in 1920x1088. A workaround for this issue is available in AMF on Windows, however on Linux with VAAPI and Mesa, a different solution is required.
This PR adds 2 upstream FFmpeg commits that have already been merged in FFmpeg
masterto address the incorrect AMF vertical resolution problem, for the flatpak build.Description
Please refer to 1, 2, and 3 for context. The patches are taken from 2.
AMD VCN uses a different surface alignment compared to other GPUs for encoding, which required an upstream fix in Mesa, libva, FFmpeg, and the VCN firmware.
This commit adds the FFmpeg patches to the flatpak build of OBS which is currently using FFmpeg version n7.1, however the patches were applied upstream after that release. libva API version 1.21 or higher is also required, which is satisfied by using KDE runtime 6.8.
Note that the fix is applicable to flatpak builds only. Standalone and Debian package builds depend on the host library versions and will still have the problem until a version of FFmpeg with the fix is used.
Motivation and Context
The incorrect 1920x1088 HEVC output resolution (instead of 1920x1080) resulted in streaming disconnects for Twitch Enhanced Broadcasting Linux users. Local file recording when using AMD VAAPI HEVC also outputs 1088 instead of 1080. This commit fixes both cases.
How Has This Been Tested?
An earlier variant of the patch was tested in the TEB Beta community while Twitch was testing HEVC for 1920x1080p. I have also tested the patches on a local Linux development host and confirmed the output resolution by playing back the stream on Windows and inspecting the bitstream after a capture.
Types of changes
Checklist: