From 0ec35fa111391b8069640ba2f616746a1b5530a5 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 17 Nov 2015 21:07:41 +0100 Subject: videotoolbox: make decoder format customizable Because apparently there's no ideal universally working format. The weird OpenGL texture format for kCVPixelFormatType_32BGRA is from: http://stackoverflow.com/questions/22077544/draw-an-iosurface-to-an-opengl-context (Which apparently got it from the linked Apple example code.) --- video/out/vo_opengl_cb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'video/out/vo_opengl_cb.c') diff --git a/video/out/vo_opengl_cb.c b/video/out/vo_opengl_cb.c index 687b9e3528..b90031d922 100644 --- a/video/out/vo_opengl_cb.c +++ b/video/out/vo_opengl_cb.c @@ -58,6 +58,7 @@ struct vo_priv { struct mpv_opengl_cb_context { struct mp_log *log; + struct mpv_global *global; struct mp_client_api *client_api; pthread_mutex_t lock; @@ -130,6 +131,7 @@ struct mpv_opengl_cb_context *mp_opengl_create(struct mpv_global *g, ctx->gl = talloc_zero(ctx, GL); + ctx->global = g; ctx->log = mp_log_new(ctx, g->log, "opengl-cb"); ctx->client_api = client_api; @@ -178,7 +180,8 @@ int mpv_opengl_cb_init_gl(struct mpv_opengl_cb_context *ctx, const char *exts, if (!ctx->renderer) return MPV_ERROR_UNSUPPORTED; - ctx->hwdec = gl_hwdec_load_api_id(ctx->log, ctx->gl, ctx->hwdec_api); + ctx->hwdec = gl_hwdec_load_api_id(ctx->log, ctx->gl, ctx->global, + ctx->hwdec_api); gl_video_set_hwdec(ctx->renderer, ctx->hwdec); if (ctx->hwdec) ctx->hwdec_info.hwctx = ctx->hwdec->hwctx; -- cgit v1.2.3