public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mpv, ffmpeg: use addOpenGLRunpath to fix CUDA-accelerated playback

Browse Source 
This fixes #67780.

Currently, using `mpv --hwdec=nvdec --msg-level=vd=debug` on NVIDIA results in:

```
[vd] Opening decoder hevc
[vd] Looking at hwdec hevc-nvdec...
Cannot load libcuda.so.1
[vd] Could not create device.
[vd] No hardware decoding available for this codec.
```

With just mpv patched, ffmpeg cannot load libnvcuvid.so.1:

```
[vd] Opening decoder hevc
[vd] Looking at hwdec hevc-nvdec...
[vd] Trying hardware decoding via hevc-nvdec.
[vd] Selected codec: hevc (HEVC (High Efficiency Video Coding))
[vd] Pixel formats supported by decoder: vaapi_vld cuda yuv420p10le
[vd] Codec profile: Main 10 (0x2)
[vd] Requesting pixfmt 'cuda' from decoder.
[ffmpeg/video] hevc: Cannot load libnvcuvid.so.1
[ffmpeg/video] hevc: Failed loading nvcuvid.
[ffmpeg/video] hevc: Failed setup for format cuda: hwaccel initialisation returned error.
```

With both mpv and ffmpeg patched, it works:

```
[vd] Opening decoder hevc
[vd] Looking at hwdec hevc-nvdec...
[vd] Trying hardware decoding via hevc-nvdec.
[vd] Selected codec: hevc (HEVC (High Efficiency Video Coding))
[vd] Pixel formats supported by decoder: vaapi_vld cuda yuv420p10le
[vd] Codec profile: Main 10 (0x2)
[vd] Requesting pixfmt 'cuda' from decoder.
Using hardware decoding (nvdec).
[vd] Decoder format: 3840x2160 cuda[p010] bt.2020-ncl/bt.2020/pq/limited/auto SP=10.000000 CL=unknown (auto 0.000000/0.000000/0.000000)
```
This commit is contained in:
Ivan Kozik
2019-09-06 23:18:26 +00:00
parent 60db597e86
commit 46cbb8453a
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/video/mpv/default.nix
+10 -5
View File
@@ -1,6 +1,6 @@
{ config, stdenv, fetchurl, fetchFromGitHub, makeWrapper
, docutils, perl, pkgconfig, python3, which, ffmpeg_4
, freefont_ttf, freetype, libass, libpthreadstubs, mujs
, addOpenGLRunpath, docutils, perl, pkgconfig, python3, which
, ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs
, nv-codec-headers, lua, libuchardet, libiconv ? null, darwin
, waylandSupport ? stdenv.isLinux
@@ -135,8 +135,7 @@ in stdenv.mkDerivation rec {
'';
nativeBuildInputs = [
docutils makeWrapper perl
pkgconfig python3 which
addOpenGLRunpath docutils makeWrapper perl pkgconfig python3 which
];
buildInputs = [
@@ -214,11 +213,17 @@ in stdenv.mkDerivation rec {
${wrapperFlags}
'';
# Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found.
# See the explanation in addOpenGLRunpath.
postFixup = optionalString stdenv.isLinux ''
addOpenGLRunpath $out/bin/.mpv-wrapped
'';
meta = with stdenv.lib; {
description = "A media player that supports many video formats (MPlayer and mplayer2 fork)";
homepage = https://mpv.io;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ AndersonTorres fuuzetsu fpletz globin ];
maintainers = with maintainers; [ AndersonTorres fuuzetsu fpletz globin ivan ];
platforms = platforms.darwin ++ platforms.linux;
longDescription = ''