RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vdpau: fix preemption handling 

Signed-off-by: wm4 <wm4@nowhere>
This commit is contained in:
Dan Oscarsson 2015-03-31 14:45:35 +02:00 committed by wm4
parent a6bf38bcad
commit 33d587ffa9
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
video/decode/vdpau.c
View File

@ -29,6 +29,7 @@
#include "video/fmt-conversion.h"
#include "video/vdpau.h"
#include "video/hwdec.h"
#include "video/decode/dec_video.h"
struct priv {
struct mp_log *log;
@ -148,6 +149,24 @@ static void uninit(struct lavc_ctx *ctx)
ctx->hwdec_priv = NULL;
}
#if LIBAVCODEC_VERSION_MICRO >= 100
static int render2(struct AVCodecContext *avctx, struct AVFrame *frame,
const VdpPictureInfo *pic_info, uint32_t buffers_used,
const VdpBitstreamBuffer *buffers)
{
struct dec_video *vd = avctx->opaque;
struct lavc_ctx *ctx = vd->priv;
struct priv *p = ctx->hwdec_priv;
VdpVideoSurface surf = (uintptr_t)frame->data[3];
VdpStatus status;
status = p->vdp->decoder_render(p->context->decoder, surf, pic_info,
buffers_used, buffers);
return status;
}
#endif
static int init(struct lavc_ctx *ctx)
{
struct priv *p = talloc_ptrtype(NULL, p);
@ -162,7 +181,11 @@ static int init(struct lavc_ctx *ctx)
goto error;
p->vdp = &p->mpvdp->vdp;
#if LIBAVCODEC_VERSION_MICRO >= 100
p->context->render2 = render2;
#else
p->context->render = p->vdp->decoder_render;
#endif
p->context->decoder = VDP_INVALID_HANDLE;
if (mp_vdpau_handle_preemption(p->mpvdp, &p->preemption_counter) < 1)