RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-25 00:02:13 +00:00
Code Issues Releases Wiki Activity

vaapi: properly set hw_subfmt field with new decode API

Browse Source 
This fixes direct rendering with hwdec_vaegl.c.

The code duplication between update_image_params() and
mp_image_copy_fields_from_av_frame() is quite annoying,
bit will have to be resolved in another commit.
This commit is contained in:
wm4 2017-01-12 09:40:16 +01:00
parent a51e991b56
commit 26d25d567f
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
video/decode/vaapi.c
View File

@ -101,12 +101,6 @@ static int init_decoder(struct lavc_ctx *ctx, int w, int h)
return 0;
}
static struct mp_image *update_format(struct lavc_ctx *ctx, struct mp_image *img)
{
va_surface_init_subformat(img);
return img;
}
static void uninit(struct lavc_ctx *ctx)
{
struct priv *p = ctx->hwdec_priv;
@ -222,7 +216,6 @@ const struct vd_lavc_hwdec mp_vd_lavc_vaapi = {
.init_decoder = init_decoder,
.lock = intel_shit_lock,
.unlock = intel_crap_unlock,
.process_image = update_format,
};
const struct vd_lavc_hwdec mp_vd_lavc_vaapi_copy = {

6
video/decode/vd_lavc.c
View File

@ -24,6 +24,7 @@
#include <libavutil/common.h>
#include <libavutil/opt.h>
#include <libavutil/hwcontext.h>
#include <libavutil/intreadwrite.h>
#include <libavutil/pixdesc.h>
@ -659,6 +660,11 @@ static void update_image_params(struct dec_video *vd, AVFrame *frame,
.rotate = vd->codec->rotate,
.stereo_in = vd->codec->stereo_mode,
};
if (frame->hw_frames_ctx) {
AVHWFramesContext *fctx = (void *)frame->hw_frames_ctx->data;
out_params->hw_subfmt = pixfmt2imgfmt(fctx->sw_format);
}
}
static enum AVPixelFormat get_format_hwdec(struct AVCodecContext *avctx,

6
video/mp_image.c
View File

@ -27,6 +27,7 @@
#include <libavutil/mem.h>
#include <libavutil/common.h>
#include <libavutil/bswap.h>
#include <libavutil/hwcontext.h>
#include <libavutil/rational.h>
#include <libavcodec/avcodec.h>
@ -706,6 +707,11 @@ static void mp_image_copy_fields_from_av_frame(struct mp_image *dst,
dst->fields |= MP_IMGFIELD_TOP_FIRST;
if (src->repeat_pict == 1)
dst->fields |= MP_IMGFIELD_REPEAT_FIRST;
if (src->hw_frames_ctx) {
AVHWFramesContext *fctx = (void *)src->hw_frames_ctx->data;
dst->params.hw_subfmt = pixfmt2imgfmt(fctx->sw_format);
}
}
// Copy properties and data of the mp_image into the AVFrame, without taking