RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-11 09:29:29 +00:00
Code Issues Releases Wiki Activity

vdpau: don't fallback to software decoding on preemption

Browse Source 
This was requested by someone. Not sure if it's a good idea; it seems
more can go wrong than right.
This commit is contained in:
wm4 2014-05-18 18:59:59 +02:00
parent 537ac1a15f
commit b3aa5dafa3
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
video/decode/vdpau.c
View File

@ -34,6 +34,7 @@ struct priv {
struct mp_vdpau_ctx *mpvdp;
struct vdp_functions *vdp;
uint64_t preemption_counter;
int fmt, w, h;
AVVDPAUContext context;
};
@ -67,8 +68,13 @@ static int init_decoder(struct lavc_ctx *ctx, int fmt, int w, int h)
VdpDevice vdp_device = p->mpvdp->vdp_device;
VdpStatus vdp_st;
if (mp_vdpau_handle_preemption(p->mpvdp, &p->preemption_counter) < 1)
goto fail;
p->fmt = fmt;
p->w = w;
p->h = h;
// During preemption, pretend everything is ok.
if (mp_vdpau_handle_preemption(p->mpvdp, &p->preemption_counter) < 0)
return 0;
if (p->context.decoder != VDP_INVALID_HANDLE)
vdp->decoder_destroy(p->context.decoder);
@ -114,11 +120,10 @@ static struct mp_image *allocate_image(struct lavc_ctx *ctx, int fmt,
{
struct priv *p = ctx->hwdec_priv;
// Trigger software fallback, but only _after_ recovery. This way,
// vo_reconfig will not fail (which it will during preemption on systems
// with nvidia binary drivers).
if (mp_vdpau_handle_preemption(p->mpvdp, &p->preemption_counter) == 0)
return NULL;
if (mp_vdpau_handle_preemption(p->mpvdp, &p->preemption_counter) == 0) {
if (init_decoder(ctx, p->fmt, p->w, p->h) < 0)
return NULL;
}
VdpChromaType chroma;
mp_vdpau_get_format(IMGFMT_VDPAU, &chroma, NULL);