mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 12:02:23 +02:00
ea4685b233
The old way of using wayland in mpv relied on an external renderloop for semi-accurate timings. This had multiple issues though. Display sync would break whenever the window was hidden (since the frame callback stopped being executed) which was really annoying. Also the entire external renderloop logic was kind of fragile and didn't play well with mpv's internal structure (i.e. using presentation time in that old paradigm breaks stats.lua). Basically the problem is that swap buffers blocks on wayland which is crap whenever you hide the mpv window since it looks up the entire player. So you have to make swap buffers not block, but this has a different problem. Timings will be terrible if you use the unblocked swap buffers call. Based on some discussion in #wayland, the trick here is relatively simple and works well enough for our purposes. Instead we basically build a way to block with a timeout in the wayland buffer swap functions. A bool is set in the frame callback function that indicates whether or not mpv is waiting for a frame to be displayed. In the actual buffer swap function, we enter into a while loop waiting for this flag to be set. At the same time, the wl_display is polled to block the thread and wakeup if it receives any events from the compositor. This loop only breaks if enough time has passed or if the frame callback bool is received. In the near future, it is better to set whether or not frame a frame has been displayed in the presentation feedback. However as a first pass, doing it in the frame callback is more than good enough. The "downside" is that we render frames that aren't actually shown on screen when the player is hidden (it seems like wayland people don't like that). But who cares. Accurate timings are way more important. It's probably not too hard to add that behavior back in the player though.
107 lines
2.7 KiB
C
107 lines
2.7 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 "video/out/gpu/context.h"
|
|
#include "video/out/w32_common.h"
|
|
|
|
#include "common.h"
|
|
#include "context.h"
|
|
#include "utils.h"
|
|
|
|
EXTERN_C IMAGE_DOS_HEADER __ImageBase;
|
|
#define HINST_THISCOMPONENT ((HINSTANCE)&__ImageBase)
|
|
|
|
struct priv {
|
|
struct mpvk_ctx vk;
|
|
};
|
|
|
|
static void win_uninit(struct ra_ctx *ctx)
|
|
{
|
|
struct priv *p = ctx->priv;
|
|
|
|
ra_vk_ctx_uninit(ctx);
|
|
mpvk_uninit(&p->vk);
|
|
vo_w32_uninit(ctx->vo);
|
|
}
|
|
|
|
static bool win_init(struct ra_ctx *ctx)
|
|
{
|
|
struct priv *p = ctx->priv = talloc_zero(ctx, struct priv);
|
|
struct mpvk_ctx *vk = &p->vk;
|
|
int msgl = ctx->opts.probing ? MSGL_V : MSGL_ERR;
|
|
|
|
if (!mpvk_init(vk, ctx, VK_KHR_WIN32_SURFACE_EXTENSION_NAME))
|
|
goto error;
|
|
|
|
if (!vo_w32_init(ctx->vo))
|
|
goto error;
|
|
|
|
VkWin32SurfaceCreateInfoKHR wininfo = {
|
|
.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR,
|
|
.hinstance = HINST_THISCOMPONENT,
|
|
.hwnd = vo_w32_hwnd(ctx->vo),
|
|
};
|
|
|
|
struct ra_vk_ctx_params params = {0};
|
|
|
|
VkInstance inst = vk->vkinst->instance;
|
|
VkResult res = vkCreateWin32SurfaceKHR(inst, &wininfo, NULL, &vk->surface);
|
|
if (res != VK_SUCCESS) {
|
|
MP_MSG(ctx, msgl, "Failed creating Windows surface\n");
|
|
goto error;
|
|
}
|
|
|
|
if (!ra_vk_ctx_init(ctx, vk, params, VK_PRESENT_MODE_FIFO_KHR))
|
|
goto error;
|
|
|
|
return true;
|
|
|
|
error:
|
|
win_uninit(ctx);
|
|
return false;
|
|
}
|
|
|
|
static bool resize(struct ra_ctx *ctx)
|
|
{
|
|
return ra_vk_ctx_resize(ctx, ctx->vo->dwidth, ctx->vo->dheight);
|
|
}
|
|
|
|
static bool win_reconfig(struct ra_ctx *ctx)
|
|
{
|
|
vo_w32_config(ctx->vo);
|
|
return resize(ctx);
|
|
}
|
|
|
|
static int win_control(struct ra_ctx *ctx, int *events, int request, void *arg)
|
|
{
|
|
int ret = vo_w32_control(ctx->vo, events, request, arg);
|
|
if (*events & VO_EVENT_RESIZE) {
|
|
if (!resize(ctx))
|
|
return VO_ERROR;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
const struct ra_ctx_fns ra_ctx_vulkan_win = {
|
|
.type = "vulkan",
|
|
.name = "winvk",
|
|
.reconfig = win_reconfig,
|
|
.control = win_control,
|
|
.init = win_init,
|
|
.uninit = win_uninit,
|
|
};
|