[vlc-devel] [PATCH 1/3] d3d11va: add a D3D11 hardware decoder similar to DXVA2
Steve Lhomme
robux4 at gmail.com
Fri Jun 5 09:46:49 CEST 2015
New patch coming with a cleaner way to call the conversion filter.
On Tue, Jun 2, 2015 at 4:16 PM, Steve Lhomme <robux4 at gmail.com> wrote:
> ---
> support GPU texture to YUV planes decoding with the d3d11_surface plugin
> ---
> NEWS | 1 +
> configure.ac | 49 ++
> modules/MODULES_LIST | 2 +
> modules/codec/Makefile.am | 8 +
> modules/codec/avcodec/d3d11va.c | 838 +++++++++++++++++++++++++++++++++++
> modules/codec/avcodec/va.c | 4 +
> modules/video_chroma/Makefile.am | 10 +
> modules/video_chroma/d3d11_surface.c | 289 ++++++++++++
> po/POTFILES.in | 2 +
> 9 files changed, 1203 insertions(+)
> create mode 100644 modules/codec/avcodec/d3d11va.c
> create mode 100644 modules/video_chroma/d3d11_surface.c
>
> diff --git a/NEWS b/NEWS
> index 21cf753..beb19ad 100644
> --- a/NEWS
> +++ b/NEWS
> @@ -38,6 +38,7 @@ Decoder:
> * Support TDSC, Canopus HQX
> * Support HEVC hardware decoding on Windows, using DxVA2
> * Basic TTML subtitles support
> + * Support hardware decoding using Direct3D11
>
> Demuxers:
> * Support HD-DVD .evo (H.264, VC-1, MPEG-2, PCM, AC-3, E-AC3, MLP, DTS)
> diff --git a/configure.ac b/configure.ac
> index 23c2b44..0c3100b 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -2391,6 +2391,55 @@ AS_IF([test "${enable_dxva2}" != "no"], [
> AM_CONDITIONAL([HAVE_AVCODEC_DXVA2], [test "${have_avcodec_dxva2}" = "yes"])
>
> dnl
> +dnl d3d11va needs avcodec
> +dnl
> +AC_ARG_ENABLE(d3d11va,
> + [ --enable-d3d11va D3D11 GPU decoding support (default auto)])
> +
> +have_avcodec_d3d11va="no"
> +AS_IF([test "${enable_d3d11va}" != "no"], [
> + if test "${SYS}" = "mingw32"; then
> + AS_IF([test "x${have_avcodec}" = "xyes"], [
> + AC_CHECK_TYPES([ID3D11VideoDecoder],
> + [
> + AC_CHECK_HEADERS(dxva2api.h,
> + [
> + AC_CHECK_HEADERS(libavcodec/d3d11va.h, [
> + AC_MSG_NOTICE([D3D11 acceleration activated])
> + AC_DEFINE(HAVE_AVCODEC_D3D11VA, 1, [Define if the d3d11va module is built])
> + have_avcodec_d3d11va="yes"
> + ],[
> + AS_IF([test "${enable_d3d11va}" = "yes"],
> + [AC_MSG_ERROR([d3d11va is present but libavcodec/d3d11va.h is missing])],
> + [AC_MSG_WARN([d3d11va is present but libavcodec/d3d11va.h is missing ])])
> + ], [#undef _WIN32_WINNT
> + /* D3D11 is only available in Vista and above */
> + #define _WIN32_WINNT 0x600])
> + ],[
> + AS_IF([test "${enable_d3d11va}" = "yes"],
> + [AC_MSG_ERROR([Could not find required dxva2api.h])],
> + [AC_MSG_WARN([dxva2api.h not found])])
> + ])
> + ],[
> + AS_IF([test "${enable_d3d11va}" = "yes"],
> + [AC_MSG_ERROR([Could not find required ID3D11VideoDecoder in d3d11.h])],
> + [AC_MSG_WARN([ID3D11VideoDecoder not found])])
> + ], [#include <d3d11.h>])
> + ],[
> + AS_IF([test "x${enable_d3d11va}" != "x"], [
> + AC_MSG_ERROR([--enable-d3d11va and --disable-avcodec options are mutually exclusive.])
> + ])
> + ])
> + fi
> +])
> +AM_CONDITIONAL([HAVE_AVCODEC_D3D11VA], [test "${have_avcodec_d3d11va}" = "yes"])
> +
> +dnl
> +dnl DXGI debug
> +dnl
> +AC_CHECK_HEADERS(dxgidebug.h)
> +
> +dnl
> dnl vda needs avcodec
> dnl
> AC_ARG_ENABLE(vda,
> diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST
> index 4181362..34ea3e9 100644
> --- a/modules/MODULES_LIST
> +++ b/modules/MODULES_LIST
> @@ -83,6 +83,8 @@ $Id$
> * croppadd: Crop/Padd image filter
> * crystalhd: crystalhd decoder
> * cvdsub: CVD subtitles decoder
> + * d3d11_surface: Convert D3D11 GPU textures to YUV planes
> + * d3d11va: Direct3D11 hardware-accelerated decoding
> * daala: a daala video decoder/packetizer using libdaala
> * dash: MPEG DASH playback
> * dbus: D-Bus control interface
> diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
> index b3f3649..770c117 100644
> --- a/modules/codec/Makefile.am
> +++ b/modules/codec/Makefile.am
> @@ -351,6 +351,14 @@ if HAVE_AVCODEC_DXVA2
> codec_LTLIBRARIES += libdxva2_plugin.la
> endif
>
> +libd3d11va_plugin_la_SOURCES = \
> + codec/avcodec/d3d11va.c codec/avcodec/directx_va.c codec/avcodec/directx_va.h \
> + packetizer/h264_nal.c packetizer/h264_nal.h
> +libd3d11va_plugin_la_LIBADD = -lole32 -luuid
> +if HAVE_AVCODEC_D3D11VA
> +codec_LTLIBRARIES += libd3d11va_plugin.la
> +endif
> +
> libvda_plugin_la_SOURCES = \
> video_chroma/copy.c video_chroma/copy.h \
> codec/avcodec/vda.c
> diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c
> new file mode 100644
> index 0000000..5e0625c
> --- /dev/null
> +++ b/modules/codec/avcodec/d3d11va.c
> @@ -0,0 +1,838 @@
> +/*****************************************************************************
> + * d3d11va.c: Direct3D11 Video Acceleration helpers
> + *****************************************************************************
> + * Copyright (C) 2009 Geoffroy Couprie
> + * Copyright (C) 2009 Laurent Aimar
> + * Copyright (C) 2015 Steve Lhomme
> + * $Id$
> + *
> + * Authors: Geoffroy Couprie <geal at videolan.org>
> + * Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
> + * Steve Lhomme <robux4 at gmail.com>
> + *
> + * This program 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.
> + *
> + * This program 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 this program; if not, write to the Free Software Foundation,
> + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
> + *****************************************************************************/
> +
> +/**
> + * See https://msdn.microsoft.com/en-us/library/windows/desktop/hh162912%28v=vs.85%29.aspx
> + **/
> +#ifdef HAVE_CONFIG_H
> +# include "config.h"
> +#endif
> +
> +#include <assert.h>
> +
> +#include <vlc_common.h>
> +#include <vlc_picture.h>
> +#include <vlc_plugin.h>
> +#include <vlc_charset.h>
> +#include <vlc_filter.h>
> +#include <vlc_modules.h>
> +
> +#include "directx_va.h"
> +
> +#define COBJMACROS
> +#include <libavcodec/d3d11va.h>
> +
> +#include "../../video_chroma/copy.h"
> +
> +static int Open(vlc_va_t *, AVCodecContext *, enum PixelFormat,
> + const es_format_t *, picture_sys_t *p_sys);
> +static void Close(vlc_va_t *, AVCodecContext *);
> +
> +vlc_module_begin()
> + set_description(N_("Direct3D11 Video Acceleration"))
> + set_capability("hw decoder", 0)
> + set_category(CAT_INPUT)
> + set_subcategory(SUBCAT_INPUT_VCODEC)
> + set_callbacks(Open, Close)
> +vlc_module_end()
> +
> +#include <initguid.h> /* must be last included to not redefine existing GUIDs */
> +
> +/* dxva2api.h GUIDs: http://msdn.microsoft.com/en-us/library/windows/desktop/ms697067(v=vs100).aspx
> + * assume that they are declared in dxva2api.h */
> +#define MS_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8)
> +
> +#ifdef __MINGW32__
> +# include <_mingw.h>
> +
> +# if !defined(__MINGW64_VERSION_MAJOR)
> +# undef MS_GUID
> +# define MS_GUID DEFINE_GUID /* dxva2api.h fails to declare those, redefine as static */
> +# define DXVA2_E_NEW_VIDEO_DEVICE MAKE_HRESULT(1, 4, 4097)
> +# else
> +# include <dxva.h>
> +# endif
> +
> +#endif /* __MINGW32__ */
> +
> +#if defined(NDEBUG) && defined(HAVE_DXGIDEBUG_H)
> +#include <dxgidebug.h>
> +#endif
> +
> +DEFINE_GUID(IID_ID3D11VideoDevice, 0x10EC4D5B, 0x975A, 0x4689, 0xB9, 0xE4, 0xD0, 0xAA, 0xC3, 0x0F, 0xE3, 0x33);
> +DEFINE_GUID(IID_ID3D11VideoContext, 0x61F21C45, 0x3C0E, 0x4a74, 0x9C, 0xEA, 0x67, 0x10, 0x0D, 0x9A, 0xD5, 0xE4);
> +DEFINE_GUID(IID_IDXGIDevice, 0x54ec77fa, 0x1377, 0x44e6, 0x8c, 0x32, 0x88, 0xfd, 0x5f, 0x44, 0xc8, 0x4c);
> +DEFINE_GUID(IID_ID3D10Multithread, 0x9b7e4e00, 0x342c, 0x4106, 0xa1, 0x9f, 0x4f, 0x27, 0x04, 0xf6, 0x89, 0xf0);
> +
> +DEFINE_GUID(DXVA_Intel_H264_NoFGT_ClearVideo, 0x604F8E68, 0x4951, 0x4c54, 0x88, 0xFE, 0xAB, 0xD2, 0x5C, 0x15, 0xB3, 0xD6);
> +
> +struct vlc_va_sys_t
> +{
> + directx_sys_t dx_sys;
> +
> +#if defined(NDEBUG) && defined(HAVE_DXGIDEBUG_H)
> + HINSTANCE dxgidebug_dll;
> +#endif
> +
> + /* Video service */
> + ID3D11VideoContext *d3dvidctx;
> + DXGI_FORMAT render;
> +
> + ID3D11DeviceContext *d3dctx;
> +
> + /* Video decoder */
> + D3D11_VIDEO_DECODER_CONFIG cfg;
> +
> + /* Option conversion */
> + filter_t *filter;
> +
> + /* avcodec internals */
> + struct AVD3D11VAContext hw;
> +};
> +
> +typedef struct
> +{
> + filter_t filter;
> + picture_t *pic_out;
> +} plane_filter_t;
> +
> +/* VLC_CODEC_D3D11_OPAQUE */
> +struct picture_sys_t
> +{
> + ID3D11VideoDecoderOutputView *decoder;
> + ID3D11Texture2D *texture;
> + ID3D11Device *device;
> + ID3D11DeviceContext *context;
> + HINSTANCE hd3d11_dll;
> +};
> +
> +/* */
> +static int D3dCreateDevice(vlc_va_t *);
> +static void D3dDestroyDevice(vlc_va_t *);
> +static char *DxDescribe(directx_sys_t *);
> +
> +static int D3dCreateDeviceManager(vlc_va_t *);
> +static void D3dDestroyDeviceManager(vlc_va_t *);
> +
> +static int DxCreateVideoService(vlc_va_t *);
> +static void DxDestroyVideoService(vlc_va_t *);
> +static int DxGetInputList(vlc_va_t *, input_list_t *);
> +static int DxSetupOutput(vlc_va_t *, const GUID *);
> +
> +static int DxCreateDecoderSurfaces(vlc_va_t *, int codec_id, const video_format_t *fmt, bool b_threading);
> +static void DxDestroySurfaces(vlc_va_t *);
> +static void SetupAVCodecContext(vlc_va_t *);
> +
> +static picture_t *DxAllocPicture(vlc_va_t *, const video_format_t *, unsigned index);
> +
> +/* */
> +static int Setup(vlc_va_t *va, AVCodecContext *avctx, vlc_fourcc_t *chroma)
> +{
> + vlc_va_sys_t *sys = va->sys;
> + if (directx_va_Setup(va, &sys->dx_sys, avctx, chroma)!=VLC_SUCCESS)
> + return VLC_EGENERIC;
> +
> + avctx->hwaccel_context = &sys->hw;
> + *chroma = sys->filter == NULL ? VLC_CODEC_D3D11_OPAQUE : VLC_CODEC_YV12;
> +
> + return VLC_SUCCESS;
> +}
> +
> +void SetupAVCodecContext(vlc_va_t *va)
> +{
> + vlc_va_sys_t *sys = va->sys;
> + directx_sys_t *dx_sys = &sys->dx_sys;
> +
> + sys->hw.video_context = sys->d3dvidctx;
> + sys->hw.decoder = (ID3D11VideoDecoder*) dx_sys->decoder;
> + sys->hw.cfg = &sys->cfg;
> + sys->hw.surface_count = dx_sys->surface_count;
> + sys->hw.surface = (ID3D11VideoDecoderOutputView**) dx_sys->hw_surface;
> +
> + if (IsEqualGUID(&dx_sys->input, &DXVA_Intel_H264_NoFGT_ClearVideo))
> + sys->hw.workaround |= FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO;
> +}
> +
> +static void DeleteFilter( filter_t * p_filter )
> +{
> + if( p_filter->p_module )
> + module_unneed( p_filter, p_filter->p_module );
> +
> + es_format_Clean( &p_filter->fmt_in );
> + es_format_Clean( &p_filter->fmt_out );
> +
> + vlc_object_release( p_filter );
> +}
> +
> +static picture_t *video_new_buffer(plane_filter_t *p_filter)
> +{
> + return p_filter->pic_out;
> +}
> +
> +static filter_t *CreateFilter( vlc_object_t *p_this, const es_format_t *p_fmt_in,
> + vlc_fourcc_t fmt_out )
> +{
> + filter_t *p_filter;
> +
> + p_filter = vlc_object_create( p_this, sizeof(filter_t) );
> + if (unlikely(p_filter == NULL))
> + return NULL;
> +
> + p_filter->owner.video.buffer_new = (picture_t *(*)(filter_t *))video_new_buffer;
> +
> + es_format_InitFromVideo( &p_filter->fmt_in, &p_fmt_in->video );
> + es_format_InitFromVideo( &p_filter->fmt_out, &p_fmt_in->video );
> + p_filter->fmt_in.i_codec = p_filter->fmt_in.video.i_chroma = VLC_CODEC_D3D11_OPAQUE;
> + p_filter->fmt_out.i_codec = p_filter->fmt_out.video.i_chroma = fmt_out;
> + p_filter->p_module = module_need( p_filter, "video filter2", NULL, false );
> +
> + if( !p_filter->p_module )
> + {
> + msg_Dbg( p_filter, "no video filter found" );
> + DeleteFilter( p_filter );
> + return NULL;
> + }
> +
> + return p_filter;
> +}
> +
> +static int Extract(vlc_va_t *va, picture_t *output, uint8_t *data)
> +{
> + vlc_va_sys_t *sys = va->sys;
> + ID3D11VideoDecoderOutputView *src = (ID3D11VideoDecoderOutputView*)(uintptr_t)data;
> + ID3D11Resource *p_src_texture = NULL;
> + D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC viewDesc;
> +
> + ID3D11VideoDecoderOutputView_GetDesc( src, &viewDesc );
> +
> + ID3D11VideoDecoderOutputView_GetResource( src, &p_src_texture );
> + if (!p_src_texture) {
> + msg_Err(va, "Failed to get the texture of the outputview." );
> + goto error;
> + }
> +
> + if (output->format.i_chroma == VLC_CODEC_D3D11_OPAQUE)
> + {
> + /* copy decoder slice to surface */
> + assert(output->p_sys->texture != NULL);
> + ID3D11DeviceContext_CopySubresourceRegion(sys->d3dctx, (ID3D11Resource*) output->p_sys->texture,
> + 0, 0, 0, 0,
> + p_src_texture, viewDesc.Texture2D.ArraySlice,
> + NULL);
> + }
> + else if (output->format.i_chroma == VLC_CODEC_YV12) {
> + plane_filter_t filter = {
> + .filter = *va->sys->filter,
> + .pic_out = output,
> + };
> + vlc_va_surface_t *surface = output->context;
> + picture_Hold( surface->p_pic );
> + va->sys->filter->pf_video_filter( &filter.filter, surface->p_pic );
> + } else {
> + msg_Err(va, "Unsupported output picture format %08X", output->format.i_chroma );
> + goto error;
> + }
> +
> + if (p_src_texture!=NULL)
> + ID3D11Resource_Release(p_src_texture);
> + return VLC_SUCCESS;
> +
> +error:
> + if (p_src_texture!=NULL)
> + ID3D11Resource_Release(p_src_texture);
> + return VLC_EGENERIC;
> +}
> +
> +static int CheckDevice(vlc_va_t *va)
> +{
> + VLC_UNUSED(va);
> +#ifdef TODO
> + /* Check the device */
> + /* see MFCreateDXGIDeviceManager in mfplat.dll, not avail in Win7 */
> + HRESULT hr = IDirect3DDeviceManager9_TestDevice(sys->devmng, sys->device);
> + if (hr == DXVA2_E_NEW_VIDEO_DEVICE) {
> + if (DxResetVideoDecoder(va))
> + return VLC_EGENERIC;
> + } else if (FAILED(hr)) {
> + msg_Err(va, "IDirect3DDeviceManager9_TestDevice %u", (unsigned)hr);
> + return VLC_EGENERIC;
> + }
> +#endif
> + return VLC_SUCCESS;
> +}
> +
> +static int Get(vlc_va_t *va, picture_t *pic, uint8_t **data)
> +{
> + return directx_va_Get(va, &va->sys->dx_sys, pic, data);
> +}
> +
> +static void Close(vlc_va_t *va, AVCodecContext *ctx)
> +{
> + vlc_va_sys_t *sys = va->sys;
> +
> + (void) ctx;
> +
> + if (sys->filter)
> + {
> + DeleteFilter( sys->filter );
> + sys->filter = NULL;
> + }
> +
> + directx_va_Close(va, &sys->dx_sys);
> +
> +#if defined(NDEBUG) && defined(HAVE_DXGIDEBUG_H)
> + if (sys->dxgidebug_dll)
> + FreeLibrary(sys->dxgidebug_dll);
> +#endif
> +
> + free((char *)va->description);
> + free(sys);
> +}
> +
> +static int Open(vlc_va_t *va, AVCodecContext *ctx, enum PixelFormat pix_fmt,
> + const es_format_t *fmt, picture_sys_t *p_sys)
> +{
> + int err = VLC_EGENERIC;
> + directx_sys_t *dx_sys;
> +
> + if (pix_fmt != AV_PIX_FMT_D3D11VA_VLD)
> + return VLC_EGENERIC;
> +
> + vlc_va_sys_t *sys = calloc(1, sizeof (*sys));
> + if (unlikely(sys == NULL))
> + return VLC_ENOMEM;
> +
> +#if defined(NDEBUG) && defined(HAVE_DXGIDEBUG_H)
> + sys->dxgidebug_dll = LoadLibrary(TEXT("DXGIDEBUG.DLL"));
> +#endif
> +
> + dx_sys = &sys->dx_sys;
> +
> + dx_sys->pf_check_device = CheckDevice;
> + dx_sys->pf_create_device = D3dCreateDevice;
> + dx_sys->pf_destroy_device = D3dDestroyDevice;
> + dx_sys->pf_create_device_manager = D3dCreateDeviceManager;
> + dx_sys->pf_destroy_device_manager = D3dDestroyDeviceManager;
> + dx_sys->pf_create_video_service = DxCreateVideoService;
> + dx_sys->pf_destroy_video_service = DxDestroyVideoService;
> + dx_sys->pf_create_decoder_surfaces = DxCreateDecoderSurfaces;
> + dx_sys->pf_destroy_surfaces = DxDestroySurfaces;
> + dx_sys->pf_setup_avcodec_ctx = SetupAVCodecContext;
> + dx_sys->pf_get_input_list = DxGetInputList;
> + dx_sys->pf_setup_output = DxSetupOutput;
> + dx_sys->pf_alloc_surface_pic = DxAllocPicture;
> + dx_sys->psz_decoder_dll = TEXT("D3D11.DLL");
> +
> + va->sys = sys;
> +
> + dx_sys->d3ddev = NULL;
> + va->sys->render = DXGI_FORMAT_UNKNOWN;
> + if ( p_sys != NULL && p_sys->device != NULL && p_sys->context != NULL ) {
> + ID3D11VideoContext *d3dvidctx = NULL;
> + HRESULT hr = ID3D11DeviceContext_QueryInterface(p_sys->context, &IID_ID3D11VideoContext, (void **)&d3dvidctx);
> + if (FAILED(hr)) {
> + msg_Err(va, "Could not Query ID3D11VideoDevice Interface from the picture. (hr=0x%lX)", hr);
> + } else {
> + dx_sys->d3ddev = (IUnknown*) p_sys->device;
> + sys->d3dctx = p_sys->context;
> + sys->d3dvidctx = d3dvidctx;
> +
> + D3D11_TEXTURE2D_DESC dstDesc;
> + assert(p_sys->texture != NULL);
> + ID3D11Texture2D_GetDesc( p_sys->texture, &dstDesc);
> + sys->render = dstDesc.Format;
> + }
> + }
> +
> + err = directx_va_Open(va, &sys->dx_sys, ctx, fmt);
> + if (err!=VLC_SUCCESS)
> + goto error;
> +
> + if (p_sys == NULL)
> + {
> + sys->filter = CreateFilter( VLC_OBJECT(va), fmt, VLC_CODEC_YV12);
> + if (sys->filter == NULL)
> + goto error;
> + }
> +
> + /* TODO print the hardware name/vendor for debugging purposes */
> + va->description = DxDescribe(dx_sys);
> + va->setup = Setup;
> + va->get = Get;
> + va->release = directx_va_Release;
> + va->extract = Extract;
> +
> + return VLC_SUCCESS;
> +
> +error:
> + Close(va, ctx);
> + return err;
> +}
> +
> +/**
> + * It creates a Direct3D device usable for decoding
> + */
> +static int D3dCreateDevice(vlc_va_t *va)
> +{
> + directx_sys_t *dx_sys = &va->sys->dx_sys;
> + HRESULT hr;
> +
> + if (dx_sys->d3ddev && va->sys->d3dctx) {
> + msg_Dbg(va, "Reusing Direct3D11 device");
> + ID3D11DeviceContext_AddRef(va->sys->d3dctx);
> + ID3D11Device_AddRef(dx_sys->d3ddev);
> + return VLC_SUCCESS;
> + }
> +
> + /* */
> + PFN_D3D11_CREATE_DEVICE pf_CreateDevice;
> + pf_CreateDevice = (void *)GetProcAddress(dx_sys->hdecoder_dll, "D3D11CreateDevice");
> + if (!pf_CreateDevice) {
> + msg_Err(va, "Cannot locate reference to D3D11CreateDevice ABI in DLL");
> + return VLC_EGENERIC;
> + }
> +
> + UINT creationFlags = D3D11_CREATE_DEVICE_VIDEO_SUPPORT;
> +# if !defined(NDEBUG) && defined(_MSC_VER)
> + creationFlags |= D3D11_CREATE_DEVICE_DEBUG;
> +# endif
> +
> + /* */
> + ID3D11Device *d3ddev;
> + ID3D11DeviceContext *d3dctx;
> + hr = pf_CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL,
> + creationFlags, NULL, 0,
> + D3D11_SDK_VERSION, &d3ddev, NULL, &d3dctx);
> + if (FAILED(hr)) {
> + msg_Err(va, "D3D11CreateDevice failed. (hr=0x%lX)", hr);
> + return VLC_EGENERIC;
> + }
> + dx_sys->d3ddev = (IUnknown*) d3ddev;
> + va->sys->d3dctx = d3dctx;
> +
> + ID3D11VideoContext *d3dvidctx = NULL;
> + hr = ID3D11DeviceContext_QueryInterface(d3dctx, &IID_ID3D11VideoContext, (void **)&d3dvidctx);
> + if (FAILED(hr)) {
> + msg_Err(va, "Could not Query ID3D11VideoDevice Interface. (hr=0x%lX)", hr);
> + return VLC_EGENERIC;
> + }
> + va->sys->d3dvidctx = d3dvidctx;
> +
> +#if defined(NDEBUG) && defined(HAVE_DXGIDEBUG_H)
> + HRESULT (WINAPI * pf_DXGIGetDebugInterface)(const GUID *riid, void **ppDebug);
> + if (sys->dxgidebug_dll) {
> + pf_DXGIGetDebugInterface = (void *)GetProcAddress(sys->dxgidebug_dll, "DXGIGetDebugInterface");
> + if (pf_DXGIGetDebugInterface) {
> + IDXGIDebug *pDXGIDebug = NULL;
> + hr = pf_DXGIGetDebugInterface(&IID_IDXGIDebug, (void**)&pDXGIDebug);
> + if (SUCCEEDED(hr) && pDXGIDebug) {
> + hr = IDXGIDebug_ReportLiveObjects(pDXGIDebug, DXGI_DEBUG_ALL, DXGI_DEBUG_RLO_ALL);
> + }
> + }
> + }
> +#endif
> +
> + return VLC_SUCCESS;
> +}
> +
> +/**
> + * It releases a Direct3D device and its resources.
> + */
> +static void D3dDestroyDevice(vlc_va_t *va)
> +{
> + if (va->sys->d3dvidctx)
> + ID3D11VideoContext_Release(va->sys->d3dvidctx);
> + if (va->sys->d3dctx)
> + ID3D11DeviceContext_Release(va->sys->d3dctx);
> +}
> +/**
> + * It describes our Direct3D object
> + */
> +static char *DxDescribe(directx_sys_t *dx_sys)
> +{
> + static const struct {
> + unsigned id;
> + char name[32];
> + } vendors [] = {
> + { 0x1002, "ATI" },
> + { 0x10DE, "NVIDIA" },
> + { 0x1106, "VIA" },
> + { 0x8086, "Intel" },
> + { 0x5333, "S3 Graphics" },
> + { 0, "" }
> + };
> +
> + IDXGIDevice *pDXGIDevice = NULL;
> + HRESULT hr = ID3D11Device_QueryInterface( (ID3D11Device*) dx_sys->d3ddev, &IID_IDXGIDevice, (void **)&pDXGIDevice);
> + if (FAILED(hr)) {
> + return NULL;
> + }
> +
> + IDXGIAdapter *p_adapter;
> + hr = IDXGIDevice_GetAdapter(pDXGIDevice, &p_adapter);
> + if (FAILED(hr)) {
> + IDXGIDevice_Release(pDXGIDevice);
> + return NULL;
> + }
> +
> + DXGI_ADAPTER_DESC adapterDesc;
> + if (SUCCEEDED(IDXGIAdapter_GetDesc(p_adapter, &adapterDesc))) {
> + const char *vendor = "Unknown";
> + for (int i = 0; vendors[i].id != 0; i++) {
> + if (vendors[i].id == adapterDesc.VendorId) {
> + vendor = vendors[i].name;
> + break;
> + }
> + }
> +
> + char *description;
> + if (asprintf(&description, "D3D11VA (%s, vendor %u(%s), device %u, revision %u)",
> + FromWide(adapterDesc.Description),
> + adapterDesc.VendorId, vendor, adapterDesc.DeviceId, adapterDesc.Revision) < 0)
> + return NULL;
> + IDXGIAdapter_Release(p_adapter);
> + IDXGIDevice_Release(pDXGIDevice);
> + return description;
> + }
> +
> + IDXGIAdapter_Release(p_adapter);
> + IDXGIDevice_Release(pDXGIDevice);
> + return NULL;
> +}
> +
> +/**
> + * It creates a Direct3D device manager
> + */
> +static int D3dCreateDeviceManager(vlc_va_t *va)
> +{
> + VLC_UNUSED(va);
> +#if 0
> + vlc_va_sys_t *sys = va->sys;
> +
> + HRESULT (WINAPI *CreateDeviceManager9)(UINT *pResetToken,
> + IDirect3DDeviceManager9 **);
> + CreateDeviceManager9 =
> + (void *)GetProcAddress(sys->hdxva2_dll,
> + "DXVA2CreateDirect3DDeviceManager9");
> +
> + if (!CreateDeviceManager9) {
> + msg_Err(va, "cannot load function");
> + return VLC_EGENERIC;
> + }
> + msg_Dbg(va, "OurDirect3DCreateDeviceManager9 Success!");
> +
> + UINT token;
> + IDirect3DDeviceManager9 *devmng;
> + if (FAILED(CreateDeviceManager9(&token, &devmng))) {
> + msg_Err(va, " OurDirect3DCreateDeviceManager9 failed");
> + return VLC_EGENERIC;
> + }
> + sys->token = token;
> + sys->devmng = devmng;
> + msg_Info(va, "obtained IDirect3DDeviceManager9");
> +
> + HRESULT hr = IDirect3DDeviceManager9_ResetDevice(devmng, (ID3D11Device*) dx_sys->d3ddev, token);
> + if (FAILED(hr)) {
> + msg_Err(va, "IDirect3DDeviceManager9_ResetDevice failed: %08x", (unsigned)hr);
> + return VLC_EGENERIC;
> + }
> +#endif
> + return VLC_SUCCESS;
> +}
> +/**
> + * It destroys a Direct3D device manager
> + */
> +static void D3dDestroyDeviceManager(vlc_va_t *va)
> +{
> + VLC_UNUSED(va);
> +#if 0
> + if (va->devmng)
> + IDirect3DDeviceManager9_Release(va->devmng);
> +#endif
> +}
> +
> +/**
> + * It creates a DirectX video service
> + */
> +static int DxCreateVideoService(vlc_va_t *va)
> +{
> + directx_sys_t *dx_sys = &va->sys->dx_sys;
> +
> + ID3D11VideoDevice *d3dviddev = NULL;
> + HRESULT hr = ID3D11Device_QueryInterface( (ID3D11Device*) dx_sys->d3ddev, &IID_ID3D11VideoDevice, (void **)&d3dviddev);
> + if (FAILED(hr)) {
> + msg_Err(va, "Could not Query ID3D11VideoDevice Interface. (hr=0x%lX)", hr);
> + return VLC_EGENERIC;
> + }
> + dx_sys->d3ddec = (IUnknown*) d3dviddev;
> +
> + return VLC_SUCCESS;
> +}
> +
> +/**
> + * It destroys a DirectX video service
> + */
> +static void DxDestroyVideoService(vlc_va_t *va)
> +{
> + VLC_UNUSED(va);
> +}
> +
> +static void ReleaseInputList(input_list_t *p_list)
> +{
> + free(p_list->list);
> +}
> +
> +static int DxGetInputList(vlc_va_t *va, input_list_t *p_list)
> +{
> + directx_sys_t *dx_sys = &va->sys->dx_sys;
> + HRESULT hr;
> +
> + UINT input_count = ID3D11VideoDevice_GetVideoDecoderProfileCount((ID3D11VideoDevice*) dx_sys->d3ddec);
> +
> + p_list->count = input_count;
> + p_list->list = calloc(input_count, sizeof(*p_list->list));
> + if (unlikely(p_list->list == NULL)) {
> + return VLC_ENOMEM;
> + }
> + p_list->pf_release = ReleaseInputList;
> +
> + for (unsigned i = 0; i < input_count; i++) {
> + hr = ID3D11VideoDevice_GetVideoDecoderProfile((ID3D11VideoDevice*) dx_sys->d3ddec, i, &p_list->list[i]);
> + if (FAILED(hr))
> + {
> + msg_Err(va, "GetVideoDecoderProfile %d failed. (hr=0x%lX)", i, hr);
> + ReleaseInputList(p_list);
> + return VLC_EGENERIC;
> + }
> + }
> +
> + return VLC_SUCCESS;
> +}
> +
> +static int DxSetupOutput(vlc_va_t *va, const GUID *input)
> +{
> + directx_sys_t *dx_sys = &va->sys->dx_sys;
> + HRESULT hr;
> +
> + /* */
> + BOOL is_supported = false;
> + hr = ID3D11VideoDevice_CheckVideoDecoderFormat((ID3D11VideoDevice*) dx_sys->d3ddec, input, DXGI_FORMAT_NV12, &is_supported);
> + if (SUCCEEDED(hr) && is_supported)
> + msg_Dbg(va, "NV12 is supported for output");
> +
> + if ( va->sys->render != DXGI_FORMAT_UNKNOWN )
> + {
> + is_supported = false;
> + hr = ID3D11VideoDevice_CheckVideoDecoderFormat((ID3D11VideoDevice*) dx_sys->d3ddec, input, va->sys->render, &is_supported);
> + if (SUCCEEDED(hr) && is_supported)
> + {
> + /* We have our solution */
> + msg_Dbg(va, "Using decoder output from picture source.");
> + return VLC_SUCCESS;
> + }
> + msg_Dbg(va, "Output format from picture source not supported.");
> + return VLC_EGENERIC;
> + }
> + else
> + {
> + /* */
> + is_supported = false;
> + hr = ID3D11VideoDevice_CheckVideoDecoderFormat((ID3D11VideoDevice*) dx_sys->d3ddec, input, DXGI_FORMAT_NV12, &is_supported);
> + if (SUCCEEDED(hr) && is_supported)
> + {
> + /* We have our solution */
> + msg_Dbg(va, "Using decoder output NV12");
> + va->sys->render = DXGI_FORMAT_NV12;
> + return VLC_SUCCESS;
> + }
> + }
> + return VLC_EGENERIC;
> +}
> +
> +/**
> + * It creates a Direct3D11 decoder using the given video format
> + */
> +static int DxCreateDecoderSurfaces(vlc_va_t *va, int codec_id, const video_format_t *fmt, bool b_threading)
> +{
> + vlc_va_sys_t *sys = va->sys;
> + directx_sys_t *dx_sys = &va->sys->dx_sys;
> + HRESULT hr;
> +
> + ID3D10Multithread *pMultithread;
> + hr = ID3D11Device_QueryInterface( (ID3D11Device*) dx_sys->d3ddev, &IID_ID3D10Multithread, (void **)&pMultithread);
> + if (SUCCEEDED(hr)) {
> + ID3D10Multithread_SetMultithreadProtected(pMultithread, b_threading && dx_sys->thread_count > 1);
> + ID3D10Multithread_Release(pMultithread);
> + }
> +
> + D3D11_TEXTURE2D_DESC texDesc;
> + ZeroMemory(&texDesc, sizeof(texDesc));
> + texDesc.Width = dx_sys->surface_width;
> + texDesc.Height = dx_sys->surface_height;
> + texDesc.MipLevels = 1;
> + texDesc.Format = sys->render;
> + texDesc.SampleDesc.Count = 1;
> + texDesc.MiscFlags = 0;
> + texDesc.ArraySize = dx_sys->surface_count;
> + texDesc.Usage = D3D11_USAGE_DEFAULT;
> + texDesc.BindFlags = D3D11_BIND_DECODER;
> + texDesc.CPUAccessFlags = 0;
> +
> + ID3D11Texture2D *p_texture;
> + hr = ID3D11Device_CreateTexture2D( (ID3D11Device*) dx_sys->d3ddev, &texDesc, NULL, &p_texture );
> + if (FAILED(hr)) {
> + msg_Err(va, "CreateTexture2D %d failed. (hr=0x%0lx)", dx_sys->surface_count, hr);
> + return VLC_EGENERIC;
> + }
> +
> + D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC viewDesc;
> + ZeroMemory(&viewDesc, sizeof(viewDesc));
> + viewDesc.DecodeProfile = dx_sys->input;
> + viewDesc.ViewDimension = D3D11_VDOV_DIMENSION_TEXTURE2D;
> +
> + int surface_count = dx_sys->surface_count;
> + for (dx_sys->surface_count = 0; dx_sys->surface_count < surface_count; dx_sys->surface_count++) {
> + viewDesc.Texture2D.ArraySlice = dx_sys->surface_count;
> +
> + hr = ID3D11VideoDevice_CreateVideoDecoderOutputView( (ID3D11VideoDevice*) dx_sys->d3ddec,
> + (ID3D11Resource*) p_texture,
> + &viewDesc,
> + (ID3D11VideoDecoderOutputView**) &dx_sys->hw_surface[dx_sys->surface_count] );
> + if (FAILED(hr)) {
> + msg_Err(va, "CreateVideoDecoderOutputView %d failed. (hr=0x%0lx)", dx_sys->surface_count, hr);
> + ID3D11Texture2D_Release(p_texture);
> + return VLC_EGENERIC;
> + }
> + }
> + msg_Dbg(va, "ID3D11VideoDecoderOutputView succeed with %d surfaces (%dx%d)",
> + dx_sys->surface_count, dx_sys->surface_width, dx_sys->surface_height);
> +
> + D3D11_VIDEO_DECODER_DESC decoderDesc;
> + ZeroMemory(&decoderDesc, sizeof(decoderDesc));
> + decoderDesc.Guid = dx_sys->input;
> + decoderDesc.SampleWidth = fmt->i_width;
> + decoderDesc.SampleHeight = fmt->i_height;
> + decoderDesc.OutputFormat = sys->render;
> +
> + UINT cfg_count;
> + hr = ID3D11VideoDevice_GetVideoDecoderConfigCount( (ID3D11VideoDevice*) dx_sys->d3ddec, &decoderDesc, &cfg_count );
> + if (FAILED(hr)) {
> + msg_Err(va, "GetVideoDecoderConfigCount failed. (hr=0x%lX)", hr);
> + return VLC_EGENERIC;
> + }
> +
> + /* List all configurations available for the decoder */
> + D3D11_VIDEO_DECODER_CONFIG cfg_list[cfg_count];
> + for (unsigned i = 0; i < cfg_count; i++) {
> + hr = ID3D11VideoDevice_GetVideoDecoderConfig( (ID3D11VideoDevice*) dx_sys->d3ddec, &decoderDesc, i, &cfg_list[i] );
> + if (FAILED(hr)) {
> + msg_Err(va, "GetVideoDecoderConfig failed. (hr=0x%lX)", hr);
> + return VLC_EGENERIC;
> + }
> + }
> +
> + msg_Dbg(va, "we got %d decoder configurations", cfg_count);
> +
> + /* Select the best decoder configuration */
> + int cfg_score = 0;
> + for (unsigned i = 0; i < cfg_count; i++) {
> + const D3D11_VIDEO_DECODER_CONFIG *cfg = &cfg_list[i];
> +
> + /* */
> + msg_Dbg(va, "configuration[%d] ConfigBitstreamRaw %d",
> + i, cfg->ConfigBitstreamRaw);
> +
> + /* */
> + int score;
> + if (cfg->ConfigBitstreamRaw == 1)
> + score = 1;
> + else if (codec_id == AV_CODEC_ID_H264 && cfg->ConfigBitstreamRaw == 2)
> + score = 2;
> + else
> + continue;
> + if (IsEqualGUID(&cfg->guidConfigBitstreamEncryption, &DXVA_NoEncrypt))
> + score += 16;
> +
> + if (cfg_score < score) {
> + sys->cfg = *cfg;
> + cfg_score = score;
> + }
> + }
> + if (cfg_score <= 0) {
> + msg_Err(va, "Failed to find a supported decoder configuration");
> + return VLC_EGENERIC;
> + }
> +
> + /* Create the decoder */
> + ID3D11VideoDecoder *decoder;
> + hr = ID3D11VideoDevice_CreateVideoDecoder( (ID3D11VideoDevice*) dx_sys->d3ddec, &decoderDesc, &sys->cfg, &decoder );
> + if (FAILED(hr)) {
> + msg_Err(va, "ID3D11VideoDevice_CreateVideoDecoder failed. (hr=0x%lX)", hr);
> + dx_sys->decoder = NULL;
> + return VLC_EGENERIC;
> + }
> + dx_sys->decoder = (IUnknown*) decoder;
> +
> + msg_Dbg(va, "DxCreateDecoderSurfaces succeed");
> + return VLC_SUCCESS;
> +}
> +
> +static void DxDestroySurfaces(vlc_va_t *va)
> +{
> + directx_sys_t *dx_sys = &va->sys->dx_sys;
> + if (dx_sys->surface_count) {
> + ID3D11Resource *p_texture;
> + ID3D11VideoDecoderOutputView_GetResource( (ID3D11VideoDecoderOutputView*) dx_sys->hw_surface[0], &p_texture );
> + ID3D11Resource_Release(p_texture);
> + ID3D11Resource_Release(p_texture);
> + }
> +}
> +
> +static picture_t *DxAllocPicture(vlc_va_t *va, const video_format_t *fmt, unsigned index)
> +{
> + video_format_t src_fmt = *fmt;
> + src_fmt.i_chroma = VLC_CODEC_D3D11_OPAQUE;
> + picture_sys_t *pic_sys = calloc(1, sizeof(*pic_sys));
> + if (unlikely(pic_sys == NULL))
> + return NULL;
> +
> + pic_sys->decoder = (ID3D11VideoDecoderOutputView*) va->sys->dx_sys.hw_surface[index];
> + pic_sys->device = (ID3D11Device*) va->sys->dx_sys.d3ddev;
> + pic_sys->context = va->sys->d3dctx;
> +
> + picture_resource_t res = {
> + .p_sys = pic_sys,
> + };
> + picture_t *pic = picture_NewFromResource(&src_fmt, &res);
> + if (unlikely(pic == NULL))
> + {
> + free(pic_sys);
> + return NULL;
> + }
> + return pic;
> +}
> +
> diff --git a/modules/codec/avcodec/va.c b/modules/codec/avcodec/va.c
> index 63feb49..d412cb5 100644
> --- a/modules/codec/avcodec/va.c
> +++ b/modules/codec/avcodec/va.c
> @@ -43,6 +43,10 @@ vlc_fourcc_t vlc_va_GetChroma(enum PixelFormat hwfmt, enum PixelFormat swfmt)
> case AV_PIX_FMT_DXVA2_VLD:
> return VLC_CODEC_D3D9_OPAQUE;
>
> +#if (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(54, 13, 1))
> + case AV_PIX_FMT_D3D11VA_VLD:
> + return VLC_CODEC_D3D11_OPAQUE;
> +#endif
> #if (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(53, 14, 0))
> case AV_PIX_FMT_VDA_VLD:
> return VLC_CODEC_UYVY;
> diff --git a/modules/video_chroma/Makefile.am b/modules/video_chroma/Makefile.am
> index cf6941e..ae8af04 100644
> --- a/modules/video_chroma/Makefile.am
> +++ b/modules/video_chroma/Makefile.am
> @@ -106,3 +106,13 @@ if HAVE_AVCODEC_DXVA2
> chroma_LTLIBRARIES += \
> libdxa9_plugin.la
> endif
> +
> +# D3D11VA
> +libd3d11_surface_plugin_la_SOURCES = video_chroma/d3d11_surface.c \
> + video_chroma/copy.c video_chroma/copy.h
> +
> +if HAVE_AVCODEC_D3D11VA
> +chroma_LTLIBRARIES += \
> + libd3d11_surface_plugin.la
> +endif
> +
> diff --git a/modules/video_chroma/d3d11_surface.c b/modules/video_chroma/d3d11_surface.c
> new file mode 100644
> index 0000000..06853aa
> --- /dev/null
> +++ b/modules/video_chroma/d3d11_surface.c
> @@ -0,0 +1,289 @@
> +/*****************************************************************************
> + * d3d11_surface.c : D3D11 GPU surface conversion module for vlc
> + *****************************************************************************
> + * Copyright (C) 2015 VLC authors and VideoLAN
> + * $Id$
> + *
> + * Authors: Steve Lhomme <robux4 at gmail.com>
> + *
> + * This program 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.
> + *
> + * This program 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 this program; if not, write to the Free Software Foundation,
> + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
> + *****************************************************************************/
> +
> +/*****************************************************************************
> + * Preamble
> + *****************************************************************************/
> +
> +#ifdef HAVE_CONFIG_H
> +# include "config.h"
> +#endif
> +
> +#include <vlc_common.h>
> +#include <vlc_plugin.h>
> +#include <vlc_filter.h>
> +
> +#include "copy.h"
> +
> +static int OpenConverter( vlc_object_t * );
> +static void CloseConverter( vlc_object_t * );
> +
> +/*****************************************************************************
> + * Module descriptor.
> + *****************************************************************************/
> +vlc_module_begin ()
> + set_description( N_("Conversions from D3D11VA to NV12,YV12,I420") )
> + set_capability( "video filter2", 10 )
> + set_callbacks( OpenConverter, CloseConverter )
> +vlc_module_end ()
> +
> +#include <windows.h>
> +#define COBJMACROS
> +#include <d3d11.h>
> +
> +/* VLC_CODEC_D3D11_OPAQUE */
> +struct picture_sys_t
> +{
> + ID3D11VideoDecoderOutputView *decoder;
> + ID3D11Texture2D *texture;
> + ID3D11Device *device;
> + ID3D11DeviceContext *context;
> + HINSTANCE hd3d11_dll;
> +};
> +
> +struct filter_sys_t {
> + copy_cache_t cache;
> + ID3D11Texture2D *staging;
> + vlc_mutex_t staging_lock;
> +};
> +
> +static int assert_staging(filter_t *p_filter, picture_sys_t *p_sys)
> +{
> + filter_sys_t *sys = (filter_sys_t*) p_filter->p_sys;
> + ID3D11Resource *p_resource = NULL;
> + HRESULT hr;
> +
> + if (sys->staging)
> + goto ok;
> +
> + D3D11_TEXTURE2D_DESC texDesc;
> + ID3D11VideoDecoderOutputView_GetResource(p_sys->decoder, &p_resource);
> + ID3D11Texture2D_GetDesc( (ID3D11Texture2D*) p_resource, &texDesc);
> + ID3D11Resource_Release(p_resource);
> +
> + texDesc.MipLevels = 1;
> + //texDesc.SampleDesc.Count = 1;
> + texDesc.MiscFlags = 0;
> + texDesc.ArraySize = 1;
> + texDesc.Usage = D3D11_USAGE_STAGING;
> + texDesc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
> + texDesc.BindFlags = 0;
> +
> + sys->staging = NULL;
> + hr = ID3D11Device_CreateTexture2D( p_sys->device, &texDesc, NULL, &sys->staging);
> + if (FAILED(hr)) {
> + msg_Err(p_filter, "Failed to create a staging texture to extract surface pixels (hr=0x%0lx)", hr );
> + return VLC_EGENERIC;
> + }
> +ok:
> + return VLC_SUCCESS;
> +}
> +
> +static void D3D11_YUY2(filter_t *p_filter, picture_t *src, picture_t *dst)
> +{
> + filter_sys_t *sys = (filter_sys_t*) p_filter->p_sys;
> + picture_sys_t *p_sys = src->p_sys;
> +
> + D3D11_TEXTURE2D_DESC desc;
> + D3D11_MAPPED_SUBRESOURCE lock;
> + ID3D11Resource *p_texture = NULL;
> +
> + vlc_mutex_lock(&sys->staging_lock);
> + if (assert_staging(p_filter, p_sys) != VLC_SUCCESS)
> + {
> + vlc_mutex_unlock(&sys->staging_lock);
> + return;
> + }
> +
> + D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC viewDesc;
> + ID3D11VideoDecoderOutputView_GetDesc( p_sys->decoder, &viewDesc );
> +
> + ID3D11VideoDecoderOutputView_GetResource( p_sys->decoder, &p_texture );
> + ID3D11DeviceContext_CopySubresourceRegion(p_sys->context, (ID3D11Resource*) sys->staging,
> + 0, 0, 0, 0,
> + p_texture, viewDesc.Texture2D.ArraySlice,
> + NULL);
> + ID3D11Resource_Release(p_texture);
> +
> + HRESULT hr = ID3D11DeviceContext_Map(p_sys->context, (ID3D11Resource*) sys->staging,
> + 0, D3D11_MAP_READ, 0, &lock);
> + if (FAILED(hr)) {
> + msg_Err(p_filter, "Failed to map source surface. (hr=0x%0lx)", hr);
> + vlc_mutex_unlock(&sys->staging_lock);
> + return;
> + }
> +
> + if (dst->format.i_chroma == VLC_CODEC_I420) {
> + uint8_t *tmp = dst->p[1].p_pixels;
> + dst->p[1].p_pixels = dst->p[2].p_pixels;
> + dst->p[2].p_pixels = tmp;
> + }
> +
> + ID3D11Texture2D_GetDesc(sys->staging, &desc);
> +
> + if (desc.Format == DXGI_FORMAT_YUY2) {
> + size_t chroma_pitch = (lock.RowPitch / 2);
> +
> + size_t pitch[3] = {
> + lock.RowPitch,
> + chroma_pitch,
> + chroma_pitch,
> + };
> +
> + uint8_t *plane[3] = {
> + (uint8_t*)lock.pData,
> + (uint8_t*)lock.pData + pitch[0] * src->format.i_height,
> + (uint8_t*)lock.pData + pitch[0] * src->format.i_height
> + + pitch[1] * src->format.i_height / 2,
> + };
> +
> + CopyFromYv12(dst, plane, pitch, src->format.i_width,
> + src->format.i_height, &sys->cache);
> + } else if (desc.Format == DXGI_FORMAT_NV12) {
> + uint8_t *plane[2] = {
> + lock.pData,
> + (uint8_t*)lock.pData + lock.RowPitch * src->format.i_height
> + };
> + size_t pitch[2] = {
> + lock.RowPitch,
> + lock.RowPitch,
> + };
> + CopyFromNv12(dst, plane, pitch, src->format.i_width,
> + src->format.i_height, &sys->cache);
> + } else {
> + msg_Err(p_filter, "Unsupported D3D11VA conversion from 0x%08X to YV12", desc.Format);
> + }
> +
> + if (dst->format.i_chroma == VLC_CODEC_I420) {
> + uint8_t *tmp = dst->p[1].p_pixels;
> + dst->p[1].p_pixels = dst->p[2].p_pixels;
> + dst->p[2].p_pixels = tmp;
> + }
> +
> + /* */
> + ID3D11DeviceContext_Unmap(p_sys->context, (ID3D11Resource*)sys->staging, 0);
> + vlc_mutex_unlock(&sys->staging_lock);
> +}
> +
> +static void D3D11_NV12(filter_t *p_filter, picture_t *src, picture_t *dst)
> +{
> + filter_sys_t *sys = (filter_sys_t*) p_filter->p_sys;
> + picture_sys_t *p_sys = src->p_sys;
> +
> + D3D11_TEXTURE2D_DESC desc;
> + D3D11_MAPPED_SUBRESOURCE lock;
> + ID3D11Resource *p_texture = NULL;
> +
> + vlc_mutex_lock(&sys->staging_lock);
> + if (assert_staging(p_filter, p_sys) != VLC_SUCCESS)
> + {
> + vlc_mutex_unlock(&sys->staging_lock);
> + return;
> + }
> +
> + D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC viewDesc;
> + ID3D11VideoDecoderOutputView_GetDesc( p_sys->decoder, &viewDesc );
> +
> + ID3D11VideoDecoderOutputView_GetResource( p_sys->decoder, &p_texture );
> + ID3D11DeviceContext_CopySubresourceRegion(p_sys->context, (ID3D11Resource*) sys->staging,
> + 0, 0, 0, 0,
> + p_texture, viewDesc.Texture2D.ArraySlice,
> + NULL);
> + ID3D11Resource_Release(p_texture);
> +
> + HRESULT hr = ID3D11DeviceContext_Map(p_sys->context, (ID3D11Resource*) sys->staging,
> + 0, D3D11_MAP_READ, 0, &lock);
> + if (FAILED(hr)) {
> + msg_Err(p_filter, "Failed to map source surface. (hr=0x%0lx)", hr);
> + vlc_mutex_unlock(&sys->staging_lock);
> + return;
> + }
> +
> + ID3D11Texture2D_GetDesc(sys->staging, &desc);
> +
> + if (desc.Format == DXGI_FORMAT_NV12) {
> + uint8_t *plane[2] = {
> + lock.pData,
> + (uint8_t*)lock.pData + lock.RowPitch * src->format.i_height
> + };
> + size_t pitch[2] = {
> + lock.RowPitch,
> + lock.RowPitch,
> + };
> + CopyFromNv12ToNv12(dst, plane, pitch, src->format.i_width,
> + src->format.i_height, &sys->cache);
> + } else {
> + msg_Err(p_filter, "Unsupported D3D11VA conversion from 0x%08X to NV12", desc.Format);
> + }
> +
> + /* */
> + ID3D11DeviceContext_Unmap(p_sys->context, (ID3D11Resource*)sys->staging, 0);
> + vlc_mutex_unlock(&sys->staging_lock);
> +}
> +
> +VIDEO_FILTER_WRAPPER (D3D11_NV12)
> +VIDEO_FILTER_WRAPPER (D3D11_YUY2)
> +
> +static int OpenConverter( vlc_object_t *obj )
> +{
> + filter_t *p_filter = (filter_t *)obj;
> + if ( p_filter->fmt_in.video.i_chroma != VLC_CODEC_D3D11_OPAQUE )
> + return VLC_EGENERIC;
> +
> + if ( p_filter->fmt_in.video.i_height != p_filter->fmt_out.video.i_height
> + || p_filter->fmt_in.video.i_width != p_filter->fmt_out.video.i_width )
> + return VLC_EGENERIC;
> +
> + switch( p_filter->fmt_out.video.i_chroma ) {
> + case VLC_CODEC_I420:
> + case VLC_CODEC_YV12:
> + p_filter->pf_video_filter = D3D11_YUY2_Filter;
> + break;
> + case VLC_CODEC_NV12:
> + p_filter->pf_video_filter = D3D11_NV12_Filter;
> + break;
> + default:
> + return VLC_EGENERIC;
> + }
> +
> + filter_sys_t *p_sys = calloc(1, sizeof(filter_sys_t));
> + if (!p_sys)
> + return VLC_ENOMEM;
> + CopyInitCache(&p_sys->cache, p_filter->fmt_in.video.i_width );
> + vlc_mutex_init(&p_sys->staging_lock);
> + p_filter->p_sys = p_sys;
> +
> + return VLC_SUCCESS;
> +}
> +
> +static void CloseConverter( vlc_object_t *obj )
> +{
> + filter_t *p_filter = (filter_t *)obj;
> + filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys;
> + CopyCleanCache(&p_sys->cache);
> + vlc_mutex_destroy(&p_sys->staging_lock);
> + if (p_sys->staging)
> + ID3D11Texture2D_Release(p_sys->staging);
> + free( p_sys );
> + p_filter->p_sys = NULL;
> +}
> diff --git a/po/POTFILES.in b/po/POTFILES.in
> index 69a316c..0a016b4 100644
> --- a/po/POTFILES.in
> +++ b/po/POTFILES.in
> @@ -350,6 +350,7 @@ modules/codec/avcodec/audio.c
> modules/codec/avcodec/avcodec.c
> modules/codec/avcodec/avcodec.h
> modules/codec/avcodec/chroma.c
> +modules/codec/avcodec/d3d11va.c
> modules/codec/avcodec/directx_va.c
> modules/codec/avcodec/directx_va.h
> modules/codec/avcodec/dxva2.c
> @@ -1062,6 +1063,7 @@ modules/text_renderer/svg.c
> modules/text_renderer/tdummy.c
> modules/text_renderer/win32text.c
> modules/video_chroma/chain.c
> +modules/video_chroma/d3d11_surface.c
> modules/video_chroma/dxa9.c
> modules/video_chroma/grey_yuv.c
> modules/video_chroma/i420_rgb16.c
> --
> 2.4.0
>
More information about the vlc-devel
mailing list