AppImage: add needed VA-API libraries (Intel & AMD) - #2429

Merged
ReenigneArcher merged 3 commits into
LizardByte:nightlyfrom
gschintgen:fix-appimage-vaapi
May 13, 2024
Merged

AppImage: add needed VA-API libraries (Intel & AMD)#2429
ReenigneArcher merged 3 commits into
LizardByte:nightlyfrom
gschintgen:fix-appimage-vaapi

Conversation

@gschintgen

@gschintgengschintgen commented Apr 16, 2024

Copy link
Copy Markdown
Contributor

Description

Currently VA-API encoding may/will fail when the AppImage is used. This seems to be because of a mismatch between the bundled libva.so and the system's /usr/lib/*/dri/*_drv_video.so driver libraries. Since this is a rather important functionality the necessary libraries are now bundled in the AppImage itself in a relatively recent version. This PR changes the AppImage build process in order to include a recent libva version. This should fix VA-API issues for Intel and AMD based systems. I left out nouveau_drv_video.so since I'm somewhat skeptical of its encoding capabilities. (Please tell me if I'm wrong...)

I tested this PR on an older Intel-based laptop (Ubuntu 22.04, i965 driver) / on my main AMDGPU-based desktop. It's working fine for me.

Screenshot

Issues Fixed or Closed

See #2409 (but does not fix it since Flatpak is untouched)

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

Comment thread.github/workflows/CI.yml Outdated
# allow newer gcc
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
# use a recent Mesa version
sudo add-apt-repository ppa:kisak/kisak-mesa -y

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see the repo added, but what package is coming from here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for asking. I added a comment giving a few more details. Here's the complete list as extracted from the CI build logs:

libwayland-server0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libwayland-bin (1.20.0-1ubuntu0.1~kisak~f)
libva2:amd64 (2.14.0-1~kisak1~f)
libglapi-mesa:amd64 (24.0.5~kisak1~f)
libvdpau1:amd64 (1.4-3build2~kisak~f)
libllvm15:amd64 (1:15.0.7-10~kisak1~f)
libwayland-egl1:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libvdpau-dev:amd64 (1.4-3build2~kisak~f)
libdrm-common (2.4.120-1~kisak~f)
libwayland-client0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libdrm2:amd64 (2.4.120-1~kisak~f)
libva-drm2:amd64 (2.14.0-1~kisak1~f)
libwayland-cursor0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libva-x11-2:amd64 (2.14.0-1~kisak1~f)
libva-glx2:amd64 (2.14.0-1~kisak1~f)
libdrm-amdgpu1:amd64 (2.4.120-1~kisak~f)
libdrm-nouveau2:amd64 (2.4.120-1~kisak~f)
libgbm1:amd64 (24.0.5~kisak1~f)
libdrm-radeon1:amd64 (2.4.120-1~kisak~f)
libdrm-intel1:amd64 (2.4.120-1~kisak~f)
libgl1-mesa-dri:amd64 (24.0.5~kisak1~f)
libwayland-dev:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libgbm-dev:amd64 (24.0.5~kisak1~f)
libegl-mesa0:amd64 (24.0.5~kisak1~f)
libva-wayland2:amd64 (2.14.0-1~kisak1~f)
mesa-va-drivers:amd64 (24.0.5~kisak1~f)
mesa-vdpau-drivers:amd64 (24.0.5~kisak1~f)
libdrm-dev:amd64 (2.4.120-1~kisak~f)
libglx-mesa0:amd64 (24.0.5~kisak1~f)
libva-dev:amd64 (2.14.0-1~kisak1~f)
va-driver-all:amd64 (2.14.0-1~kisak1~f)
vdpau-driver-all:amd64 (1.4-3build2~kisak~f)
libgl1-mesa-dev:amd64 (24.0.5~kisak1~f)
libegl1-mesa-dev:amd64 (24.0.5~kisak1~f)

It's quite an update over 20.04's mesa; some testing can't hurt.

Comment threadpackaging/linux/AppImage/AppRun Outdated
@codecov

codecovBot commented Apr 16, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 6.80%. Comparing base (0a595dc) to head (7451cc0).

Additional details and impacted files
@@ Coverage Diff @@## nightly #2429 +/- ##
==========================================
- Coverage 6.99% 6.80% -0.20% 
==========================================
Files 87 87 Lines 17679 17672 -7 Branches 8399 8399 ==========================================
- Hits 1237 1202 -35 + Misses 13867 13833 -34 - Partials 2575 2637 +62 
FlagCoverage Δ
Linux5.34% <ø> (ø)
Windows2.56% <ø> (ø)
macOS-12?
macOS-137.91% <ø> (+0.01%)⬆️
macOS-14?

Flags with carried forward coverage won't be shown. Click here to find out more.

see 32 files with indirect coverage changes

@gschintgen
gschintgen marked this pull request as draft April 17, 2024 20:32
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I'm marking the PR as draft as long as there are unresolved issues with AMD GPUs. (See #2409 (comment))

Comment thread.github/workflows/CI.yml Outdated

@cgutmancgutman left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The way VA-API's backwards compatibility guarantees work is that the version of libva.so at runtime must be >= the version of libva that the driver (_drv_video.so) was compiled against. This is done via looking up a __vaDriverInit function that is decorated with the compile-time version number of VA-API.

For example, libva.so 2.19 wil look for __vaDriverInit_1_19(), then __vaDriverInit_1_18(), __vaDriverInit_1_17() and so on. So drivers built with any version equal or less than 2.19 will work, but a driver built for libva 2.20 (which only has __vaDriverInit_1_20()) will not work.

Due to this backwards compatibilty guarantee, essentially all we need to do for optimal compatibility is bundle whatever is the latest version of libva.so (currently 2.21) into the AppImage (this is also what Moonlight does). I don't think we should be bundling the _drv_video.so files because I think those have dependencies on Mesa and could break if we run them with a different version of Mesa than they were built as part of.

@gschintgen

Copy link
Copy Markdown
ContributorAuthor

essentially all we need to do for optimal compatibility is bundle whatever is the latest version of libva.so (currently 2.21)

Thanks for your insightful and helpful comment! I've added changes to use the latest libva (from a PPA), but leaving out the *_drv_video.so. Let's see how it goes.

@ReenigneArcherReenigneArcher removed this from the v0.23.1 milestone Apr 21, 2024
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

Oh well, the kisak-mesa PPA only has libva at version 2.14 instead of a more recent one. I guess for optimal support we'll have to build it ourselves. (That is if the latest versions of libva are compatible with a 4 year old distribution.)

I'll play around with it but it could take some time.

@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I force-pushed a new change overwriting the previous PR contents. This time we're building our own copy of the latest libva but we're using the host system's VA-API drivers. (Thanks cgutman )

On my own fork I've already tested the resulting AppImage and it is working fine on my system (cursory testing of remote desktop):

libva info: VA-API version 1.22.0
libva info: Trying to open /usr/lib/x86_64-linux-gnu/dri/radeonsi_drv_video.so
libva info: Found init function __vaDriverInit_1_14
libva info: va_openDriver() returns 0
[2024:04:23:16:54:30]: Warning: [hevc_vaapi @ 0x564a9a4d1380] Driver does not support some wanted packed headers (wanted 0xd, found 0x1).
[2024:04:23:16:54:30]: Info: [2024:04:23:16:54:30]: Info: // Ignore any errors mentioned above, they are not relevant. //
[2024:04:23:16:54:30]: Info: [2024:04:23:16:54:30]: Info: Found H.264 encoder: h264_vaapi [vaapi]
[2024:04:23:16:54:30]: Info: Found HEVC encoder: hevc_vaapi [vaapi]

Comment thread.github/workflows/CI.yml Outdated
@gschintgen
gschintgen marked this pull request as ready for review April 25, 2024 11:35
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I see that in the meantime the AppImage has been upgraded from Ubuntu 20.04 to 22.04. I don't think that change invalidates the logic behind this PR. I rebased to fix a minor merge conflict.

Comment thread.github/workflows/CI.yml Outdated
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

Are there any merge blockers for this PR? I think for supported distributions this should work fine and fix the initial issue. (Which I can confirm on my own system.)

The CI failures seem to be independent of the PR. For example the Analyze (cpp, ubuntu-latest) fails due to this:

/root/cuda.run 100%[===================>] 4.04G 75.3MB/s in 55s terminate called after throwing an instance of 'boost::filesystem::filesystem_error'
what(): boost::filesystem::copy_file: No space left on device: "./builds/nsight_systems/documentation/pdf/UserGuide.pdf", "/usr/nsight-systems-2022.4.2/documentation/pdf/UserGuide.pdf"

cuda is huge!?

@ReenigneArcher

Copy link
Copy Markdown
Member

cuda is huge!?

Basically yea. GitHub modifies runners from time to time and it causes out of space failures. I tried to fix it in #2475 but it didn't work.

@ReenigneArcher
ReenigneArcher merged commit a5bbf36 into LizardByte:nightlyMay 13, 2024
@gschintgen
gschintgen deleted the fix-appimage-vaapi branch May 13, 2024 13:04
KuleRucket pushed a commit to KuleRucket/Sunshine that referenced this pull request Jun 6, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@gschintgen@ReenigneArcher@cgutman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

AppImage: add needed VA-API libraries (Intel & AMD) - #2429

Merged
ReenigneArcher merged 3 commits into
LizardByte:nightlyfrom
gschintgen:fix-appimage-vaapi
May 13, 2024
Merged

AppImage: add needed VA-API libraries (Intel & AMD)#2429
ReenigneArcher merged 3 commits into
LizardByte:nightlyfrom
gschintgen:fix-appimage-vaapi

Conversation

@gschintgen

@gschintgengschintgen commented Apr 16, 2024

Copy link
Copy Markdown
Contributor

Description

Currently VA-API encoding may/will fail when the AppImage is used. This seems to be because of a mismatch between the bundled libva.so and the system's /usr/lib/*/dri/*_drv_video.so driver libraries. Since this is a rather important functionality the necessary libraries are now bundled in the AppImage itself in a relatively recent version. This PR changes the AppImage build process in order to include a recent libva version. This should fix VA-API issues for Intel and AMD based systems. I left out nouveau_drv_video.so since I'm somewhat skeptical of its encoding capabilities. (Please tell me if I'm wrong...)

I tested this PR on an older Intel-based laptop (Ubuntu 22.04, i965 driver) / on my main AMDGPU-based desktop. It's working fine for me.

Screenshot

Issues Fixed or Closed

See #2409 (but does not fix it since Flatpak is untouched)

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

Comment thread.github/workflows/CI.yml Outdated
# allow newer gcc
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
# use a recent Mesa version
sudo add-apt-repository ppa:kisak/kisak-mesa -y

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see the repo added, but what package is coming from here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for asking. I added a comment giving a few more details. Here's the complete list as extracted from the CI build logs:

libwayland-server0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libwayland-bin (1.20.0-1ubuntu0.1~kisak~f)
libva2:amd64 (2.14.0-1~kisak1~f)
libglapi-mesa:amd64 (24.0.5~kisak1~f)
libvdpau1:amd64 (1.4-3build2~kisak~f)
libllvm15:amd64 (1:15.0.7-10~kisak1~f)
libwayland-egl1:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libvdpau-dev:amd64 (1.4-3build2~kisak~f)
libdrm-common (2.4.120-1~kisak~f)
libwayland-client0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libdrm2:amd64 (2.4.120-1~kisak~f)
libva-drm2:amd64 (2.14.0-1~kisak1~f)
libwayland-cursor0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libva-x11-2:amd64 (2.14.0-1~kisak1~f)
libva-glx2:amd64 (2.14.0-1~kisak1~f)
libdrm-amdgpu1:amd64 (2.4.120-1~kisak~f)
libdrm-nouveau2:amd64 (2.4.120-1~kisak~f)
libgbm1:amd64 (24.0.5~kisak1~f)
libdrm-radeon1:amd64 (2.4.120-1~kisak~f)
libdrm-intel1:amd64 (2.4.120-1~kisak~f)
libgl1-mesa-dri:amd64 (24.0.5~kisak1~f)
libwayland-dev:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libgbm-dev:amd64 (24.0.5~kisak1~f)
libegl-mesa0:amd64 (24.0.5~kisak1~f)
libva-wayland2:amd64 (2.14.0-1~kisak1~f)
mesa-va-drivers:amd64 (24.0.5~kisak1~f)
mesa-vdpau-drivers:amd64 (24.0.5~kisak1~f)
libdrm-dev:amd64 (2.4.120-1~kisak~f)
libglx-mesa0:amd64 (24.0.5~kisak1~f)
libva-dev:amd64 (2.14.0-1~kisak1~f)
va-driver-all:amd64 (2.14.0-1~kisak1~f)
vdpau-driver-all:amd64 (1.4-3build2~kisak~f)
libgl1-mesa-dev:amd64 (24.0.5~kisak1~f)
libegl1-mesa-dev:amd64 (24.0.5~kisak1~f)

It's quite an update over 20.04's mesa; some testing can't hurt.

Comment threadpackaging/linux/AppImage/AppRun Outdated
@codecov

codecovBot commented Apr 16, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 6.80%. Comparing base (0a595dc) to head (7451cc0).

Additional details and impacted files
@@ Coverage Diff @@## nightly #2429 +/- ##
==========================================
- Coverage 6.99% 6.80% -0.20% 
==========================================
Files 87 87 Lines 17679 17672 -7 Branches 8399 8399 ==========================================
- Hits 1237 1202 -35 + Misses 13867 13833 -34 - Partials 2575 2637 +62 
FlagCoverage Δ
Linux5.34% <ø> (ø)
Windows2.56% <ø> (ø)
macOS-12?
macOS-137.91% <ø> (+0.01%)⬆️
macOS-14?

Flags with carried forward coverage won't be shown. Click here to find out more.

see 32 files with indirect coverage changes

@gschintgen
gschintgen marked this pull request as draft April 17, 2024 20:32
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I'm marking the PR as draft as long as there are unresolved issues with AMD GPUs. (See #2409 (comment))

Comment thread.github/workflows/CI.yml Outdated

@cgutmancgutman left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The way VA-API's backwards compatibility guarantees work is that the version of libva.so at runtime must be >= the version of libva that the driver (_drv_video.so) was compiled against. This is done via looking up a __vaDriverInit function that is decorated with the compile-time version number of VA-API.

For example, libva.so 2.19 wil look for __vaDriverInit_1_19(), then __vaDriverInit_1_18(), __vaDriverInit_1_17() and so on. So drivers built with any version equal or less than 2.19 will work, but a driver built for libva 2.20 (which only has __vaDriverInit_1_20()) will not work.

Due to this backwards compatibilty guarantee, essentially all we need to do for optimal compatibility is bundle whatever is the latest version of libva.so (currently 2.21) into the AppImage (this is also what Moonlight does). I don't think we should be bundling the _drv_video.so files because I think those have dependencies on Mesa and could break if we run them with a different version of Mesa than they were built as part of.

@gschintgen

Copy link
Copy Markdown
ContributorAuthor

essentially all we need to do for optimal compatibility is bundle whatever is the latest version of libva.so (currently 2.21)

Thanks for your insightful and helpful comment! I've added changes to use the latest libva (from a PPA), but leaving out the *_drv_video.so. Let's see how it goes.

@ReenigneArcherReenigneArcher removed this from the v0.23.1 milestone Apr 21, 2024
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

Oh well, the kisak-mesa PPA only has libva at version 2.14 instead of a more recent one. I guess for optimal support we'll have to build it ourselves. (That is if the latest versions of libva are compatible with a 4 year old distribution.)

I'll play around with it but it could take some time.

@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I force-pushed a new change overwriting the previous PR contents. This time we're building our own copy of the latest libva but we're using the host system's VA-API drivers. (Thanks cgutman )

On my own fork I've already tested the resulting AppImage and it is working fine on my system (cursory testing of remote desktop):

libva info: VA-API version 1.22.0
libva info: Trying to open /usr/lib/x86_64-linux-gnu/dri/radeonsi_drv_video.so
libva info: Found init function __vaDriverInit_1_14
libva info: va_openDriver() returns 0
[2024:04:23:16:54:30]: Warning: [hevc_vaapi @ 0x564a9a4d1380] Driver does not support some wanted packed headers (wanted 0xd, found 0x1).
[2024:04:23:16:54:30]: Info: [2024:04:23:16:54:30]: Info: // Ignore any errors mentioned above, they are not relevant. //
[2024:04:23:16:54:30]: Info: [2024:04:23:16:54:30]: Info: Found H.264 encoder: h264_vaapi [vaapi]
[2024:04:23:16:54:30]: Info: Found HEVC encoder: hevc_vaapi [vaapi]

Comment thread.github/workflows/CI.yml Outdated
@gschintgen
gschintgen marked this pull request as ready for review April 25, 2024 11:35
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I see that in the meantime the AppImage has been upgraded from Ubuntu 20.04 to 22.04. I don't think that change invalidates the logic behind this PR. I rebased to fix a minor merge conflict.

Comment thread.github/workflows/CI.yml Outdated
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

Are there any merge blockers for this PR? I think for supported distributions this should work fine and fix the initial issue. (Which I can confirm on my own system.)

The CI failures seem to be independent of the PR. For example the Analyze (cpp, ubuntu-latest) fails due to this:

/root/cuda.run 100%[===================>] 4.04G 75.3MB/s in 55s terminate called after throwing an instance of 'boost::filesystem::filesystem_error'
what(): boost::filesystem::copy_file: No space left on device: "./builds/nsight_systems/documentation/pdf/UserGuide.pdf", "/usr/nsight-systems-2022.4.2/documentation/pdf/UserGuide.pdf"

cuda is huge!?

@ReenigneArcher

Copy link
Copy Markdown
Member

cuda is huge!?

Basically yea. GitHub modifies runners from time to time and it causes out of space failures. I tried to fix it in #2475 but it didn't work.

@ReenigneArcher
ReenigneArcher merged commit a5bbf36 into LizardByte:nightlyMay 13, 2024
@gschintgen
gschintgen deleted the fix-appimage-vaapi branch May 13, 2024 13:04
KuleRucket pushed a commit to KuleRucket/Sunshine that referenced this pull request Jun 6, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@gschintgen@ReenigneArcher@cgutman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

AppImage: add needed VA-API libraries (Intel & AMD) - #2429

Merged
ReenigneArcher merged 3 commits into
LizardByte:nightlyfrom
gschintgen:fix-appimage-vaapi
May 13, 2024
Merged

AppImage: add needed VA-API libraries (Intel & AMD)#2429
ReenigneArcher merged 3 commits into
LizardByte:nightlyfrom
gschintgen:fix-appimage-vaapi

Conversation

@gschintgen

@gschintgengschintgen commented Apr 16, 2024

Copy link
Copy Markdown
Contributor

Description

Currently VA-API encoding may/will fail when the AppImage is used. This seems to be because of a mismatch between the bundled libva.so and the system's /usr/lib/*/dri/*_drv_video.so driver libraries. Since this is a rather important functionality the necessary libraries are now bundled in the AppImage itself in a relatively recent version. This PR changes the AppImage build process in order to include a recent libva version. This should fix VA-API issues for Intel and AMD based systems. I left out nouveau_drv_video.so since I'm somewhat skeptical of its encoding capabilities. (Please tell me if I'm wrong...)

I tested this PR on an older Intel-based laptop (Ubuntu 22.04, i965 driver) / on my main AMDGPU-based desktop. It's working fine for me.

Screenshot

Issues Fixed or Closed

See #2409 (but does not fix it since Flatpak is untouched)

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

Comment thread.github/workflows/CI.yml Outdated
# allow newer gcc
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
# use a recent Mesa version
sudo add-apt-repository ppa:kisak/kisak-mesa -y

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see the repo added, but what package is coming from here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for asking. I added a comment giving a few more details. Here's the complete list as extracted from the CI build logs:

libwayland-server0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libwayland-bin (1.20.0-1ubuntu0.1~kisak~f)
libva2:amd64 (2.14.0-1~kisak1~f)
libglapi-mesa:amd64 (24.0.5~kisak1~f)
libvdpau1:amd64 (1.4-3build2~kisak~f)
libllvm15:amd64 (1:15.0.7-10~kisak1~f)
libwayland-egl1:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libvdpau-dev:amd64 (1.4-3build2~kisak~f)
libdrm-common (2.4.120-1~kisak~f)
libwayland-client0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libdrm2:amd64 (2.4.120-1~kisak~f)
libva-drm2:amd64 (2.14.0-1~kisak1~f)
libwayland-cursor0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libva-x11-2:amd64 (2.14.0-1~kisak1~f)
libva-glx2:amd64 (2.14.0-1~kisak1~f)
libdrm-amdgpu1:amd64 (2.4.120-1~kisak~f)
libdrm-nouveau2:amd64 (2.4.120-1~kisak~f)
libgbm1:amd64 (24.0.5~kisak1~f)
libdrm-radeon1:amd64 (2.4.120-1~kisak~f)
libdrm-intel1:amd64 (2.4.120-1~kisak~f)
libgl1-mesa-dri:amd64 (24.0.5~kisak1~f)
libwayland-dev:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libgbm-dev:amd64 (24.0.5~kisak1~f)
libegl-mesa0:amd64 (24.0.5~kisak1~f)
libva-wayland2:amd64 (2.14.0-1~kisak1~f)
mesa-va-drivers:amd64 (24.0.5~kisak1~f)
mesa-vdpau-drivers:amd64 (24.0.5~kisak1~f)
libdrm-dev:amd64 (2.4.120-1~kisak~f)
libglx-mesa0:amd64 (24.0.5~kisak1~f)
libva-dev:amd64 (2.14.0-1~kisak1~f)
va-driver-all:amd64 (2.14.0-1~kisak1~f)
vdpau-driver-all:amd64 (1.4-3build2~kisak~f)
libgl1-mesa-dev:amd64 (24.0.5~kisak1~f)
libegl1-mesa-dev:amd64 (24.0.5~kisak1~f)

It's quite an update over 20.04's mesa; some testing can't hurt.

Comment threadpackaging/linux/AppImage/AppRun Outdated
@codecov

codecovBot commented Apr 16, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 6.80%. Comparing base (0a595dc) to head (7451cc0).

Additional details and impacted files
@@ Coverage Diff @@## nightly #2429 +/- ##
==========================================
- Coverage 6.99% 6.80% -0.20% 
==========================================
Files 87 87 Lines 17679 17672 -7 Branches 8399 8399 ==========================================
- Hits 1237 1202 -35 + Misses 13867 13833 -34 - Partials 2575 2637 +62 
FlagCoverage Δ
Linux5.34% <ø> (ø)
Windows2.56% <ø> (ø)
macOS-12?
macOS-137.91% <ø> (+0.01%)⬆️
macOS-14?

Flags with carried forward coverage won't be shown. Click here to find out more.

see 32 files with indirect coverage changes

@gschintgen
gschintgen marked this pull request as draft April 17, 2024 20:32
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I'm marking the PR as draft as long as there are unresolved issues with AMD GPUs. (See #2409 (comment))

Comment thread.github/workflows/CI.yml Outdated

@cgutmancgutman left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The way VA-API's backwards compatibility guarantees work is that the version of libva.so at runtime must be >= the version of libva that the driver (_drv_video.so) was compiled against. This is done via looking up a __vaDriverInit function that is decorated with the compile-time version number of VA-API.

For example, libva.so 2.19 wil look for __vaDriverInit_1_19(), then __vaDriverInit_1_18(), __vaDriverInit_1_17() and so on. So drivers built with any version equal or less than 2.19 will work, but a driver built for libva 2.20 (which only has __vaDriverInit_1_20()) will not work.

Due to this backwards compatibilty guarantee, essentially all we need to do for optimal compatibility is bundle whatever is the latest version of libva.so (currently 2.21) into the AppImage (this is also what Moonlight does). I don't think we should be bundling the _drv_video.so files because I think those have dependencies on Mesa and could break if we run them with a different version of Mesa than they were built as part of.

@gschintgen

Copy link
Copy Markdown
ContributorAuthor

essentially all we need to do for optimal compatibility is bundle whatever is the latest version of libva.so (currently 2.21)

Thanks for your insightful and helpful comment! I've added changes to use the latest libva (from a PPA), but leaving out the *_drv_video.so. Let's see how it goes.

@ReenigneArcherReenigneArcher removed this from the v0.23.1 milestone Apr 21, 2024
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

Oh well, the kisak-mesa PPA only has libva at version 2.14 instead of a more recent one. I guess for optimal support we'll have to build it ourselves. (That is if the latest versions of libva are compatible with a 4 year old distribution.)

I'll play around with it but it could take some time.

@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I force-pushed a new change overwriting the previous PR contents. This time we're building our own copy of the latest libva but we're using the host system's VA-API drivers. (Thanks cgutman )

On my own fork I've already tested the resulting AppImage and it is working fine on my system (cursory testing of remote desktop):

libva info: VA-API version 1.22.0
libva info: Trying to open /usr/lib/x86_64-linux-gnu/dri/radeonsi_drv_video.so
libva info: Found init function __vaDriverInit_1_14
libva info: va_openDriver() returns 0
[2024:04:23:16:54:30]: Warning: [hevc_vaapi @ 0x564a9a4d1380] Driver does not support some wanted packed headers (wanted 0xd, found 0x1).
[2024:04:23:16:54:30]: Info: [2024:04:23:16:54:30]: Info: // Ignore any errors mentioned above, they are not relevant. //
[2024:04:23:16:54:30]: Info: [2024:04:23:16:54:30]: Info: Found H.264 encoder: h264_vaapi [vaapi]
[2024:04:23:16:54:30]: Info: Found HEVC encoder: hevc_vaapi [vaapi]

Comment thread.github/workflows/CI.yml Outdated
@gschintgen
gschintgen marked this pull request as ready for review April 25, 2024 11:35
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I see that in the meantime the AppImage has been upgraded from Ubuntu 20.04 to 22.04. I don't think that change invalidates the logic behind this PR. I rebased to fix a minor merge conflict.

Comment thread.github/workflows/CI.yml Outdated
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

Are there any merge blockers for this PR? I think for supported distributions this should work fine and fix the initial issue. (Which I can confirm on my own system.)

The CI failures seem to be independent of the PR. For example the Analyze (cpp, ubuntu-latest) fails due to this:

/root/cuda.run 100%[===================>] 4.04G 75.3MB/s in 55s terminate called after throwing an instance of 'boost::filesystem::filesystem_error'
what(): boost::filesystem::copy_file: No space left on device: "./builds/nsight_systems/documentation/pdf/UserGuide.pdf", "/usr/nsight-systems-2022.4.2/documentation/pdf/UserGuide.pdf"

cuda is huge!?

@ReenigneArcher

Copy link
Copy Markdown
Member

cuda is huge!?

Basically yea. GitHub modifies runners from time to time and it causes out of space failures. I tried to fix it in #2475 but it didn't work.

@ReenigneArcher
ReenigneArcher merged commit a5bbf36 into LizardByte:nightlyMay 13, 2024
@gschintgen
gschintgen deleted the fix-appimage-vaapi branch May 13, 2024 13:04
KuleRucket pushed a commit to KuleRucket/Sunshine that referenced this pull request Jun 6, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@gschintgen@ReenigneArcher@cgutman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

AppImage: add needed VA-API libraries (Intel & AMD) - #2429

Merged
ReenigneArcher merged 3 commits into
LizardByte:nightlyfrom
gschintgen:fix-appimage-vaapi
May 13, 2024
Merged

AppImage: add needed VA-API libraries (Intel & AMD)#2429
ReenigneArcher merged 3 commits into
LizardByte:nightlyfrom
gschintgen:fix-appimage-vaapi

Conversation

@gschintgen

@gschintgengschintgen commented Apr 16, 2024

Copy link
Copy Markdown
Contributor

Description

Currently VA-API encoding may/will fail when the AppImage is used. This seems to be because of a mismatch between the bundled libva.so and the system's /usr/lib/*/dri/*_drv_video.so driver libraries. Since this is a rather important functionality the necessary libraries are now bundled in the AppImage itself in a relatively recent version. This PR changes the AppImage build process in order to include a recent libva version. This should fix VA-API issues for Intel and AMD based systems. I left out nouveau_drv_video.so since I'm somewhat skeptical of its encoding capabilities. (Please tell me if I'm wrong...)

I tested this PR on an older Intel-based laptop (Ubuntu 22.04, i965 driver) / on my main AMDGPU-based desktop. It's working fine for me.

Screenshot

Issues Fixed or Closed

See #2409 (but does not fix it since Flatpak is untouched)

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

Comment thread.github/workflows/CI.yml Outdated
# allow newer gcc
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
# use a recent Mesa version
sudo add-apt-repository ppa:kisak/kisak-mesa -y

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see the repo added, but what package is coming from here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for asking. I added a comment giving a few more details. Here's the complete list as extracted from the CI build logs:

libwayland-server0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libwayland-bin (1.20.0-1ubuntu0.1~kisak~f)
libva2:amd64 (2.14.0-1~kisak1~f)
libglapi-mesa:amd64 (24.0.5~kisak1~f)
libvdpau1:amd64 (1.4-3build2~kisak~f)
libllvm15:amd64 (1:15.0.7-10~kisak1~f)
libwayland-egl1:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libvdpau-dev:amd64 (1.4-3build2~kisak~f)
libdrm-common (2.4.120-1~kisak~f)
libwayland-client0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libdrm2:amd64 (2.4.120-1~kisak~f)
libva-drm2:amd64 (2.14.0-1~kisak1~f)
libwayland-cursor0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libva-x11-2:amd64 (2.14.0-1~kisak1~f)
libva-glx2:amd64 (2.14.0-1~kisak1~f)
libdrm-amdgpu1:amd64 (2.4.120-1~kisak~f)
libdrm-nouveau2:amd64 (2.4.120-1~kisak~f)
libgbm1:amd64 (24.0.5~kisak1~f)
libdrm-radeon1:amd64 (2.4.120-1~kisak~f)
libdrm-intel1:amd64 (2.4.120-1~kisak~f)
libgl1-mesa-dri:amd64 (24.0.5~kisak1~f)
libwayland-dev:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libgbm-dev:amd64 (24.0.5~kisak1~f)
libegl-mesa0:amd64 (24.0.5~kisak1~f)
libva-wayland2:amd64 (2.14.0-1~kisak1~f)
mesa-va-drivers:amd64 (24.0.5~kisak1~f)
mesa-vdpau-drivers:amd64 (24.0.5~kisak1~f)
libdrm-dev:amd64 (2.4.120-1~kisak~f)
libglx-mesa0:amd64 (24.0.5~kisak1~f)
libva-dev:amd64 (2.14.0-1~kisak1~f)
va-driver-all:amd64 (2.14.0-1~kisak1~f)
vdpau-driver-all:amd64 (1.4-3build2~kisak~f)
libgl1-mesa-dev:amd64 (24.0.5~kisak1~f)
libegl1-mesa-dev:amd64 (24.0.5~kisak1~f)

It's quite an update over 20.04's mesa; some testing can't hurt.

Comment threadpackaging/linux/AppImage/AppRun Outdated
@codecov

codecovBot commented Apr 16, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 6.80%. Comparing base (0a595dc) to head (7451cc0).

Additional details and impacted files
@@ Coverage Diff @@## nightly #2429 +/- ##
==========================================
- Coverage 6.99% 6.80% -0.20% 
==========================================
Files 87 87 Lines 17679 17672 -7 Branches 8399 8399 ==========================================
- Hits 1237 1202 -35 + Misses 13867 13833 -34 - Partials 2575 2637 +62 
FlagCoverage Δ
Linux5.34% <ø> (ø)
Windows2.56% <ø> (ø)
macOS-12?
macOS-137.91% <ø> (+0.01%)⬆️
macOS-14?

Flags with carried forward coverage won't be shown. Click here to find out more.

see 32 files with indirect coverage changes

@gschintgen
gschintgen marked this pull request as draft April 17, 2024 20:32
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I'm marking the PR as draft as long as there are unresolved issues with AMD GPUs. (See #2409 (comment))

Comment thread.github/workflows/CI.yml Outdated

@cgutmancgutman left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The way VA-API's backwards compatibility guarantees work is that the version of libva.so at runtime must be >= the version of libva that the driver (_drv_video.so) was compiled against. This is done via looking up a __vaDriverInit function that is decorated with the compile-time version number of VA-API.

For example, libva.so 2.19 wil look for __vaDriverInit_1_19(), then __vaDriverInit_1_18(), __vaDriverInit_1_17() and so on. So drivers built with any version equal or less than 2.19 will work, but a driver built for libva 2.20 (which only has __vaDriverInit_1_20()) will not work.

Due to this backwards compatibilty guarantee, essentially all we need to do for optimal compatibility is bundle whatever is the latest version of libva.so (currently 2.21) into the AppImage (this is also what Moonlight does). I don't think we should be bundling the _drv_video.so files because I think those have dependencies on Mesa and could break if we run them with a different version of Mesa than they were built as part of.

@gschintgen

Copy link
Copy Markdown
ContributorAuthor

essentially all we need to do for optimal compatibility is bundle whatever is the latest version of libva.so (currently 2.21)

Thanks for your insightful and helpful comment! I've added changes to use the latest libva (from a PPA), but leaving out the *_drv_video.so. Let's see how it goes.

@ReenigneArcherReenigneArcher removed this from the v0.23.1 milestone Apr 21, 2024
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

Oh well, the kisak-mesa PPA only has libva at version 2.14 instead of a more recent one. I guess for optimal support we'll have to build it ourselves. (That is if the latest versions of libva are compatible with a 4 year old distribution.)

I'll play around with it but it could take some time.

@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I force-pushed a new change overwriting the previous PR contents. This time we're building our own copy of the latest libva but we're using the host system's VA-API drivers. (Thanks cgutman )

On my own fork I've already tested the resulting AppImage and it is working fine on my system (cursory testing of remote desktop):

libva info: VA-API version 1.22.0
libva info: Trying to open /usr/lib/x86_64-linux-gnu/dri/radeonsi_drv_video.so
libva info: Found init function __vaDriverInit_1_14
libva info: va_openDriver() returns 0
[2024:04:23:16:54:30]: Warning: [hevc_vaapi @ 0x564a9a4d1380] Driver does not support some wanted packed headers (wanted 0xd, found 0x1).
[2024:04:23:16:54:30]: Info: [2024:04:23:16:54:30]: Info: // Ignore any errors mentioned above, they are not relevant. //
[2024:04:23:16:54:30]: Info: [2024:04:23:16:54:30]: Info: Found H.264 encoder: h264_vaapi [vaapi]
[2024:04:23:16:54:30]: Info: Found HEVC encoder: hevc_vaapi [vaapi]

Comment thread.github/workflows/CI.yml Outdated
@gschintgen
gschintgen marked this pull request as ready for review April 25, 2024 11:35
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I see that in the meantime the AppImage has been upgraded from Ubuntu 20.04 to 22.04. I don't think that change invalidates the logic behind this PR. I rebased to fix a minor merge conflict.

Comment thread.github/workflows/CI.yml Outdated
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

Are there any merge blockers for this PR? I think for supported distributions this should work fine and fix the initial issue. (Which I can confirm on my own system.)

The CI failures seem to be independent of the PR. For example the Analyze (cpp, ubuntu-latest) fails due to this:

/root/cuda.run 100%[===================>] 4.04G 75.3MB/s in 55s terminate called after throwing an instance of 'boost::filesystem::filesystem_error'
what(): boost::filesystem::copy_file: No space left on device: "./builds/nsight_systems/documentation/pdf/UserGuide.pdf", "/usr/nsight-systems-2022.4.2/documentation/pdf/UserGuide.pdf"

cuda is huge!?

@ReenigneArcher

Copy link
Copy Markdown
Member

cuda is huge!?

Basically yea. GitHub modifies runners from time to time and it causes out of space failures. I tried to fix it in #2475 but it didn't work.

@ReenigneArcher
ReenigneArcher merged commit a5bbf36 into LizardByte:nightlyMay 13, 2024
@gschintgen
gschintgen deleted the fix-appimage-vaapi branch May 13, 2024 13:04
KuleRucket pushed a commit to KuleRucket/Sunshine that referenced this pull request Jun 6, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@gschintgen@ReenigneArcher@cgutman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

AppImage: add needed VA-API libraries (Intel & AMD) - #2429

Merged
ReenigneArcher merged 3 commits into
LizardByte:nightlyfrom
gschintgen:fix-appimage-vaapi
May 13, 2024
Merged

AppImage: add needed VA-API libraries (Intel & AMD)#2429
ReenigneArcher merged 3 commits into
LizardByte:nightlyfrom
gschintgen:fix-appimage-vaapi

Conversation

@gschintgen

@gschintgengschintgen commented Apr 16, 2024

Copy link
Copy Markdown
Contributor

Description

Currently VA-API encoding may/will fail when the AppImage is used. This seems to be because of a mismatch between the bundled libva.so and the system's /usr/lib/*/dri/*_drv_video.so driver libraries. Since this is a rather important functionality the necessary libraries are now bundled in the AppImage itself in a relatively recent version. This PR changes the AppImage build process in order to include a recent libva version. This should fix VA-API issues for Intel and AMD based systems. I left out nouveau_drv_video.so since I'm somewhat skeptical of its encoding capabilities. (Please tell me if I'm wrong...)

I tested this PR on an older Intel-based laptop (Ubuntu 22.04, i965 driver) / on my main AMDGPU-based desktop. It's working fine for me.

Screenshot

Issues Fixed or Closed

See #2409 (but does not fix it since Flatpak is untouched)

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

Comment thread.github/workflows/CI.yml Outdated
# allow newer gcc
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
# use a recent Mesa version
sudo add-apt-repository ppa:kisak/kisak-mesa -y

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see the repo added, but what package is coming from here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for asking. I added a comment giving a few more details. Here's the complete list as extracted from the CI build logs:

libwayland-server0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libwayland-bin (1.20.0-1ubuntu0.1~kisak~f)
libva2:amd64 (2.14.0-1~kisak1~f)
libglapi-mesa:amd64 (24.0.5~kisak1~f)
libvdpau1:amd64 (1.4-3build2~kisak~f)
libllvm15:amd64 (1:15.0.7-10~kisak1~f)
libwayland-egl1:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libvdpau-dev:amd64 (1.4-3build2~kisak~f)
libdrm-common (2.4.120-1~kisak~f)
libwayland-client0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libdrm2:amd64 (2.4.120-1~kisak~f)
libva-drm2:amd64 (2.14.0-1~kisak1~f)
libwayland-cursor0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libva-x11-2:amd64 (2.14.0-1~kisak1~f)
libva-glx2:amd64 (2.14.0-1~kisak1~f)
libdrm-amdgpu1:amd64 (2.4.120-1~kisak~f)
libdrm-nouveau2:amd64 (2.4.120-1~kisak~f)
libgbm1:amd64 (24.0.5~kisak1~f)
libdrm-radeon1:amd64 (2.4.120-1~kisak~f)
libdrm-intel1:amd64 (2.4.120-1~kisak~f)
libgl1-mesa-dri:amd64 (24.0.5~kisak1~f)
libwayland-dev:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libgbm-dev:amd64 (24.0.5~kisak1~f)
libegl-mesa0:amd64 (24.0.5~kisak1~f)
libva-wayland2:amd64 (2.14.0-1~kisak1~f)
mesa-va-drivers:amd64 (24.0.5~kisak1~f)
mesa-vdpau-drivers:amd64 (24.0.5~kisak1~f)
libdrm-dev:amd64 (2.4.120-1~kisak~f)
libglx-mesa0:amd64 (24.0.5~kisak1~f)
libva-dev:amd64 (2.14.0-1~kisak1~f)
va-driver-all:amd64 (2.14.0-1~kisak1~f)
vdpau-driver-all:amd64 (1.4-3build2~kisak~f)
libgl1-mesa-dev:amd64 (24.0.5~kisak1~f)
libegl1-mesa-dev:amd64 (24.0.5~kisak1~f)

It's quite an update over 20.04's mesa; some testing can't hurt.

Comment threadpackaging/linux/AppImage/AppRun Outdated
@codecov

codecovBot commented Apr 16, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 6.80%. Comparing base (0a595dc) to head (7451cc0).

Additional details and impacted files
@@ Coverage Diff @@## nightly #2429 +/- ##
==========================================
- Coverage 6.99% 6.80% -0.20% 
==========================================
Files 87 87 Lines 17679 17672 -7 Branches 8399 8399 ==========================================
- Hits 1237 1202 -35 + Misses 13867 13833 -34 - Partials 2575 2637 +62 
FlagCoverage Δ
Linux5.34% <ø> (ø)
Windows2.56% <ø> (ø)
macOS-12?
macOS-137.91% <ø> (+0.01%)⬆️
macOS-14?

Flags with carried forward coverage won't be shown. Click here to find out more.

see 32 files with indirect coverage changes

@gschintgen
gschintgen marked this pull request as draft April 17, 2024 20:32
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I'm marking the PR as draft as long as there are unresolved issues with AMD GPUs. (See #2409 (comment))

Comment thread.github/workflows/CI.yml Outdated

@cgutmancgutman left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The way VA-API's backwards compatibility guarantees work is that the version of libva.so at runtime must be >= the version of libva that the driver (_drv_video.so) was compiled against. This is done via looking up a __vaDriverInit function that is decorated with the compile-time version number of VA-API.

For example, libva.so 2.19 wil look for __vaDriverInit_1_19(), then __vaDriverInit_1_18(), __vaDriverInit_1_17() and so on. So drivers built with any version equal or less than 2.19 will work, but a driver built for libva 2.20 (which only has __vaDriverInit_1_20()) will not work.

Due to this backwards compatibilty guarantee, essentially all we need to do for optimal compatibility is bundle whatever is the latest version of libva.so (currently 2.21) into the AppImage (this is also what Moonlight does). I don't think we should be bundling the _drv_video.so files because I think those have dependencies on Mesa and could break if we run them with a different version of Mesa than they were built as part of.

@gschintgen

Copy link
Copy Markdown
ContributorAuthor

essentially all we need to do for optimal compatibility is bundle whatever is the latest version of libva.so (currently 2.21)

Thanks for your insightful and helpful comment! I've added changes to use the latest libva (from a PPA), but leaving out the *_drv_video.so. Let's see how it goes.

@ReenigneArcherReenigneArcher removed this from the v0.23.1 milestone Apr 21, 2024
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

Oh well, the kisak-mesa PPA only has libva at version 2.14 instead of a more recent one. I guess for optimal support we'll have to build it ourselves. (That is if the latest versions of libva are compatible with a 4 year old distribution.)

I'll play around with it but it could take some time.

@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I force-pushed a new change overwriting the previous PR contents. This time we're building our own copy of the latest libva but we're using the host system's VA-API drivers. (Thanks cgutman )

On my own fork I've already tested the resulting AppImage and it is working fine on my system (cursory testing of remote desktop):

libva info: VA-API version 1.22.0
libva info: Trying to open /usr/lib/x86_64-linux-gnu/dri/radeonsi_drv_video.so
libva info: Found init function __vaDriverInit_1_14
libva info: va_openDriver() returns 0
[2024:04:23:16:54:30]: Warning: [hevc_vaapi @ 0x564a9a4d1380] Driver does not support some wanted packed headers (wanted 0xd, found 0x1).
[2024:04:23:16:54:30]: Info: [2024:04:23:16:54:30]: Info: // Ignore any errors mentioned above, they are not relevant. //
[2024:04:23:16:54:30]: Info: [2024:04:23:16:54:30]: Info: Found H.264 encoder: h264_vaapi [vaapi]
[2024:04:23:16:54:30]: Info: Found HEVC encoder: hevc_vaapi [vaapi]

Comment thread.github/workflows/CI.yml Outdated
@gschintgen
gschintgen marked this pull request as ready for review April 25, 2024 11:35
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I see that in the meantime the AppImage has been upgraded from Ubuntu 20.04 to 22.04. I don't think that change invalidates the logic behind this PR. I rebased to fix a minor merge conflict.

Comment thread.github/workflows/CI.yml Outdated
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

Are there any merge blockers for this PR? I think for supported distributions this should work fine and fix the initial issue. (Which I can confirm on my own system.)

The CI failures seem to be independent of the PR. For example the Analyze (cpp, ubuntu-latest) fails due to this:

/root/cuda.run 100%[===================>] 4.04G 75.3MB/s in 55s terminate called after throwing an instance of 'boost::filesystem::filesystem_error'
what(): boost::filesystem::copy_file: No space left on device: "./builds/nsight_systems/documentation/pdf/UserGuide.pdf", "/usr/nsight-systems-2022.4.2/documentation/pdf/UserGuide.pdf"

cuda is huge!?

@ReenigneArcher

Copy link
Copy Markdown
Member

cuda is huge!?

Basically yea. GitHub modifies runners from time to time and it causes out of space failures. I tried to fix it in #2475 but it didn't work.

@ReenigneArcher
ReenigneArcher merged commit a5bbf36 into LizardByte:nightlyMay 13, 2024
@gschintgen
gschintgen deleted the fix-appimage-vaapi branch May 13, 2024 13:04
KuleRucket pushed a commit to KuleRucket/Sunshine that referenced this pull request Jun 6, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@gschintgen@ReenigneArcher@cgutman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

AppImage: add needed VA-API libraries (Intel & AMD) - #2429

Merged
ReenigneArcher merged 3 commits into
LizardByte:nightlyfrom
gschintgen:fix-appimage-vaapi
May 13, 2024
Merged

AppImage: add needed VA-API libraries (Intel & AMD)#2429
ReenigneArcher merged 3 commits into
LizardByte:nightlyfrom
gschintgen:fix-appimage-vaapi

Conversation

@gschintgen

@gschintgengschintgen commented Apr 16, 2024

Copy link
Copy Markdown
Contributor

Description

Currently VA-API encoding may/will fail when the AppImage is used. This seems to be because of a mismatch between the bundled libva.so and the system's /usr/lib/*/dri/*_drv_video.so driver libraries. Since this is a rather important functionality the necessary libraries are now bundled in the AppImage itself in a relatively recent version. This PR changes the AppImage build process in order to include a recent libva version. This should fix VA-API issues for Intel and AMD based systems. I left out nouveau_drv_video.so since I'm somewhat skeptical of its encoding capabilities. (Please tell me if I'm wrong...)

I tested this PR on an older Intel-based laptop (Ubuntu 22.04, i965 driver) / on my main AMDGPU-based desktop. It's working fine for me.

Screenshot

Issues Fixed or Closed

See #2409 (but does not fix it since Flatpak is untouched)

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

Comment thread.github/workflows/CI.yml Outdated
# allow newer gcc
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
# use a recent Mesa version
sudo add-apt-repository ppa:kisak/kisak-mesa -y

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see the repo added, but what package is coming from here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for asking. I added a comment giving a few more details. Here's the complete list as extracted from the CI build logs:

libwayland-server0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libwayland-bin (1.20.0-1ubuntu0.1~kisak~f)
libva2:amd64 (2.14.0-1~kisak1~f)
libglapi-mesa:amd64 (24.0.5~kisak1~f)
libvdpau1:amd64 (1.4-3build2~kisak~f)
libllvm15:amd64 (1:15.0.7-10~kisak1~f)
libwayland-egl1:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libvdpau-dev:amd64 (1.4-3build2~kisak~f)
libdrm-common (2.4.120-1~kisak~f)
libwayland-client0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libdrm2:amd64 (2.4.120-1~kisak~f)
libva-drm2:amd64 (2.14.0-1~kisak1~f)
libwayland-cursor0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libva-x11-2:amd64 (2.14.0-1~kisak1~f)
libva-glx2:amd64 (2.14.0-1~kisak1~f)
libdrm-amdgpu1:amd64 (2.4.120-1~kisak~f)
libdrm-nouveau2:amd64 (2.4.120-1~kisak~f)
libgbm1:amd64 (24.0.5~kisak1~f)
libdrm-radeon1:amd64 (2.4.120-1~kisak~f)
libdrm-intel1:amd64 (2.4.120-1~kisak~f)
libgl1-mesa-dri:amd64 (24.0.5~kisak1~f)
libwayland-dev:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libgbm-dev:amd64 (24.0.5~kisak1~f)
libegl-mesa0:amd64 (24.0.5~kisak1~f)
libva-wayland2:amd64 (2.14.0-1~kisak1~f)
mesa-va-drivers:amd64 (24.0.5~kisak1~f)
mesa-vdpau-drivers:amd64 (24.0.5~kisak1~f)
libdrm-dev:amd64 (2.4.120-1~kisak~f)
libglx-mesa0:amd64 (24.0.5~kisak1~f)
libva-dev:amd64 (2.14.0-1~kisak1~f)
va-driver-all:amd64 (2.14.0-1~kisak1~f)
vdpau-driver-all:amd64 (1.4-3build2~kisak~f)
libgl1-mesa-dev:amd64 (24.0.5~kisak1~f)
libegl1-mesa-dev:amd64 (24.0.5~kisak1~f)

It's quite an update over 20.04's mesa; some testing can't hurt.

Comment threadpackaging/linux/AppImage/AppRun Outdated
@codecov

codecovBot commented Apr 16, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 6.80%. Comparing base (0a595dc) to head (7451cc0).

Additional details and impacted files
@@ Coverage Diff @@## nightly #2429 +/- ##
==========================================
- Coverage 6.99% 6.80% -0.20% 
==========================================
Files 87 87 Lines 17679 17672 -7 Branches 8399 8399 ==========================================
- Hits 1237 1202 -35 + Misses 13867 13833 -34 - Partials 2575 2637 +62 
FlagCoverage Δ
Linux5.34% <ø> (ø)
Windows2.56% <ø> (ø)
macOS-12?
macOS-137.91% <ø> (+0.01%)⬆️
macOS-14?

Flags with carried forward coverage won't be shown. Click here to find out more.

see 32 files with indirect coverage changes

@gschintgen
gschintgen marked this pull request as draft April 17, 2024 20:32
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I'm marking the PR as draft as long as there are unresolved issues with AMD GPUs. (See #2409 (comment))

Comment thread.github/workflows/CI.yml Outdated

@cgutmancgutman left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The way VA-API's backwards compatibility guarantees work is that the version of libva.so at runtime must be >= the version of libva that the driver (_drv_video.so) was compiled against. This is done via looking up a __vaDriverInit function that is decorated with the compile-time version number of VA-API.

For example, libva.so 2.19 wil look for __vaDriverInit_1_19(), then __vaDriverInit_1_18(), __vaDriverInit_1_17() and so on. So drivers built with any version equal or less than 2.19 will work, but a driver built for libva 2.20 (which only has __vaDriverInit_1_20()) will not work.

Due to this backwards compatibilty guarantee, essentially all we need to do for optimal compatibility is bundle whatever is the latest version of libva.so (currently 2.21) into the AppImage (this is also what Moonlight does). I don't think we should be bundling the _drv_video.so files because I think those have dependencies on Mesa and could break if we run them with a different version of Mesa than they were built as part of.

@gschintgen

Copy link
Copy Markdown
ContributorAuthor

essentially all we need to do for optimal compatibility is bundle whatever is the latest version of libva.so (currently 2.21)

Thanks for your insightful and helpful comment! I've added changes to use the latest libva (from a PPA), but leaving out the *_drv_video.so. Let's see how it goes.

@ReenigneArcherReenigneArcher removed this from the v0.23.1 milestone Apr 21, 2024
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

Oh well, the kisak-mesa PPA only has libva at version 2.14 instead of a more recent one. I guess for optimal support we'll have to build it ourselves. (That is if the latest versions of libva are compatible with a 4 year old distribution.)

I'll play around with it but it could take some time.

@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I force-pushed a new change overwriting the previous PR contents. This time we're building our own copy of the latest libva but we're using the host system's VA-API drivers. (Thanks cgutman )

On my own fork I've already tested the resulting AppImage and it is working fine on my system (cursory testing of remote desktop):

libva info: VA-API version 1.22.0
libva info: Trying to open /usr/lib/x86_64-linux-gnu/dri/radeonsi_drv_video.so
libva info: Found init function __vaDriverInit_1_14
libva info: va_openDriver() returns 0
[2024:04:23:16:54:30]: Warning: [hevc_vaapi @ 0x564a9a4d1380] Driver does not support some wanted packed headers (wanted 0xd, found 0x1).
[2024:04:23:16:54:30]: Info: [2024:04:23:16:54:30]: Info: // Ignore any errors mentioned above, they are not relevant. //
[2024:04:23:16:54:30]: Info: [2024:04:23:16:54:30]: Info: Found H.264 encoder: h264_vaapi [vaapi]
[2024:04:23:16:54:30]: Info: Found HEVC encoder: hevc_vaapi [vaapi]

Comment thread.github/workflows/CI.yml Outdated
@gschintgen
gschintgen marked this pull request as ready for review April 25, 2024 11:35
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I see that in the meantime the AppImage has been upgraded from Ubuntu 20.04 to 22.04. I don't think that change invalidates the logic behind this PR. I rebased to fix a minor merge conflict.

Comment thread.github/workflows/CI.yml Outdated
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

Are there any merge blockers for this PR? I think for supported distributions this should work fine and fix the initial issue. (Which I can confirm on my own system.)

The CI failures seem to be independent of the PR. For example the Analyze (cpp, ubuntu-latest) fails due to this:

/root/cuda.run 100%[===================>] 4.04G 75.3MB/s in 55s terminate called after throwing an instance of 'boost::filesystem::filesystem_error'
what(): boost::filesystem::copy_file: No space left on device: "./builds/nsight_systems/documentation/pdf/UserGuide.pdf", "/usr/nsight-systems-2022.4.2/documentation/pdf/UserGuide.pdf"

cuda is huge!?

@ReenigneArcher

Copy link
Copy Markdown
Member

cuda is huge!?

Basically yea. GitHub modifies runners from time to time and it causes out of space failures. I tried to fix it in #2475 but it didn't work.

@ReenigneArcher
ReenigneArcher merged commit a5bbf36 into LizardByte:nightlyMay 13, 2024
@gschintgen
gschintgen deleted the fix-appimage-vaapi branch May 13, 2024 13:04
KuleRucket pushed a commit to KuleRucket/Sunshine that referenced this pull request Jun 6, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@gschintgen@ReenigneArcher@cgutman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

AppImage: add needed VA-API libraries (Intel & AMD) - #2429

Merged
ReenigneArcher merged 3 commits into
LizardByte:nightlyfrom
gschintgen:fix-appimage-vaapi
May 13, 2024
Merged

AppImage: add needed VA-API libraries (Intel & AMD)#2429
ReenigneArcher merged 3 commits into
LizardByte:nightlyfrom
gschintgen:fix-appimage-vaapi

Conversation

@gschintgen

@gschintgengschintgen commented Apr 16, 2024

Copy link
Copy Markdown
Contributor

Description

Currently VA-API encoding may/will fail when the AppImage is used. This seems to be because of a mismatch between the bundled libva.so and the system's /usr/lib/*/dri/*_drv_video.so driver libraries. Since this is a rather important functionality the necessary libraries are now bundled in the AppImage itself in a relatively recent version. This PR changes the AppImage build process in order to include a recent libva version. This should fix VA-API issues for Intel and AMD based systems. I left out nouveau_drv_video.so since I'm somewhat skeptical of its encoding capabilities. (Please tell me if I'm wrong...)

I tested this PR on an older Intel-based laptop (Ubuntu 22.04, i965 driver) / on my main AMDGPU-based desktop. It's working fine for me.

Screenshot

Issues Fixed or Closed

See #2409 (but does not fix it since Flatpak is untouched)

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

Comment thread.github/workflows/CI.yml Outdated
# allow newer gcc
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
# use a recent Mesa version
sudo add-apt-repository ppa:kisak/kisak-mesa -y

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see the repo added, but what package is coming from here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for asking. I added a comment giving a few more details. Here's the complete list as extracted from the CI build logs:

libwayland-server0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libwayland-bin (1.20.0-1ubuntu0.1~kisak~f)
libva2:amd64 (2.14.0-1~kisak1~f)
libglapi-mesa:amd64 (24.0.5~kisak1~f)
libvdpau1:amd64 (1.4-3build2~kisak~f)
libllvm15:amd64 (1:15.0.7-10~kisak1~f)
libwayland-egl1:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libvdpau-dev:amd64 (1.4-3build2~kisak~f)
libdrm-common (2.4.120-1~kisak~f)
libwayland-client0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libdrm2:amd64 (2.4.120-1~kisak~f)
libva-drm2:amd64 (2.14.0-1~kisak1~f)
libwayland-cursor0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libva-x11-2:amd64 (2.14.0-1~kisak1~f)
libva-glx2:amd64 (2.14.0-1~kisak1~f)
libdrm-amdgpu1:amd64 (2.4.120-1~kisak~f)
libdrm-nouveau2:amd64 (2.4.120-1~kisak~f)
libgbm1:amd64 (24.0.5~kisak1~f)
libdrm-radeon1:amd64 (2.4.120-1~kisak~f)
libdrm-intel1:amd64 (2.4.120-1~kisak~f)
libgl1-mesa-dri:amd64 (24.0.5~kisak1~f)
libwayland-dev:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libgbm-dev:amd64 (24.0.5~kisak1~f)
libegl-mesa0:amd64 (24.0.5~kisak1~f)
libva-wayland2:amd64 (2.14.0-1~kisak1~f)
mesa-va-drivers:amd64 (24.0.5~kisak1~f)
mesa-vdpau-drivers:amd64 (24.0.5~kisak1~f)
libdrm-dev:amd64 (2.4.120-1~kisak~f)
libglx-mesa0:amd64 (24.0.5~kisak1~f)
libva-dev:amd64 (2.14.0-1~kisak1~f)
va-driver-all:amd64 (2.14.0-1~kisak1~f)
vdpau-driver-all:amd64 (1.4-3build2~kisak~f)
libgl1-mesa-dev:amd64 (24.0.5~kisak1~f)
libegl1-mesa-dev:amd64 (24.0.5~kisak1~f)

It's quite an update over 20.04's mesa; some testing can't hurt.

Comment threadpackaging/linux/AppImage/AppRun Outdated
@codecov

codecovBot commented Apr 16, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 6.80%. Comparing base (0a595dc) to head (7451cc0).

Additional details and impacted files
@@ Coverage Diff @@## nightly #2429 +/- ##
==========================================
- Coverage 6.99% 6.80% -0.20% 
==========================================
Files 87 87 Lines 17679 17672 -7 Branches 8399 8399 ==========================================
- Hits 1237 1202 -35 + Misses 13867 13833 -34 - Partials 2575 2637 +62 
FlagCoverage Δ
Linux5.34% <ø> (ø)
Windows2.56% <ø> (ø)
macOS-12?
macOS-137.91% <ø> (+0.01%)⬆️
macOS-14?

Flags with carried forward coverage won't be shown. Click here to find out more.

see 32 files with indirect coverage changes

@gschintgen
gschintgen marked this pull request as draft April 17, 2024 20:32
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I'm marking the PR as draft as long as there are unresolved issues with AMD GPUs. (See #2409 (comment))

Comment thread.github/workflows/CI.yml Outdated

@cgutmancgutman left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The way VA-API's backwards compatibility guarantees work is that the version of libva.so at runtime must be >= the version of libva that the driver (_drv_video.so) was compiled against. This is done via looking up a __vaDriverInit function that is decorated with the compile-time version number of VA-API.

For example, libva.so 2.19 wil look for __vaDriverInit_1_19(), then __vaDriverInit_1_18(), __vaDriverInit_1_17() and so on. So drivers built with any version equal or less than 2.19 will work, but a driver built for libva 2.20 (which only has __vaDriverInit_1_20()) will not work.

Due to this backwards compatibilty guarantee, essentially all we need to do for optimal compatibility is bundle whatever is the latest version of libva.so (currently 2.21) into the AppImage (this is also what Moonlight does). I don't think we should be bundling the _drv_video.so files because I think those have dependencies on Mesa and could break if we run them with a different version of Mesa than they were built as part of.

@gschintgen

Copy link
Copy Markdown
ContributorAuthor

essentially all we need to do for optimal compatibility is bundle whatever is the latest version of libva.so (currently 2.21)

Thanks for your insightful and helpful comment! I've added changes to use the latest libva (from a PPA), but leaving out the *_drv_video.so. Let's see how it goes.

@ReenigneArcherReenigneArcher removed this from the v0.23.1 milestone Apr 21, 2024
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

Oh well, the kisak-mesa PPA only has libva at version 2.14 instead of a more recent one. I guess for optimal support we'll have to build it ourselves. (That is if the latest versions of libva are compatible with a 4 year old distribution.)

I'll play around with it but it could take some time.

@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I force-pushed a new change overwriting the previous PR contents. This time we're building our own copy of the latest libva but we're using the host system's VA-API drivers. (Thanks cgutman )

On my own fork I've already tested the resulting AppImage and it is working fine on my system (cursory testing of remote desktop):

libva info: VA-API version 1.22.0
libva info: Trying to open /usr/lib/x86_64-linux-gnu/dri/radeonsi_drv_video.so
libva info: Found init function __vaDriverInit_1_14
libva info: va_openDriver() returns 0
[2024:04:23:16:54:30]: Warning: [hevc_vaapi @ 0x564a9a4d1380] Driver does not support some wanted packed headers (wanted 0xd, found 0x1).
[2024:04:23:16:54:30]: Info: [2024:04:23:16:54:30]: Info: // Ignore any errors mentioned above, they are not relevant. //
[2024:04:23:16:54:30]: Info: [2024:04:23:16:54:30]: Info: Found H.264 encoder: h264_vaapi [vaapi]
[2024:04:23:16:54:30]: Info: Found HEVC encoder: hevc_vaapi [vaapi]

Comment thread.github/workflows/CI.yml Outdated
@gschintgen
gschintgen marked this pull request as ready for review April 25, 2024 11:35
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I see that in the meantime the AppImage has been upgraded from Ubuntu 20.04 to 22.04. I don't think that change invalidates the logic behind this PR. I rebased to fix a minor merge conflict.

Comment thread.github/workflows/CI.yml Outdated
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

Are there any merge blockers for this PR? I think for supported distributions this should work fine and fix the initial issue. (Which I can confirm on my own system.)

The CI failures seem to be independent of the PR. For example the Analyze (cpp, ubuntu-latest) fails due to this:

/root/cuda.run 100%[===================>] 4.04G 75.3MB/s in 55s terminate called after throwing an instance of 'boost::filesystem::filesystem_error'
what(): boost::filesystem::copy_file: No space left on device: "./builds/nsight_systems/documentation/pdf/UserGuide.pdf", "/usr/nsight-systems-2022.4.2/documentation/pdf/UserGuide.pdf"

cuda is huge!?

@ReenigneArcher

Copy link
Copy Markdown
Member

cuda is huge!?

Basically yea. GitHub modifies runners from time to time and it causes out of space failures. I tried to fix it in #2475 but it didn't work.

@ReenigneArcher
ReenigneArcher merged commit a5bbf36 into LizardByte:nightlyMay 13, 2024
@gschintgen
gschintgen deleted the fix-appimage-vaapi branch May 13, 2024 13:04
KuleRucket pushed a commit to KuleRucket/Sunshine that referenced this pull request Jun 6, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@gschintgen@ReenigneArcher@cgutman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

AppImage: add needed VA-API libraries (Intel & AMD) - #2429

Merged
ReenigneArcher merged 3 commits into
LizardByte:nightlyfrom
gschintgen:fix-appimage-vaapi
May 13, 2024
Merged

AppImage: add needed VA-API libraries (Intel & AMD)#2429
ReenigneArcher merged 3 commits into
LizardByte:nightlyfrom
gschintgen:fix-appimage-vaapi

Conversation

@gschintgen

@gschintgengschintgen commented Apr 16, 2024

Copy link
Copy Markdown
Contributor

Description

Currently VA-API encoding may/will fail when the AppImage is used. This seems to be because of a mismatch between the bundled libva.so and the system's /usr/lib/*/dri/*_drv_video.so driver libraries. Since this is a rather important functionality the necessary libraries are now bundled in the AppImage itself in a relatively recent version. This PR changes the AppImage build process in order to include a recent libva version. This should fix VA-API issues for Intel and AMD based systems. I left out nouveau_drv_video.so since I'm somewhat skeptical of its encoding capabilities. (Please tell me if I'm wrong...)

I tested this PR on an older Intel-based laptop (Ubuntu 22.04, i965 driver) / on my main AMDGPU-based desktop. It's working fine for me.

Screenshot

Issues Fixed or Closed

See #2409 (but does not fix it since Flatpak is untouched)

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

Comment thread.github/workflows/CI.yml Outdated
# allow newer gcc
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
# use a recent Mesa version
sudo add-apt-repository ppa:kisak/kisak-mesa -y

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see the repo added, but what package is coming from here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for asking. I added a comment giving a few more details. Here's the complete list as extracted from the CI build logs:

libwayland-server0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libwayland-bin (1.20.0-1ubuntu0.1~kisak~f)
libva2:amd64 (2.14.0-1~kisak1~f)
libglapi-mesa:amd64 (24.0.5~kisak1~f)
libvdpau1:amd64 (1.4-3build2~kisak~f)
libllvm15:amd64 (1:15.0.7-10~kisak1~f)
libwayland-egl1:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libvdpau-dev:amd64 (1.4-3build2~kisak~f)
libdrm-common (2.4.120-1~kisak~f)
libwayland-client0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libdrm2:amd64 (2.4.120-1~kisak~f)
libva-drm2:amd64 (2.14.0-1~kisak1~f)
libwayland-cursor0:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libva-x11-2:amd64 (2.14.0-1~kisak1~f)
libva-glx2:amd64 (2.14.0-1~kisak1~f)
libdrm-amdgpu1:amd64 (2.4.120-1~kisak~f)
libdrm-nouveau2:amd64 (2.4.120-1~kisak~f)
libgbm1:amd64 (24.0.5~kisak1~f)
libdrm-radeon1:amd64 (2.4.120-1~kisak~f)
libdrm-intel1:amd64 (2.4.120-1~kisak~f)
libgl1-mesa-dri:amd64 (24.0.5~kisak1~f)
libwayland-dev:amd64 (1.20.0-1ubuntu0.1~kisak~f)
libgbm-dev:amd64 (24.0.5~kisak1~f)
libegl-mesa0:amd64 (24.0.5~kisak1~f)
libva-wayland2:amd64 (2.14.0-1~kisak1~f)
mesa-va-drivers:amd64 (24.0.5~kisak1~f)
mesa-vdpau-drivers:amd64 (24.0.5~kisak1~f)
libdrm-dev:amd64 (2.4.120-1~kisak~f)
libglx-mesa0:amd64 (24.0.5~kisak1~f)
libva-dev:amd64 (2.14.0-1~kisak1~f)
va-driver-all:amd64 (2.14.0-1~kisak1~f)
vdpau-driver-all:amd64 (1.4-3build2~kisak~f)
libgl1-mesa-dev:amd64 (24.0.5~kisak1~f)
libegl1-mesa-dev:amd64 (24.0.5~kisak1~f)

It's quite an update over 20.04's mesa; some testing can't hurt.

Comment threadpackaging/linux/AppImage/AppRun Outdated
@codecov

codecovBot commented Apr 16, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 6.80%. Comparing base (0a595dc) to head (7451cc0).

Additional details and impacted files
@@ Coverage Diff @@## nightly #2429 +/- ##
==========================================
- Coverage 6.99% 6.80% -0.20% 
==========================================
Files 87 87 Lines 17679 17672 -7 Branches 8399 8399 ==========================================
- Hits 1237 1202 -35 + Misses 13867 13833 -34 - Partials 2575 2637 +62 
FlagCoverage Δ
Linux5.34% <ø> (ø)
Windows2.56% <ø> (ø)
macOS-12?
macOS-137.91% <ø> (+0.01%)⬆️
macOS-14?

Flags with carried forward coverage won't be shown. Click here to find out more.

see 32 files with indirect coverage changes

@gschintgen
gschintgen marked this pull request as draft April 17, 2024 20:32
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I'm marking the PR as draft as long as there are unresolved issues with AMD GPUs. (See #2409 (comment))

Comment thread.github/workflows/CI.yml Outdated

@cgutmancgutman left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The way VA-API's backwards compatibility guarantees work is that the version of libva.so at runtime must be >= the version of libva that the driver (_drv_video.so) was compiled against. This is done via looking up a __vaDriverInit function that is decorated with the compile-time version number of VA-API.

For example, libva.so 2.19 wil look for __vaDriverInit_1_19(), then __vaDriverInit_1_18(), __vaDriverInit_1_17() and so on. So drivers built with any version equal or less than 2.19 will work, but a driver built for libva 2.20 (which only has __vaDriverInit_1_20()) will not work.

Due to this backwards compatibilty guarantee, essentially all we need to do for optimal compatibility is bundle whatever is the latest version of libva.so (currently 2.21) into the AppImage (this is also what Moonlight does). I don't think we should be bundling the _drv_video.so files because I think those have dependencies on Mesa and could break if we run them with a different version of Mesa than they were built as part of.

@gschintgen

Copy link
Copy Markdown
ContributorAuthor

essentially all we need to do for optimal compatibility is bundle whatever is the latest version of libva.so (currently 2.21)

Thanks for your insightful and helpful comment! I've added changes to use the latest libva (from a PPA), but leaving out the *_drv_video.so. Let's see how it goes.

@ReenigneArcherReenigneArcher removed this from the v0.23.1 milestone Apr 21, 2024
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

Oh well, the kisak-mesa PPA only has libva at version 2.14 instead of a more recent one. I guess for optimal support we'll have to build it ourselves. (That is if the latest versions of libva are compatible with a 4 year old distribution.)

I'll play around with it but it could take some time.

@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I force-pushed a new change overwriting the previous PR contents. This time we're building our own copy of the latest libva but we're using the host system's VA-API drivers. (Thanks cgutman )

On my own fork I've already tested the resulting AppImage and it is working fine on my system (cursory testing of remote desktop):

libva info: VA-API version 1.22.0
libva info: Trying to open /usr/lib/x86_64-linux-gnu/dri/radeonsi_drv_video.so
libva info: Found init function __vaDriverInit_1_14
libva info: va_openDriver() returns 0
[2024:04:23:16:54:30]: Warning: [hevc_vaapi @ 0x564a9a4d1380] Driver does not support some wanted packed headers (wanted 0xd, found 0x1).
[2024:04:23:16:54:30]: Info: [2024:04:23:16:54:30]: Info: // Ignore any errors mentioned above, they are not relevant. //
[2024:04:23:16:54:30]: Info: [2024:04:23:16:54:30]: Info: Found H.264 encoder: h264_vaapi [vaapi]
[2024:04:23:16:54:30]: Info: Found HEVC encoder: hevc_vaapi [vaapi]

Comment thread.github/workflows/CI.yml Outdated
@gschintgen
gschintgen marked this pull request as ready for review April 25, 2024 11:35
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

I see that in the meantime the AppImage has been upgraded from Ubuntu 20.04 to 22.04. I don't think that change invalidates the logic behind this PR. I rebased to fix a minor merge conflict.

Comment thread.github/workflows/CI.yml Outdated
@gschintgen

Copy link
Copy Markdown
ContributorAuthor

Are there any merge blockers for this PR? I think for supported distributions this should work fine and fix the initial issue. (Which I can confirm on my own system.)

The CI failures seem to be independent of the PR. For example the Analyze (cpp, ubuntu-latest) fails due to this:

/root/cuda.run 100%[===================>] 4.04G 75.3MB/s in 55s terminate called after throwing an instance of 'boost::filesystem::filesystem_error'
what(): boost::filesystem::copy_file: No space left on device: "./builds/nsight_systems/documentation/pdf/UserGuide.pdf", "/usr/nsight-systems-2022.4.2/documentation/pdf/UserGuide.pdf"

cuda is huge!?

@ReenigneArcher

Copy link
Copy Markdown
Member

cuda is huge!?

Basically yea. GitHub modifies runners from time to time and it causes out of space failures. I tried to fix it in #2475 but it didn't work.

@ReenigneArcher
ReenigneArcher merged commit a5bbf36 into LizardByte:nightlyMay 13, 2024
@gschintgen
gschintgen deleted the fix-appimage-vaapi branch May 13, 2024 13:04
KuleRucket pushed a commit to KuleRucket/Sunshine that referenced this pull request Jun 6, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@gschintgen@ReenigneArcher@cgutman