mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 12:02:23 +02:00
a160405284
Another fix for the crazy and insane nvidia preemption behavior. This time, the situation is that we are using vo_opengl with vdpau interop, and that vdpau got preempted in the background while mpv was sitting idly. This can be e.g. reproduced by using: --force-window=immediate --idle --hwdec=vdpau and switching VTs. Then after switching back, load a video file. This will not let mp_vdpau_handle_preemption() perform preemption recovery, simply because it will do so only once vdp_decoder_create() has been called. There are some other API calls which trigger preemption, but many don't. Due to the way the libavcodec API works, vdp_decoder_create() is way too late. It does so when get_format returns. It notices creating the decoder fails, and continues calling get_format without the vdpau format. We could perhaps force it to reinit again (by adding a call to vdpau.c, that checks for preemption, and sets hwdec_request_reinit), but this seems too much of a mess. Solve it by calling API in mp_vdpau_handle_preemption() that empirically does trigger preemption: output_surface_put_bits_native(). This call is useless, and in fact should be doing nothing (empty update VdpRect). There's the slight chance that in theory it will slow down operation, but in practice it's bound to be harmless. It's the likely cheapest and simplest API call I've found that can trigger the fallback this way. (The driver is closed source, so it was up to trial & error.) Also, when initializing decoding, allow initial preemption recovery, which is needed to pass the test mention above.
106 lines
3.1 KiB
C
106 lines
3.1 KiB
C
/*
|
|
* This file is part of mpv.
|
|
*
|
|
* mpv is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* mpv is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <libavcodec/avcodec.h>
|
|
#include <libavcodec/vdpau.h>
|
|
#include <libavutil/common.h>
|
|
|
|
#include "lavc.h"
|
|
#include "common/common.h"
|
|
#include "video/vdpau.h"
|
|
#include "video/hwdec.h"
|
|
|
|
struct priv {
|
|
struct mp_log *log;
|
|
struct mp_vdpau_ctx *mpvdp;
|
|
uint64_t preemption_counter;
|
|
};
|
|
|
|
static int init_decoder(struct lavc_ctx *ctx, int w, int h)
|
|
{
|
|
struct priv *p = ctx->hwdec_priv;
|
|
|
|
// During preemption, pretend everything is ok.
|
|
if (mp_vdpau_handle_preemption(p->mpvdp, &p->preemption_counter) < 0)
|
|
return 0;
|
|
|
|
return av_vdpau_bind_context(ctx->avctx, p->mpvdp->vdp_device,
|
|
p->mpvdp->get_proc_address,
|
|
AV_HWACCEL_FLAG_IGNORE_LEVEL |
|
|
AV_HWACCEL_FLAG_ALLOW_HIGH_DEPTH);
|
|
}
|
|
|
|
static struct mp_image *allocate_image(struct lavc_ctx *ctx, int w, int h)
|
|
{
|
|
struct priv *p = ctx->hwdec_priv;
|
|
|
|
// In case of preemption, reinit the decoder. Setting hwdec_request_reinit
|
|
// will cause init_decoder() to be called again.
|
|
if (mp_vdpau_handle_preemption(p->mpvdp, &p->preemption_counter) == 0)
|
|
ctx->hwdec_request_reinit = true;
|
|
|
|
VdpChromaType chroma = 0;
|
|
uint32_t s_w = w, s_h = h;
|
|
if (av_vdpau_get_surface_parameters(ctx->avctx, &chroma, &s_w, &s_h) < 0)
|
|
return NULL;
|
|
|
|
return mp_vdpau_get_video_surface(p->mpvdp, chroma, s_w, s_h);
|
|
}
|
|
|
|
static void uninit(struct lavc_ctx *ctx)
|
|
{
|
|
struct priv *p = ctx->hwdec_priv;
|
|
|
|
talloc_free(p);
|
|
|
|
av_freep(&ctx->avctx->hwaccel_context);
|
|
}
|
|
|
|
static int init(struct lavc_ctx *ctx)
|
|
{
|
|
struct priv *p = talloc_ptrtype(NULL, p);
|
|
*p = (struct priv) {
|
|
.log = mp_log_new(p, ctx->log, "vdpau"),
|
|
.mpvdp = ctx->hwdec_info->hwctx->vdpau_ctx,
|
|
};
|
|
ctx->hwdec_priv = p;
|
|
|
|
mp_vdpau_handle_preemption(p->mpvdp, &p->preemption_counter);
|
|
return 0;
|
|
}
|
|
|
|
static int probe(struct vd_lavc_hwdec *hwdec, struct mp_hwdec_info *info,
|
|
const char *decoder)
|
|
{
|
|
hwdec_request_api(info, "vdpau");
|
|
if (!info || !info->hwctx || !info->hwctx->vdpau_ctx)
|
|
return HWDEC_ERR_NO_CTX;
|
|
if (mp_vdpau_guess_if_emulated(info->hwctx->vdpau_ctx))
|
|
return HWDEC_ERR_EMULATED;
|
|
return 0;
|
|
}
|
|
|
|
const struct vd_lavc_hwdec mp_vd_lavc_vdpau = {
|
|
.type = HWDEC_VDPAU,
|
|
.image_format = IMGFMT_VDPAU,
|
|
.probe = probe,
|
|
.init = init,
|
|
.uninit = uninit,
|
|
.init_decoder = init_decoder,
|
|
.allocate_image = allocate_image,
|
|
};
|