diff options
author | Philip Langdale <philipl@overt.org> | 2019-12-28 12:58:39 -0800 |
---|---|---|
committer | Philip Langdale <github.philipl@overt.org> | 2019-12-29 14:32:47 -0800 |
commit | 9c05be8999a77deea056c8c4952ab37756d05ce2 (patch) | |
tree | 9e5e7eb1e606adb7882175f5e7e8c164e13c3386 /DOCS/man/options.rst | |
parent | f0d0822595c7dc3e2a20aa3e153a94f08f1d88dd (diff) | |
download | mpv-9c05be8999a77deea056c8c4952ab37756d05ce2.tar.bz2 mpv-9c05be8999a77deea056c8c4952ab37756d05ce2.tar.xz |
video: cuda: add explicit context creation for copy hwaccels
In the distant past, the cuviddec backed copy hwaccel could be
configured directly using lavc options. However, since that time,
we gained support for automatic hw ctx creation which ended up
bypassing the lavc options.
Rather than trying to find a way to pass those options again, a
better idea is to make the 'cuda-decode-device' option, used by
the interop hwaccels, work for the copy hwaccels too.
And that's pretty simple: we have to add a create function that
checks the option and passes it on to ffmpeg.
Note that this does require a slight re-jig to the configuration
flags, as we now have a scenario where we want to build with support
for the cuda copy hwaccels but not the interop ones. So we need
a distinct configuration flag for that combination.
Fixes #7295.
Diffstat (limited to 'DOCS/man/options.rst')
-rw-r--r-- | DOCS/man/options.rst | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index 3362cd142a..ce3bea5a15 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -1233,17 +1233,18 @@ Video ``--cuda-decode-device=<auto|0..>`` Choose the GPU device used for decoding when using the ``cuda`` or - ``nvdec`` hwdecs with the OpenGL GPU backend. + ``nvdec`` hwdecs with the OpenGL GPU backend, and with the ``cuda-copy`` + or ``nvdec-copy`` hwdecs in all cases. - By default, the device that is being used to provide ``gpu`` output will - also be used for decoding (and in the vast majority of cases, only one - GPU will be present). + For the OpenGL GPU backend, the default device used for decoding is the one + being used to provide ``gpu`` output (and in the vast majority of cases, + only one GPU will be present). - Note that when using the ``cuda-copy`` or ``nvdec-copy`` hwdec, a - different option must be passed: ``--vd-lavc-o=gpu=<0..>``. + For the ``copy`` hwdecs, the default device will be the first device + enumerated by the CUDA libraries - however that is done. - Note that this option is not available with the Vulkan GPU backend. With - Vulkan, decoding must always happen on the display device. + For the Vulkan GPU backend, decoding must always happen on the display + device, and this option has no effect. ``--vaapi-device=<device file>`` Choose the DRM device for ``vaapi-copy``. This should be the path to a |