Thomas Guillem pushed to branch master at VideoLAN / VLC
Commits: db9d5ef7 by Thomas Guillem at 2021-12-16T15:03:36+00:00 vdpau: don't use the VAAPI backend And favor our original VAAPI backend. Fixes #26361 - - - - - 6eac337a by Thomas Guillem at 2021-12-16T15:03:36+00:00 vdpau: remove useless vlc_obj_free - - - - - 1 changed file: - modules/video_output/opengl/interop_vdpau.c Changes: ===================================== modules/video_output/opengl/interop_vdpau.c ===================================== @@ -223,8 +223,19 @@ DecoderDeviceOpen(vlc_decoder_device *device, vout_window_t *window) if (vdp_get_x11(window->display.x11, -1, &sys->vdp, &sys->device) != VDP_STATUS_OK) + return VLC_EGENERIC; + + const char *infos; + VdpStatus status = vdp_get_information_string(sys->vdp, &infos); + /* Favor original backends. Example: don't use a VAAPI backend when we + * have VAAPI decoder devices. */ + if (status != VDP_STATUS_OK + || strstr(infos, "VAAPI") != NULL) { - vlc_obj_free(VLC_OBJECT(device), sys); + if (status == VDP_STATUS_OK) + msg_Dbg(device, "Not using '%s', favor a decdev with a compatible backend", + infos); + vdp_release_x11(sys->vdp); return VLC_EGENERIC; } View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c926b2ce5457cdacfd5bce0d1e1861e79c8291c4...6eac337aaa069bf336543ee784ffdbbdc070c208 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c926b2ce5457cdacfd5bce0d1e1861e79c8291c4...6eac337aaa069bf336543ee784ffdbbdc070c208 You're receiving this email because of your account on code.videolan.org.
_______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits