diff options
author | wm4 <wm4@nowhere> | 2017-12-01 05:05:00 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-12-01 05:57:01 +0100 |
commit | 91586c35924ff8bd54eab549e7326d6cf2868b46 (patch) | |
tree | b76152da6a15dd1afcb8d7db396d47195d5b6427 /video/out/gpu/video.h | |
parent | 2cf58362932be56645b16942ef3985eb2d0af65f (diff) | |
download | mpv-91586c35924ff8bd54eab549e7326d6cf2868b46.tar.bz2 mpv-91586c35924ff8bd54eab549e7326d6cf2868b46.tar.xz |
vo_gpu: make it possible to load multiple hwdec interop drivers
Make the VO<->decoder interface capable of supporting multiple hwdec
APIs at once. The main gain is that this simplifies autoprobing a lot.
Before this change, it could happen that the VO loaded the "wrong" hwdec
API, and the decoder was stuck with the choice (breaking hw decoding).
With the change applied, the VO simply loads all available APIs, so
autoprobing trickery is left entirely to the decoder.
In the past, we were quite careful about not accidentally loading the
wrong interop drivers. This was in part to make sure autoprobing works,
but also because libva had this obnoxious bug of dumping garbage to
stderr when using the API. libva was fixed, so this is not a problem
anymore.
The --opengl-hwdec-interop option is changed in various ways (again...),
and renamed to --gpu-hwdec-interop. It does not have much use anymore,
other than debugging. It's notable that the order in the hwdec interop
array ra_hwdec_drivers[] still matters if multiple drivers support the
same image formats, so the option can explicitly force one, if that
should ever be necessary, or more likely, for debugging. One example are
the ra_hwdec_d3d11egl and ra_hwdec_d3d11eglrgb drivers, which both
support d3d11 input.
vo_gpu now always loads the interop lazily by default, but when it does,
it loads them all. vo_opengl_cb now always loads them when the GL
context handle is initialized. I don't expect that this causes any
problems.
It's now possible to do things like changing between vdpau and nvdec
decoding at runtime.
This is also preparation for cleaning up vd_lavc.c hwdec autoprobing.
It's another reason why hwdec_devices_request_all() does not take a
hwdec type anymore.
Diffstat (limited to 'video/out/gpu/video.h')
-rw-r--r-- | video/out/gpu/video.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/video/out/gpu/video.h b/video/out/gpu/video.h index b87390f4d1..78f8828f99 100644 --- a/video/out/gpu/video.h +++ b/video/out/gpu/video.h @@ -139,6 +139,7 @@ struct gl_video_opts { struct mp_icc_opts *icc_opts; int early_flush; char *shader_cache_dir; + char *hwdec_interop; }; extern const struct m_sub_options gl_video_conf; @@ -176,8 +177,10 @@ struct mp_colorspace gl_video_get_output_colorspace(struct gl_video *p); void gl_video_reset(struct gl_video *p); bool gl_video_showing_interpolated_frame(struct gl_video *p); -struct ra_hwdec; -void gl_video_set_hwdec(struct gl_video *p, struct ra_hwdec *hwdec); +struct mp_hwdec_devices; +void gl_video_load_hwdecs(struct gl_video *p, struct mp_hwdec_devices *devs, + bool load_all_by_default); +void gl_video_load_hwdecs_all(struct gl_video *p, struct mp_hwdec_devices *devs); struct vo; void gl_video_configure_queue(struct gl_video *p, struct vo *vo); |