diff options
| -rw-r--r-- | video/out/opengl/context_dxinterop.c | 3 | ||||
| -rw-r--r-- | video/out/opengl/hwdec.c | 4 | ||||
| -rw-r--r-- | video/out/opengl/hwdec_dxva2gldx.c | 222 | ||||
| -rw-r--r-- | wscript | 5 | ||||
| -rw-r--r-- | wscript_build.py | 1 |
5 files changed, 235 insertions, 0 deletions
diff --git a/video/out/opengl/context_dxinterop.c b/video/out/opengl/context_dxinterop.c index ff7eed6654..b4d999165e 100644 --- a/video/out/opengl/context_dxinterop.c +++ b/video/out/opengl/context_dxinterop.c @@ -580,6 +580,9 @@ static int dxinterop_init(struct MPGLContext *ctx, int flags) DwmEnableMMCSS(TRUE); + ctx->native_display_type = "IDirect3DDevice9Ex"; + ctx->native_display = p->device; + return 0; fail: dxinterop_uninit(ctx); diff --git a/video/out/opengl/hwdec.c b/video/out/opengl/hwdec.c index 6afc9b6efd..3349c06f15 100644 --- a/video/out/opengl/hwdec.c +++ b/video/out/opengl/hwdec.c @@ -28,6 +28,7 @@ extern const struct gl_hwdec_driver gl_hwdec_vaegl; extern const struct gl_hwdec_driver gl_hwdec_vaglx; extern const struct gl_hwdec_driver gl_hwdec_videotoolbox; extern const struct gl_hwdec_driver gl_hwdec_vdpau; +extern const struct gl_hwdec_driver gl_hwdec_dxva2gldx; extern const struct gl_hwdec_driver gl_hwdec_dxva2; static const struct gl_hwdec_driver *const mpgl_hwdec_drivers[] = { @@ -43,6 +44,9 @@ static const struct gl_hwdec_driver *const mpgl_hwdec_drivers[] = { #if HAVE_VIDEOTOOLBOX_GL &gl_hwdec_videotoolbox, #endif +#if HAVE_DXVA2_DXINTEROP + &gl_hwdec_dxva2gldx, +#endif #if HAVE_DXVA2_HWACCEL &gl_hwdec_dxva2, #endif diff --git a/video/out/opengl/hwdec_dxva2gldx.c b/video/out/opengl/hwdec_dxva2gldx.c new file mode 100644 index 0000000000..d6560ba6c5 --- /dev/null +++ b/video/out/opengl/hwdec_dxva2gldx.c @@ -0,0 +1,222 @@ +/* + * 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 <assert.h> + +#include "common/common.h" +#include "osdep/windows_utils.h" +#include "hwdec.h" +#include "video/hwdec.h" +#include "video/d3d.h" +#include "video/dxva2.h" + +// for WGL_ACCESS_READ_ONLY_NV +#include <GL/wglext.h> + +#define SHARED_SURFACE_D3DFMT D3DFMT_X8R8G8B8 +#define SHARED_SURFACE_MPFMT IMGFMT_RGB0 +struct priv { + struct mp_d3d_ctx ctx; + IDirect3DDevice9Ex *device; + HANDLE device_h; + + IDirect3DSurface9 *surface; + HANDLE surface_h; + GLuint texture; + HANDLE texture_h; +}; + +static void destroy_objects(struct gl_hwdec *hw) +{ + struct priv *p = hw->priv; + GL *gl = hw->gl; + + if (p->texture_h && p->device_h) { + if (!gl->DXUnlockObjectsNV(p->device_h, 1, &p->texture_h)) { + MP_ERR(hw, "Failed unlocking texture for access by OpenGL: %s\n", + mp_LastError_to_str()); + } + } + + if (p->texture_h) { + if (!gl->DXUnregisterObjectNV(p->device_h, p->texture_h)) { + MP_ERR(hw, "Failed to unregister Direct3D surface with OpenGL: %s\n", + mp_LastError_to_str()); + } else { + p->texture_h = 0; + } + } + + gl->DeleteTextures(1, &p->texture); + p->texture = 0; + + if (p->surface) { + IDirect3DSurface9_Release(p->surface); + p->surface = NULL; + } +} + +static void destroy(struct gl_hwdec *hw) +{ + struct priv *p = hw->priv; + GL *gl = hw->gl; + destroy_objects(hw); + + if (!gl->DXCloseDeviceNV(p->device_h)) + MP_ERR(hw, "Failed to close Direct3D device in OpenGL %s\n", + mp_LastError_to_str()); + + if (p->device) + IDirect3DDevice9Ex_Release(p->device); +} + +static int create(struct gl_hwdec *hw) +{ + GL *gl = hw->gl; + if (hw->hwctx || !gl->MPGetNativeDisplay || + !(gl->mpgl_caps & MPGL_CAP_DXINTEROP)) { + return -1; + } + + struct priv *p = talloc_zero(hw, struct priv); + hw->priv = p; + + p->device = gl->MPGetNativeDisplay("IDirect3DDevice9Ex"); + if (!p->device) + return -1; + IDirect3DDevice9Ex_AddRef(p->device); + p->ctx.d3d9_device = (IDirect3DDevice9 *)p->device; + + p->device_h = gl->DXOpenDeviceNV(p->device); + if (!p->device_h) { + MP_ERR(hw, "Failed to open Direct3D device in OpenGL: %s\n", + mp_LastError_to_str()); + goto fail; + } + + p->ctx.hwctx.type = HWDEC_DXVA2; + p->ctx.hwctx.d3d_ctx = &p->ctx; + + hw->hwctx = &p->ctx.hwctx; + hw->converted_imgfmt = SHARED_SURFACE_MPFMT; + return 0; +fail: + destroy(hw); + return -1; +} + +static int reinit(struct gl_hwdec *hw, struct mp_image_params *params) +{ + struct priv *p = hw->priv; + GL *gl = hw->gl; + HRESULT hr; + + destroy_objects(hw); + + assert(params->imgfmt == hw->driver->imgfmt); + + hr = IDirect3DDevice9Ex_CreateOffscreenPlainSurface( + p->device, + params->w, params->h, + SHARED_SURFACE_D3DFMT, D3DPOOL_DEFAULT, + &p->surface, &p->surface_h); + if (FAILED(hr)) { + MP_ERR(hw, "Failed creating offscreen Direct3D surface: %s\n", + mp_HRESULT_to_str(hr)); + goto fail; + } + + if (p->surface_h && + !gl->DXSetResourceShareHandleNV(p->surface, p->surface_h)) { + MP_ERR(hw, "Failed setting Direct3D/OpenGL share handle for surface: %s\n", + mp_LastError_to_str()); + goto fail; + } + + gl->GenTextures(1, &p->texture); + gl->BindTexture(GL_TEXTURE_2D, p->texture); + gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + gl->BindTexture(GL_TEXTURE_2D, 0); + + p->texture_h = gl->DXRegisterObjectNV(p->device_h, p->surface, p->texture, + GL_TEXTURE_2D, + WGL_ACCESS_READ_ONLY_NV); + if (!p->texture_h) { + MP_ERR(hw, "Failed to register Direct3D surface with OpenGL: %s\n", + mp_LastError_to_str()); + goto fail; + } + + if (!gl->DXLockObjectsNV(p->device_h, 1, &p->texture_h)) { + MP_ERR(hw, "Failed locking texture for access by OpenGL %s\n", + mp_LastError_to_str()); + goto fail; + } + + return 0; +fail: + destroy_objects(hw); + return -1; +} + +static int map_image(struct gl_hwdec *hw, struct mp_image *hw_image, + GLuint *out_textures) +{ + assert(hw_image && hw_image->imgfmt == hw->driver->imgfmt); + GL *gl = hw->gl; + struct priv *p = hw->priv; + HRESULT hr; + + if (!gl->DXUnlockObjectsNV(p->device_h, 1, &p->texture_h)) { + MP_ERR(hw, "Failed unlocking texture for access by OpenGL: %s\n", + mp_LastError_to_str()); + return -1; + } + + IDirect3DSurface9* hw_surface = d3d9_surface_in_mp_image(hw_image); + RECT rc = {0, 0, hw_image->w, hw_image->h}; + hr = IDirect3DDevice9Ex_StretchRect(p->device, + hw_surface, &rc, + p->surface, &rc, + D3DTEXF_NONE); + if (FAILED(hr)) { + MP_ERR(hw, "Direct3D RGB conversion failed: %s", mp_HRESULT_to_str(hr)); + return -1; + } + + if (!gl->DXLockObjectsNV(p->device_h, 1, &p->texture_h)) { + MP_ERR(hw, "Failed locking texture for access by OpenGL: %s\n", + mp_LastError_to_str()); + return -1; + } + + out_textures[0] = p->texture; + return 0; +} + +const struct gl_hwdec_driver gl_hwdec_dxva2gldx = { + .name = "dxva2-dxinterop", + .api = HWDEC_DXVA2, + .imgfmt = IMGFMT_DXVA2, + .create = create, + .reinit = reinit, + .map_image = map_image, + .destroy = destroy, +}; @@ -681,6 +681,11 @@ video_output_features = [ 'eglCreateWindowSurface(0, 0, 0, 0)', lib='EGL') } , { + 'name': '--dxva2-dxinterop', + 'desc': 'DXVA2/OpenGL/DirectX Interop', + 'deps': [ 'gl-dxinterop' ], + 'func': check_true, + } , { 'name': '--vdpau', 'desc': 'VDPAU acceleration', 'deps': [ 'x11' ], diff --git a/wscript_build.py b/wscript_build.py index d759a6132b..8bcf054db6 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -337,6 +337,7 @@ def build(ctx): ( "video/out/opengl/egl_helpers.c", "egl-helpers" ), ( "video/out/opengl/hwdec.c", "gl" ), ( "video/out/opengl/hwdec_dxva2.c", "gl-win32" ), + ( "video/out/opengl/hwdec_dxva2gldx.c", "dxva2-dxinterop" ), ( "video/out/opengl/hwdec_vaegl.c", "vaapi-egl" ), ( "video/out/opengl/hwdec_vaglx.c", "vaapi-glx" ), ( "video/out/opengl/hwdec_osx.c", "videotoolbox-gl" ), |