[vlc-commits] direct3d11: use the D3D11 decoder device to initialize the display module
Steve Lhomme
git at videolan.org
Wed Sep 18 15:58:30 CEST 2019
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Sep 18 14:41:41 2019 +0200| [79cd0b7621b1dc1e61e5503ff2df1a89e0c1f212] | committer: Steve Lhomme
direct3d11: use the D3D11 decoder device to initialize the display module
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=79cd0b7621b1dc1e61e5503ff2df1a89e0c1f212
---
modules/video_output/win32/d3d11_swapchain.c | 42 ++++-----------
modules/video_output/win32/d3d11_swapchain.h | 4 +-
modules/video_output/win32/direct3d11.c | 80 +++++++++++-----------------
3 files changed, 44 insertions(+), 82 deletions(-)
diff --git a/modules/video_output/win32/d3d11_swapchain.c b/modules/video_output/win32/d3d11_swapchain.c
index 67d9a381cc..5ebe877987 100644
--- a/modules/video_output/win32/d3d11_swapchain.c
+++ b/modules/video_output/win32/d3d11_swapchain.c
@@ -33,6 +33,7 @@
#include <assert.h>
+#include <windows.h>
#if !defined(_WIN32_WINNT) || _WIN32_WINNT < _WIN32_WINNT_WIN7
# undef _WIN32_WINNT
# define _WIN32_WINNT _WIN32_WINNT_WIN7
@@ -49,6 +50,7 @@
#include "d3d11_swapchain.h"
#include "d3d11_shaders.h"
+#include "../../video_chroma/d3d9_fmt.h"
typedef enum video_color_axis {
COLOR_AXIS_RGB,
@@ -68,7 +70,6 @@ typedef struct {
struct d3d11_local_swapchain
{
vlc_object_t *obj;
- d3d11_handle_t *hd3d;
d3d11_device_t d3d_dev;
const d3d_format_t *pixelFormat;
@@ -432,30 +433,6 @@ static bool UpdateSwapchain( struct d3d11_local_swapchain *display, const libvlc
return true;
}
-bool LocalSwapchainSetupDevice( void **opaque, const libvlc_video_direct3d_device_cfg_t *cfg, libvlc_video_direct3d_device_setup_t *out )
-{
- struct d3d11_local_swapchain *display = *opaque;
- HRESULT hr;
-#if VLC_WINSTORE_APP
- ID3D11DeviceContext *legacy_ctx = var_InheritInteger( display->obj, "winrt-d3dcontext" ); /* LEGACY */
- if ( legacy_ctx == NULL )
- hr = E_FAIL;
- else
- hr = D3D11_CreateDeviceExternal( display->obj,
- legacy_ctx,
- cfg->hardware_decoding,
- &display->d3d_dev );
-#else /* !VLC_WINSTORE_APP */
- hr = D3D11_CreateDevice( display->obj, display->hd3d, NULL,
- cfg->hardware_decoding,
- &display->d3d_dev );
-#endif /* !VLC_WINSTORE_APP */
- if ( FAILED( hr ) )
- return false;
- out->device_context = display->d3d_dev.d3dcontext;
- return true;
-}
-
void LocalSwapchainCleanupDevice( void *opaque )
{
struct d3d11_local_swapchain *display = opaque;
@@ -563,16 +540,17 @@ bool LocalSwapchainSelectPlane( void *opaque, size_t plane )
return true;
}
-void *CreateLocalSwapchainHandle(vlc_object_t *o, d3d11_handle_t *hd3d, HWND hwnd)
+void *CreateLocalSwapchainHandle(vlc_object_t *o, HWND hwnd, ID3D11DeviceContext *d3d11_ctx)
{
struct d3d11_local_swapchain *display = vlc_obj_calloc(o, 1, sizeof(*display));
- if (likely(display != NULL))
- {
- display->obj = o;
- display->hd3d = hd3d;
+ if (unlikely(display == NULL))
+ return NULL;
+
+ display->obj = o;
#if !VLC_WINSTORE_APP
- display->swapchainHwnd = hwnd;
+ display->swapchainHwnd = hwnd;
#endif /* !VLC_WINSTORE_APP */
- }
+ D3D11_CreateDeviceExternal( o, d3d11_ctx, false /* is_d3d11_opaque(vd->source.i_chroma) */, &display->d3d_dev);
+
return display;
}
diff --git a/modules/video_output/win32/d3d11_swapchain.h b/modules/video_output/win32/d3d11_swapchain.h
index f6a4d15201..6a4bbae5ea 100644
--- a/modules/video_output/win32/d3d11_swapchain.h
+++ b/modules/video_output/win32/d3d11_swapchain.h
@@ -25,11 +25,11 @@
#define VLC_D3D11_SWAPCHAIN_H
#include <vlc_common.h>
+#include <vlc_codec.h>
#include "../../video_chroma/d3d11_fmt.h"
-void *CreateLocalSwapchainHandle(vlc_object_t *, d3d11_handle_t *, HWND);
+void *CreateLocalSwapchainHandle(vlc_object_t *, HWND, ID3D11DeviceContext *);
-bool LocalSwapchainSetupDevice( void **opaque, const libvlc_video_direct3d_device_cfg_t *cfg, libvlc_video_direct3d_device_setup_t *out );
void LocalSwapchainCleanupDevice( void *opaque );
void LocalSwapchainSwap( void *opaque );
bool LocalSwapchainUpdateOutput( void *opaque, const libvlc_video_direct3d_cfg_t *cfg, libvlc_video_output_cfg_t *out );
diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index 278973911b..9fa245a5f1 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -80,7 +80,6 @@ vlc_module_begin ()
add_bool("direct3d11-hw-blending", true, HW_BLENDING_TEXT, HW_BLENDING_LONGTEXT, true)
#if VLC_WINSTORE_APP
- add_integer("winrt-d3dcontext", 0x0, NULL, NULL, true) /* ID3D11DeviceContext* */
add_integer("winrt-swapchain", 0x0, NULL, NULL, true) /* IDXGISwapChain1* */
#endif
@@ -123,8 +122,6 @@ struct vout_display_sys_t
/* outside rendering */
void *outside_opaque;
- libvlc_video_direct3d_device_setup_cb setupDeviceCb;
- libvlc_video_direct3d_device_cleanup_cb cleanupDeviceCb;
libvlc_video_direct3d_update_output_cb updateOutputCb;
libvlc_video_swap_cb swapCb;
libvlc_video_direct3d_start_end_rendering_cb startEndRenderingCb;
@@ -323,34 +320,44 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
CommonInit(vd, &sys->area, cfg);
sys->outside_opaque = var_InheritAddress( vd, "vout-cb-opaque" );
- sys->setupDeviceCb = var_InheritAddress( vd, "vout-cb-setup" );
- sys->cleanupDeviceCb = var_InheritAddress( vd, "vout-cb-cleanup" );
sys->updateOutputCb = var_InheritAddress( vd, "vout-cb-update-output" );
sys->swapCb = var_InheritAddress( vd, "vout-cb-swap" );
sys->startEndRenderingCb = var_InheritAddress( vd, "vout-cb-make-current" );
sys->selectPlaneCb = var_InheritAddress( vd, "vout-cb-select-plane" );
- if ( sys->setupDeviceCb == NULL || sys->swapCb == NULL || sys->startEndRenderingCb == NULL || sys->updateOutputCb == NULL )
+ d3d11_decoder_device_t *d3d11_decoder = NULL;
+ if ( context && context->device->type == VLC_DECODER_DEVICE_D3D11VA )
+ d3d11_decoder = context->device->opaque;
+
+ HRESULT hr;
+ if (d3d11_decoder && d3d11_decoder->device)
{
-#if VLC_WINSTORE_APP
- /* LEGACY, the d3dcontext and swapchain were given by the host app */
- if (var_InheritInteger(vd, "winrt-d3dcontext") == 0)
- {
- msg_Err(vd, "missing direct3d context for winstore");
- goto error;
- }
-#else /* !VLC_WINSTORE_APP */
+ hr = D3D11_CreateDeviceExternal(vd, d3d11_decoder->device,
+ is_d3d11_opaque(vd->source.i_chroma),
+ &sys->d3d_dev);
+ }
+ else
+ {
+ // No d3d11 device, we create one
+ hr = D3D11_CreateDevice(vd, &sys->hd3d, NULL, false, &sys->d3d_dev);
+ }
+ if (FAILED(hr)) {
+ msg_Err(vd, "Could not Create the D3D11 device. (hr=0x%lX)", hr);
+ goto error;
+ }
+
+ if ( sys->swapCb == NULL || sys->startEndRenderingCb == NULL || sys->updateOutputCb == NULL )
+ {
+#if !VLC_WINSTORE_APP
if (CommonWindowInit(VLC_OBJECT(vd), &sys->area, &sys->sys,
vd->source.projection_mode != PROJECTION_MODE_RECTANGULAR))
goto error;
#endif /* !VLC_WINSTORE_APP */
/* use our internal swapchain callbacks */
- sys->outside_opaque = CreateLocalSwapchainHandle(VLC_OBJECT(vd), &sys->hd3d, sys->sys.hvideownd);
+ sys->outside_opaque = CreateLocalSwapchainHandle(VLC_OBJECT(vd), sys->sys.hvideownd, sys->d3d_dev.d3dcontext);
if (unlikely(sys->outside_opaque == NULL))
goto error;
- sys->setupDeviceCb = LocalSwapchainSetupDevice;
- sys->cleanupDeviceCb = LocalSwapchainCleanupDevice;
sys->updateOutputCb = LocalSwapchainUpdateOutput;
sys->swapCb = LocalSwapchainSwap;
sys->startEndRenderingCb = LocalSwapchainStartEndRendering;
@@ -366,7 +373,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
}
vout_window_SetTitle(sys->area.vdcfg.window, VOUT_TITLE " (Direct3D11 output)");
- msg_Dbg(vd, "Direct3D11 device adapter successfully initialized");
+ msg_Dbg(vd, "Direct3D11 display adapter successfully initialized");
vd->info.can_scale_spu = true;
@@ -870,29 +877,6 @@ static const d3d_format_t *GetBlendableFormat(vout_display_t *vd, vlc_fourcc_t i
static int Direct3D11Open(vout_display_t *vd, video_format_t *fmtp)
{
vout_display_sys_t *sys = vd->sys;
- HRESULT hr = E_FAIL;
-
- libvlc_video_direct3d_device_cfg_t cfg = {
- .hardware_decoding = is_d3d11_opaque( vd->source.i_chroma ),
- };
- libvlc_video_direct3d_device_setup_t out;
- if ( !sys->setupDeviceCb( &sys->outside_opaque, &cfg, &out ) ||
- out.device_context == NULL )
- {
- msg_Err(vd, "Missing external ID3D11DeviceContext");
- return VLC_EGENERIC;
- }
- ID3D11DeviceContext *d3d11_ctx = out.device_context;
- hr = D3D11_CreateDeviceExternal(vd, d3d11_ctx,
- is_d3d11_opaque(vd->source.i_chroma),
- &sys->d3d_dev);
- if (FAILED(hr)) {
- msg_Err(vd, "Could not Create the D3D11 device. (hr=0x%lX)", hr);
- if ( sys->cleanupDeviceCb )
- sys->cleanupDeviceCb( sys->outside_opaque );
- return VLC_EGENERIC;
- }
-
video_format_t fmt;
video_format_Copy(&fmt, &vd->source);
int err = SetupOutputFormat(vd, &fmt);
@@ -918,8 +902,8 @@ static int Direct3D11Open(vout_display_t *vd, video_format_t *fmtp)
}
if (err != VLC_SUCCESS)
{
- if ( sys->cleanupDeviceCb )
- sys->cleanupDeviceCb( sys->outside_opaque );
+ if ( sys->swapCb == LocalSwapchainSwap )
+ LocalSwapchainCleanupDevice( sys->outside_opaque );
return err;
}
}
@@ -953,8 +937,8 @@ static int Direct3D11Open(vout_display_t *vd, video_format_t *fmtp)
if (Direct3D11CreateGenericResources(vd)) {
msg_Err(vd, "Failed to allocate resources");
- if ( sys->cleanupDeviceCb )
- sys->cleanupDeviceCb( sys->outside_opaque );
+ if ( sys->swapCb == LocalSwapchainSwap )
+ LocalSwapchainCleanupDevice( sys->outside_opaque );
return VLC_EGENERIC;
}
@@ -1065,10 +1049,10 @@ static void Direct3D11Close(vout_display_t *vd)
D3D11_ReleaseDevice( &sys->d3d_dev );
- if ( sys->cleanupDeviceCb )
- sys->cleanupDeviceCb( sys->outside_opaque );
+ if ( sys->swapCb == LocalSwapchainSwap )
+ LocalSwapchainCleanupDevice( sys->outside_opaque );
- msg_Dbg(vd, "Direct3D11 device adapter closed");
+ msg_Dbg(vd, "Direct3D11 display adapter closed");
}
static void UpdatePicQuadPosition(vout_display_t *vd)
More information about the vlc-commits
mailing list